d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework the logic for `-t <tty>', such that it accepts "ttyp0" and "console",

Browse Source 
in addition to "/dev/ttyp0" or "p0"  and  "/dev/console" or "co".
This commit is contained in:
Garance A Drosehn 2004-06-24 01:57:59 +00:00
parent 30d577a014
commit 23b8efad7a
1 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
bin/ps/ps.c
View File

@ -703,6 +703,13 @@ addelem_pid(struct listinfo *inf, const char *elem)
} }
#undef BSD_PID_MAX #undef BSD_PID_MAX
/*-
* The user can specify a device via one of three formats:
* 1) fully qualified, e.g.: /dev/ttyp0 /dev/console
* 2) missing "/dev", e.g.: ttyp0 console
* 3) two-letters, e.g.: p0 co
* (matching letters that would be seen in the "TT" column)
*/
static int static int
addelem_tty(struct listinfo *inf, const char *elem) addelem_tty(struct listinfo *inf, const char *elem)
{ {
@ -710,25 +717,46 @@ addelem_tty(struct listinfo *inf, const char *elem)
struct stat sb; struct stat sb;
char pathbuf[PATH_MAX]; char pathbuf[PATH_MAX];
if (strcmp(elem, "co") == 0) ttypath = NULL;
ttypath = strdup(_PATH_CONSOLE); switch (*elem) {
else if (*elem == '/') case '/':
ttypath = elem; ttypath = elem;
else { break;
strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf)); case 'c':
if (strcmp(elem, "co") == 0) {
ttypath = _PATH_CONSOLE;
break;
}
/* FALLTHROUGH */
default:
strlcpy(pathbuf, _PATH_DEV, sizeof(pathbuf));
strlcat(pathbuf, elem, sizeof(pathbuf)); strlcat(pathbuf, elem, sizeof(pathbuf));
ttypath = pathbuf; ttypath = pathbuf;
if (strncmp(pathbuf, _PATH_TTY, sizeof(_PATH_TTY)) == 0)
break;
if (strcmp(pathbuf, _PATH_CONSOLE) == 0)
break;
if (stat(pathbuf, &sb) == 0 && S_ISCHR(sb.st_mode)) {
/* No need to repeat stat() && S_ISCHR() checks */
ttypath = NULL;
break;
}
/* /dev/${elem} does not exist, so try /dev/tty${elem} */
strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf));
strlcat(pathbuf, elem, sizeof(pathbuf));
break;
} }
if (ttypath) {
if (stat(ttypath, &sb) == -1) { if (stat(ttypath, &sb) == -1) {
warn("%s", ttypath); warn("%s", ttypath);
optfatal = 1; optfatal = 1;
return (0); return (0);
} }
if (!S_ISCHR(sb.st_mode)) { if (!S_ISCHR(sb.st_mode)) {
warn("%s: Not a terminal", ttypath); warn("%s: Not a terminal", ttypath);
optfatal = 1; optfatal = 1;
return (0); return (0);
}
} }
if (inf->count >= inf->maxcount) if (inf->count >= inf->maxcount)
expand_list(inf); expand_list(inf);