diff options
author | imp <imp@FreeBSD.org> | 1997-07-29 13:24:01 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 1997-07-29 13:24:01 +0000 |
commit | 2f9d4f24114eb44bfde492debae4196f2127b888 (patch) | |
tree | c88cde887a350ef06b19b3df147ebcd1d121816e /usr.sbin/lpr/common_source/displayq.c | |
parent | f827c62c9475af527049150cf7d9a49b7de4a320 (diff) | |
download | FreeBSD-src-2f9d4f24114eb44bfde492debae4196f2127b888.zip FreeBSD-src-2f9d4f24114eb44bfde492debae4196f2127b888.tar.gz |
Two minor, pedantic fixes from bde for my last pedantic fixes, plus
the following from recent OpenBSD changes. These changes (and all
I've made) should be merged back into 2.2 when they are vetted in
-current.
common.c:
OpenBSD 1.7: mickey: #if __STDC__ --> #ifdef __STDC__
displayq.c:
OpenBSD 1.8: deraadt: 1 byte oflows; millert
rmjob.c:
OpenBSD 1.8: deraadt: 1 byte oflows; millert
cmds.c:
OpenBSD 1.9: grr: restore traditional "all" keyword option - see lpc(8)
[[ This makes lpc status all work again -- imp ]]
printjob.c:
OpenBSD 1.17: deraadt: use sendmail -t
OpenBSD 1.16: mickey: #if __STDC__ --> #ifdef __STDC__
OpenBSD 1.15: deraadt: 1 byte oflow; Don.Lewis@tsc.tdk.com
recvjob.c:
OpenBSD 1.11: mickey: #if __STDC__ --> #ifdef __STDC__
lpr.c:
OpenBSD 1.19: mickey: #if __STDC__ --> #ifdef __STDC__
Obtained from: OpenBSD
Diffstat (limited to 'usr.sbin/lpr/common_source/displayq.c')
-rw-r--r-- | usr.sbin/lpr/common_source/displayq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c index eafaf0c..d326e79 100644 --- a/usr.sbin/lpr/common_source/displayq.c +++ b/usr.sbin/lpr/common_source/displayq.c @@ -224,12 +224,12 @@ displayq(format) putchar('\n'); (void) snprintf(line, sizeof(line), "%c%s", format + '\3', RP); cp = line; - for (i = 0; i < requests && cp-line+10 < sizeof(line); i++) { + for (i = 0; i < requests && cp-line+10 < sizeof(line) - 1; i++) { cp += strlen(cp); (void) sprintf(cp, " %d", requ[i]); } for (i = 0; i < users && cp - line + 1 + strlen(user[i]) < - sizeof(line); i++) { + sizeof(line) - 1; i++) { cp += strlen(cp); *cp++ = ' '; (void) strcpy(cp, user[i]); |