src/usr.bin/w/w.c - diff - 1.59

Return to w.c CVS log

Up to [local] / src / usr.bin / w

Diff for /src/usr.bin/w/w.c between version 1.58 and 1.59

version 1.58, 2015/03/15 00:41:28

version 1.59, 2015/08/31 15:49:34

Line 219

Line 219

kp = kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(*kp), &nentries);

kp = kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(*kp), &nentries);

if (kp == NULL)

if (kp == NULL)

errx(1, "%s", kvm_geterr(kd));

errx(1, "%s", kvm_geterr(kd));

if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 &&

ioctl(STDERR_FILENO, TIOCGWINSZ, &ws) == -1 &&

ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) == -1) || ws.ws_col == 0)

ttywidth = 79;

else

ttywidth = ws.ws_col - 1;

argwidth = ttywidth - WUSED;

if (argwidth < 4)

argwidth = 8;

for (i = 0; i < nentries; i++, kp++) {

for (i = 0; i < nentries; i++, kp++) {

if (kp->p_psflags & (PS_EMBRYO | PS_ZOMBIE))

if (kp->p_psflags & (PS_EMBRYO | PS_ZOMBIE))

continue;

continue;

Line 247

Line 258

}

}

}

}

}

}

if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 &&

ioctl(STDERR_FILENO, TIOCGWINSZ, &ws) == -1 &&

ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) == -1) || ws.ws_col == 0)

ttywidth = 79;

else

ttywidth = ws.ws_col - 1;

argwidth = ttywidth - WUSED;

if (argwidth < 4)

argwidth = 8;

/* sort by idle time */

/* sort by idle time */

if (sortidle && ehead != NULL) {

if (sortidle && ehead != NULL) {

struct entry *from = ehead, *save;

struct entry *from = ehead, *save;