diff options
| author | obrien <obrien@FreeBSD.org> | 2000-10-26 09:52:06 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-10-26 09:52:06 +0000 |
| commit | ec817875345826d65474ba3a3d504110e8c6fbc0 (patch) | |
| tree | bc189af36699941b03bbb64cad3b5d36ad007108 /usr.bin/window | |
| parent | 6c347dd09c0e09df91ffc26fb93c930157701ae1 (diff) | |
| download | FreeBSD-src-ec817875345826d65474ba3a3d504110e8c6fbc0.zip FreeBSD-src-ec817875345826d65474ba3a3d504110e8c6fbc0.tar.gz | |
Use the pathnames from pathnames.h rather than hardcoding them here.
Add RCSIDs.
Diffstat (limited to 'usr.bin/window')
| -rw-r--r-- | usr.bin/window/wwenviron.c | 4 | ||||
| -rw-r--r-- | usr.bin/window/wwterminfo.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c index 56034d4..02db174 100644 --- a/usr.bin/window/wwenviron.c +++ b/usr.bin/window/wwenviron.c @@ -36,12 +36,14 @@ #ifndef lint static char sccsid[] = "@(#)wwenviron.c 8.1 (Berkeley) 6/6/93"; +static char rcsid[] = "@(#)$FreeBSD$"; #endif /* not lint */ #include "ww.h" #if !defined(OLD_TTY) && !defined(TIOCSCTTY) && !defined(TIOCNOTTY) #include <sys/ioctl.h> #endif +#include <paths.h> #include <signal.h> /* @@ -57,7 +59,7 @@ register struct ww *wp; char buf[1024]; #ifndef TIOCSCTTY - if ((i = open("/dev/tty", 0)) < 0) + if ((i = open(_PATH_TTY, 0)) < 0) goto bad; if (ioctl(i, TIOCNOTTY, (char *)0) < 0) goto bad; diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c index 89994c0..ed60f3b 100644 --- a/usr.bin/window/wwterminfo.c +++ b/usr.bin/window/wwterminfo.c @@ -36,6 +36,7 @@ #ifndef lint static char sccsid[] = "@(#)wwterminfo.c 8.1 (Berkeley) 6/6/93"; +static char rcsid[] = "@(#)$FreeBSD$"; #endif /* not lint */ #ifdef TERMINFO @@ -80,7 +81,7 @@ wwterminfoinit() WWT_TERMCAP, wwncol, wwnrow, wwwintermcap); (void) fclose(fp); (void) sprintf(buf, - "cd %s; %s cap >info 2>/dev/null; %s info >/dev/null 2>&1", + "cd %s; %s cap >info 2>" _PATH_DEVNULL "; %s info >" _PATH_DEVNULL " 2>&1", wwterminfopath, _PATH_CAPTOINFO, _PATH_TIC); (void) system(buf); return 0; |
