diff options
author | sheldonh <sheldonh@FreeBSD.org> | 2001-07-26 11:02:39 +0000 |
---|---|---|
committer | sheldonh <sheldonh@FreeBSD.org> | 2001-07-26 11:02:39 +0000 |
commit | 9bfb9eedcddf3ab4e79532e863cf16c5ff381090 (patch) | |
tree | bd2ac2627dbeab7d3427432bb98d2c73085b61c1 /usr.sbin | |
parent | 505859f37d54f23b1ebc688851be182d4e1332c8 (diff) | |
download | FreeBSD-src-9bfb9eedcddf3ab4e79532e863cf16c5ff381090.zip FreeBSD-src-9bfb9eedcddf3ab4e79532e863cf16c5ff381090.tar.gz |
Use STD{ERR,IN,OUT}_FILENO instead of their numeric values. The
definitions are more readable, and it's possible that they're
more portable to pathalogical platforms.
Submitted by: David Hill <david@phobia.ms>
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/ctm/ctm_rmail/options.h | 12 | ||||
-rw-r--r-- | usr.sbin/nghook/main.c | 4 | ||||
-rw-r--r-- | usr.sbin/pcvt/keycap/keycap.c | 14 | ||||
-rw-r--r-- | usr.sbin/pcvt/vttest/esc.c | 20 | ||||
-rw-r--r-- | usr.sbin/pcvt/vttest/main.c | 10 | ||||
-rw-r--r-- | usr.sbin/pppctl/pppctl.c | 14 | ||||
-rw-r--r-- | usr.sbin/rmt/rmt.c | 18 | ||||
-rw-r--r-- | usr.sbin/rtadvd/advcap.c | 9 |
8 files changed, 58 insertions, 43 deletions
diff --git a/usr.sbin/ctm/ctm_rmail/options.h b/usr.sbin/ctm/ctm_rmail/options.h index 18b844c..5c8dd94 100644 --- a/usr.sbin/ctm/ctm_rmail/options.h +++ b/usr.sbin/ctm/ctm_rmail/options.h @@ -48,6 +48,8 @@ * * Based on recollection of the original options.h produced at the University * of Queensland by Ross Patterson (and possibly others). + * + * $FreeBSD$ */ static char *O_usage; @@ -60,11 +62,11 @@ pusage() /* * Avoid gratuitously loading stdio. */ - write(2, "Usage: ", 7); - write(2, O_name, strlen(O_name)); - write(2, " ", 1); - write(2, O_usage, strlen(O_usage)); - write(2, "\n", 1); + write(STDERR_FILENO, "Usage: ", 7); + write(STDERR_FILENO, O_name, strlen(O_name)); + write(STDERR_FILENO, " ", 1); + write(STDERR_FILENO, O_usage, strlen(O_usage)); + write(STDERR_FILENO, "\n", 1); } #define usage() (pusage(), exit(1)) diff --git a/usr.sbin/nghook/main.c b/usr.sbin/nghook/main.c index c0ef43d..c5fd205 100644 --- a/usr.sbin/nghook/main.c +++ b/usr.sbin/nghook/main.c @@ -156,7 +156,7 @@ main(int ac, char *av[]) /* Write packet to stdout */ if (asciiFlag) WriteAscii((u_char *) buf, rl); - else if ((wl = write(1, buf, rl)) != rl) { + else if ((wl = write(STDOUT_FILENO, buf, rl)) != rl) { if (wl < 0) { err(EX_OSERR, "write(stdout)"); } else { @@ -221,7 +221,7 @@ WriteAscii(u_char *buf, int len) sizeof(sbuf) - strlen(sbuf), " "); snprintf(sbuf + strlen(sbuf), sizeof(sbuf) - strlen(sbuf), "\n"); - (void) write(1, sbuf, strlen(sbuf)); + (void) write(STDOUT_FILENO, sbuf, strlen(sbuf)); } ch = '\n'; write(1, &ch, 1); diff --git a/usr.sbin/pcvt/keycap/keycap.c b/usr.sbin/pcvt/keycap/keycap.c index 9bbb7e5..9c276a3 100644 --- a/usr.sbin/pcvt/keycap/keycap.c +++ b/usr.sbin/pcvt/keycap/keycap.c @@ -35,6 +35,11 @@ * */ +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif + static char *id = "@(#)keycap.c, 3.20, Last Edit-Date: [Tue Dec 20 14:51:50 1994]"; @@ -64,6 +69,7 @@ static char *id = #include <stdio.h> #include <ctype.h> +#include <unistd.h> #include "keycap.h" @@ -137,7 +143,7 @@ char *bp, *name; break; } if (cp >= bp+KEYCAP_BUFSIZ) { - write(2,"Keycap entry too long\n", 23); + write(STDERR_FILENO, "Keycap entry too long\n", 23); break; } else *cp++ = c; @@ -170,7 +176,7 @@ static int knchktc() p = tbuf + strlen(tbuf) - 2; /* before the last colon */ while (*--p != ':') if (p<tbuf) { - write(2, "Bad keycap entry\n", 18); + write(STDERR_FILENO, "Bad keycap entry\n", 18); return (0); } p++; @@ -183,7 +189,7 @@ static int knchktc() q++; *q = 0; if (++hopcount > MAXHOP) { - write(2, "Infinite tc= loop\n", 18); + write(STDERR_FILENO, "Infinite tc= loop\n", 18); return (0); } if (kgetent(tcbuf, tcname) != 1) @@ -192,7 +198,7 @@ static int knchktc() ; l = p - holdtbuf + strlen(q); if (l > KEYCAP_BUFSIZ) { - write(2, "Keycap entry too long\n", 23); + write(STDERR_FILENO, "Keycap entry too long\n", 23); q[KEYCAP_BUFSIZ - (p-tbuf)] = 0; } strcpy(p, q+1); diff --git a/usr.sbin/pcvt/vttest/esc.c b/usr.sbin/pcvt/vttest/esc.c index b2bce92..e52cef2 100644 --- a/usr.sbin/pcvt/vttest/esc.c +++ b/usr.sbin/pcvt/vttest/esc.c @@ -1,5 +1,11 @@ +#include <unistd.h> #include "header.h" +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif + println(s) char *s; { printf("%s\n", s); } @@ -144,7 +150,7 @@ char inchar() { lval = val; brkrd = 0; reading = 1; - read(0,&ch,1); + read(STDIN_FILENO,&ch,1); reading = 0; if (brkrd) val = 0177; @@ -204,17 +210,17 @@ char *instr() { fflush(stdout); #ifdef XENIX while(rdchk(0)) { - read(0,result+i,1); + read(STDIN_FILENO,result+i,1); if (i++ == 78) break; } #else #ifdef SIII - while(read(2,result+i,1) == 1) + while(read(STDERR_FILENO,result+i,1) == 1) if (i++ == 78) break; #else while(ioctl(0,FIONREAD,&l1), l1 > 0L) { while(l1-- > 0L) { - read(0,result+i,1); + read(STDIN_FILENO,result+i,1); if (i++ == 78) goto out1; } } @@ -358,14 +364,14 @@ inflush() { #ifdef UNIX #ifdef XENIX - while(rdchk(0)) read(0,&val,1); + while(rdchk(0)) read(STDIN_FILENO,&val,1); #else #ifdef SIII - while(read(2,&val,1)); + while(read(STDERR_FILENO,&val,1)); #else long l1; ioctl (0, FIONREAD, &l1); - while(l1-- > 0L) read(0,&val,1); + while(l1-- > 0L) read(STDIN_FILENO,&val,1); #endif #endif #endif diff --git a/usr.sbin/pcvt/vttest/main.c b/usr.sbin/pcvt/vttest/main.c index 341de73..4093c57 100644 --- a/usr.sbin/pcvt/vttest/main.c +++ b/usr.sbin/pcvt/vttest/main.c @@ -93,8 +93,8 @@ main() { #ifdef UNIX initterminal(setjmp(intrenv)); - signal(SIGINT, onbrk); - signal(SIGTERM, onterm); + signal(SIGINT, (void *)onbrk); + signal(SIGTERM, (void *)onterm); reading = 0; #else initterminal(0); @@ -1914,7 +1914,7 @@ bye () { #ifdef UNIX onbrk() { - signal(SIGINT, onbrk); + signal(SIGINT, (void *)onbrk); if (reading) brkrd = 1; else @@ -1922,7 +1922,7 @@ onbrk() { } onterm() { - signal(SIGTERM, onterm); + signal(SIGTERM, (void *)onterm); longjmp(intrenv, 1); } #endif @@ -1939,7 +1939,7 @@ readnl() { fflush(stdout); brkrd = 0; reading = 1; - do { read(0,&ch,1); } while(ch != '\n' && !brkrd); + do { read(STDIN_FILENO,&ch,1); } while(ch != '\n' && !brkrd); if (brkrd) kill(getpid(), SIGTERM); reading = 0; diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c index 753b32e..4ec2d94 100644 --- a/usr.sbin/pppctl/pppctl.c +++ b/usr.sbin/pppctl/pppctl.c @@ -147,7 +147,7 @@ Receive(int fd, int display) last = prompt; if (last) { last++; - write(1, Buffer, last-Buffer); + write(STDOUT_FILENO, Buffer, last-Buffer); } } prompt = prompt == NULL ? Buffer : prompt+1; @@ -162,7 +162,7 @@ Receive(int fd, int display) sprintf(Buffer, "passwd %s\n", passwd); memset(passwd, '\0', strlen(passwd)); if (display & REC_VERBOSE) - write(1, Buffer, strlen(Buffer)); + write(STDOUT_FILENO, Buffer, strlen(Buffer)); write(fd, Buffer, strlen(Buffer)); memset(Buffer, '\0', strlen(Buffer)); return Receive(fd, display & ~REC_PASSWD); @@ -180,13 +180,13 @@ Receive(int fd, int display) flush = sizeof Buffer / 2; else flush = last - Buffer + 1; - write(1, Buffer, flush); + write(STDOUT_FILENO, Buffer, flush); strcpy(Buffer, Buffer + flush); len -= flush; } if ((Result = select(fd + 1, &f, NULL, NULL, &t)) <= 0) { if (len) - write(1, Buffer, len); + write(STDOUT_FILENO, Buffer, len); break; } } @@ -217,7 +217,7 @@ InputHandler(int sig) len = read(data, buf, sizeof buf); if (len > 0) - write(1, buf, len); + write(STDOUT_FILENO, buf, len); else if (data != -1) longjmp(pppdead, -1); } @@ -613,7 +613,7 @@ main(int argc, char **argv) Buffer[sizeof(Buffer)-2] = '\0'; strcat(Buffer, "\n"); if (verbose) - write(1, Buffer, strlen(Buffer)); + write(STDOUT_FILENO, Buffer, strlen(Buffer)); write(fd, Buffer, strlen(Buffer)); if (Receive(fd, verbose | REC_SHOW) != 0) { fprintf(stderr, "Connection closed\n"); @@ -623,7 +623,7 @@ main(int argc, char **argv) start = ++next; } while (next && *next); if (verbose) - write(1, "quit\n", 5); + write(STDOUT_FILENO, "quit\n", 5); write(fd, "quit\n", 5); while (Receive(fd, verbose | REC_SHOW) == 0) ; diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c index accebc6..c3e3615 100644 --- a/usr.sbin/rmt/rmt.c +++ b/usr.sbin/rmt/rmt.c @@ -98,7 +98,7 @@ main(argc, argv) top: errno = 0; rval = 0; - if (read(0, &c, 1) != 1) + if (read(STDIN_FILENO, &c, 1) != 1) exit(0); switch (c) { @@ -141,7 +141,7 @@ top: DEBUG1("rmtd: W %s\n", count); record = checkbuf(record, n); for (i = 0; i < n; i += cc) { - cc = read(0, &record[i], n - i); + cc = read(STDIN_FILENO, &record[i], n - i); if (cc <= 0) { DEBUG("rmtd: premature eof\n"); exit(2); @@ -161,8 +161,8 @@ top: if (rval < 0) goto ioerror; (void)sprintf(resp, "A%d\n", rval); - (void)write(1, resp, strlen(resp)); - (void)write(1, record, rval); + (void)write(STDOUT_FILENO, resp, strlen(resp)); + (void)write(STDOUT_FILENO, record, rval); goto top; case 'I': @@ -187,8 +187,8 @@ top: if (rval > 24) /* original mtget structure size */ rval = 24; (void)sprintf(resp, "A%d\n", rval); - (void)write(1, resp, strlen(resp)); - (void)write(1, (char *)&mtget, rval); + (void)write(STDOUT_FILENO, resp, strlen(resp)); + (void)write(STDOUT_FILENO, (char *)&mtget, rval); goto top; } @@ -205,7 +205,7 @@ top: respond: DEBUG1("rmtd: A %d\n", rval); (void)sprintf(resp, "A%d\n", rval); - (void)write(1, resp, strlen(resp)); + (void)write(STDOUT_FILENO, resp, strlen(resp)); goto top; ioerror: error(errno); @@ -220,7 +220,7 @@ getstring(bp) char *cp = bp; for (i = 0; i < SSIZE; i++) { - if (read(0, cp+i, 1) != 1) + if (read(STDIN_FILENO, cp+i, 1) != 1) exit(0); if (cp[i] == '\n') break; @@ -257,5 +257,5 @@ error(num) DEBUG2("rmtd: E %d (%s)\n", num, strerror(num)); (void)snprintf(resp, sizeof(resp), "E%d\n%s\n", num, strerror(num)); - (void)write(1, resp, strlen(resp)); + (void)write(STDOUT_FILENO, resp, strlen(resp)); } diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c index 5cba1f5..d46cb89 100644 --- a/usr.sbin/rtadvd/advcap.c +++ b/usr.sbin/rtadvd/advcap.c @@ -162,7 +162,8 @@ getent(bp, name, cp) break; } if (cp >= bp+BUFSIZ) { - write(2,"Remcap entry too long\n", 23); + write(STDERR_FILENO, "Remcap entry too long\n", + 23); break; } else *cp++ = c; @@ -198,7 +199,7 @@ tnchktc() p = tbuf + strlen(tbuf) - 2; /* before the last colon */ while (*--p != ':') if (p<tbuf) { - write(2, "Bad remcap entry\n", 18); + write(STDERR_FILENO, "Bad remcap entry\n", 18); return (0); } p++; @@ -211,7 +212,7 @@ tnchktc() q++; *q = 0; if (++hopcount > MAXHOP) { - write(2, "Infinite tc= loop\n", 18); + write(STDERR_FILENO, "Infinite tc= loop\n", 18); return (0); } if (getent(tcbuf, tcname, remotefile) != 1) { @@ -221,7 +222,7 @@ tnchktc() ; l = p - holdtbuf + strlen(q); if (l > BUFSIZ) { - write(2, "Remcap entry too long\n", 23); + write(STDERR_FILENO, "Remcap entry too long\n", 23); q[BUFSIZ - (p-holdtbuf)] = 0; } strcpy(p, q); |