1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00

zsh-workers/9373

This commit is contained in:
Tanaka Akira 2000-01-19 17:43:41 +00:00
parent af259b89dc
commit 6cc7e4a7f6

View file

@ -1086,11 +1086,11 @@ scanpmhistory(HashTable ht, ScanFunc func, int flags)
pm.level = 0; pm.level = 0;
while (he) { while (he) {
if (func != scancountparams && if (func != scancountparams) {
((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) ||
!(flags & SCANPM_WANTKEYS))) {
sprintf(buf, "%d", he->histnum); sprintf(buf, "%d", he->histnum);
pm.nam = dupstring(buf); pm.nam = dupstring(buf);
if ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) ||
!(flags & SCANPM_WANTKEYS))
pm.u.str = dupstring(he->text); pm.u.str = dupstring(he->text);
} }
func((HashNode) &pm, flags); func((HashNode) &pm, flags);
@ -1209,12 +1209,13 @@ scanpmjobtexts(HashTable ht, ScanFunc func, int flags)
for (job = 1; job < MAXJOB; job++) { for (job = 1; job < MAXJOB; job++) {
if (jobtab[job].stat && jobtab[job].procs && if (jobtab[job].stat && jobtab[job].procs &&
!(jobtab[job].stat & STAT_NOPRINT)) { !(jobtab[job].stat & STAT_NOPRINT)) {
if (func != scancountparams) {
sprintf(buf, "%d", job); sprintf(buf, "%d", job);
pm.nam = dupstring(buf); pm.nam = dupstring(buf);
if (func != scancountparams && if ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) ||
((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || !(flags & SCANPM_WANTKEYS))
!(flags & SCANPM_WANTKEYS)))
pm.u.str = pmjobtext(job); pm.u.str = pmjobtext(job);
}
func((HashNode) &pm, flags); func((HashNode) &pm, flags);
} }
} }
@ -1314,12 +1315,13 @@ scanpmjobstates(HashTable ht, ScanFunc func, int flags)
for (job = 1; job < MAXJOB; job++) { for (job = 1; job < MAXJOB; job++) {
if (jobtab[job].stat && jobtab[job].procs && if (jobtab[job].stat && jobtab[job].procs &&
!(jobtab[job].stat & STAT_NOPRINT)) { !(jobtab[job].stat & STAT_NOPRINT)) {
if (func != scancountparams) {
sprintf(buf, "%d", job); sprintf(buf, "%d", job);
pm.nam = dupstring(buf); pm.nam = dupstring(buf);
if (func != scancountparams && if ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) ||
((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || !(flags & SCANPM_WANTKEYS))
!(flags & SCANPM_WANTKEYS)))
pm.u.str = pmjobstate(job); pm.u.str = pmjobstate(job);
}
func((HashNode) &pm, flags); func((HashNode) &pm, flags);
} }
} }
@ -1391,12 +1393,13 @@ scanpmjobdirs(HashTable ht, ScanFunc func, int flags)
for (job = 1; job < MAXJOB; job++) { for (job = 1; job < MAXJOB; job++) {
if (jobtab[job].stat && jobtab[job].procs && if (jobtab[job].stat && jobtab[job].procs &&
!(jobtab[job].stat & STAT_NOPRINT)) { !(jobtab[job].stat & STAT_NOPRINT)) {
if (func != scancountparams) {
sprintf(buf, "%d", job); sprintf(buf, "%d", job);
pm.nam = dupstring(buf); pm.nam = dupstring(buf);
if (func != scancountparams && if ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) ||
((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || !(flags & SCANPM_WANTKEYS))
!(flags & SCANPM_WANTKEYS)))
pm.u.str = pmjobdir(job); pm.u.str = pmjobdir(job);
}
func((HashNode) &pm, flags); func((HashNode) &pm, flags);
} }
} }