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

Two minor, pedantic fixes from bde for my last pedantic fixes, plus

Browse Source 
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
This commit is contained in:
Warner Losh 1997-07-29 13:24:01 +00:00
parent 8b8a0b53b1
commit 6ee8b26997
10 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/lpr/common_source/common.c
View File

@ -308,7 +308,7 @@ checkremote()
if (RM != NULL) {
/* get the official name of the local host */
gethostname(name, sizeof(name));
name[sizeof(name)-1] = '\0';
name[sizeof(name) - 1] = '\0';
hp = gethostbyname(name);
if (hp == (struct hostent *) NULL) {
(void) snprintf(errbuf, sizeof(errbuf),
@ -352,14 +352,14 @@ delay(n)
(void) select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &tdelay);
}
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
void
#if __STDC__
#ifdef __STDC__
fatal(const char *msg, ...)
#else
fatal(msg, va_alist)
@ -368,7 +368,7 @@ fatal(msg, va_alist)
#endif
{
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, msg);
#else
va_start(ap);

4
usr.sbin/lpr/common_source/displayq.c
View File

@ -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]);

6
usr.sbin/lpr/common_source/recvjob.c
View File

@ -336,14 +336,14 @@ rcleanup(signo)
dfname[0] = '\0';
}
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
static void
#if __STDC__
#ifdef __STDC__
frecverr(const char *msg, ...)
#else
frecverr(msg, va_alist)
@ -352,7 +352,7 @@ frecverr(msg, va_alist)
#endif
{
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, msg);
#else
va_start(ap);

2
usr.sbin/lpr/common_source/rmjob.c
View File

@ -330,7 +330,7 @@ rmremote()
*cp++ = ' ';
strcpy(cp, user[i]);
}
for (i = 0; i < requests && cp-buf+10 < sizeof(buf); i++) {
for (i = 0; i < requests && cp-buf+10 < sizeof(buf) - 1; i++) {
cp += strlen(cp);
(void) sprintf(cp, " %d", requ[i]);
}

2
usr.sbin/lpr/common_source/startdaemon.c
View File

@ -83,7 +83,7 @@ startdaemon(printer)
return(0);
}
seteuid(uid);
if (snprintf(buf, sizeof(buf), "\1%s\n", printer) > sizeof(buf)-1) {
if (snprintf(buf, sizeof(buf), "\1%s\n", printer) > sizeof(buf) - 1) {
close(s);
return (0);
}

2
usr.sbin/lpr/lpc/cmds.c
View File

@ -771,7 +771,7 @@ status(argc, argv)
register char *cp1, *cp2;
char prbuf[100];
if (argc == 1) {
if (argc == 1 || argc == 2 && !strcmp(argv[1], "all")) {
printer = prbuf;
while (cgetnext(&bp, printcapdb) > 0) {
cp1 = prbuf;

12
usr.sbin/lpr/lpd/printjob.c
View File

@ -1197,7 +1197,6 @@ sendmail(user, bombed)
int dtablesize;
int p[2], s;
register char *cp;
char buf[100];
struct stat stb;
FILE *fp;
@ -1211,8 +1210,7 @@ sendmail(user, bombed)
cp++;
else
cp = _PATH_SENDMAIL;
sprintf(buf, "%s@%s", user, fromhost);
execl(_PATH_SENDMAIL, cp, buf, 0);
execl(_PATH_SENDMAIL, cp, "-t", 0);
exit(0);
} else if (s > 0) { /* parent */
dup2(p[1], 1);
@ -1620,14 +1618,14 @@ setty()
}
}
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
static void
#if __STDC__
#ifdef __STDC__
pstatus(const char *msg, ...)
#else
pstatus(msg, va_alist)
@ -1638,7 +1636,7 @@ pstatus(msg, va_alist)
register int fd;
char buf[BUFSIZ];
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, msg);
#else
va_start(ap);
@ -1651,7 +1649,7 @@ pstatus(msg, va_alist)
exit(1);
}
ftruncate(fd, 0);
(void)vsnprintf(buf, sizeof(buf), msg, ap);
(void)vsnprintf(buf, sizeof(buf) - 1, msg, ap);
va_end(ap);
strcat(buf, "\n");
(void) write(fd, buf, strlen(buf));

6
usr.sbin/lpr/lpd/recvjob.c
View File

@ -336,14 +336,14 @@ rcleanup(signo)
dfname[0] = '\0';
}
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
static void
#if __STDC__
#ifdef __STDC__
frecverr(const char *msg, ...)
#else
frecverr(msg, va_alist)
@ -352,7 +352,7 @@ frecverr(msg, va_alist)
#endif
{
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, msg);
#else
va_start(ap);

8
usr.sbin/lpr/lpr/lpr.c
View File

@ -45,7 +45,7 @@ static char copyright[] =
#ifndef lint
static char sccsid[] = "From: @(#)lpr.c 8.4 (Berkeley) 4/28/95"
"\n$Id: lpr.c,v 1.18 1997/07/23 20:53:38 imp Exp $\n";
"\n$Id: lpr.c,v 1.19 1997/07/29 04:17:19 imp Exp $\n";
#endif /* not lint */
/*
@ -760,14 +760,14 @@ lmktemp(id, num, len)
return(s);
}
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
static void
#if __STDC__
#ifdef __STDC__
fatal2(const char *msg, ...)
#else
fatal2(msg, va_alist)
@ -776,7 +776,7 @@ fatal2(msg, va_alist)
#endif
{
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, msg);
#else
va_start(ap);

12
usr.sbin/lpr/runqueue/printjob.c
View File

@ -1197,7 +1197,6 @@ sendmail(user, bombed)
int dtablesize;
int p[2], s;
register char *cp;
char buf[100];
struct stat stb;
FILE *fp;
@ -1211,8 +1210,7 @@ sendmail(user, bombed)
cp++;
else
cp = _PATH_SENDMAIL;
sprintf(buf, "%s@%s", user, fromhost);
execl(_PATH_SENDMAIL, cp, buf, 0);
execl(_PATH_SENDMAIL, cp, "-t", 0);
exit(0);
} else if (s > 0) { /* parent */
dup2(p[1], 1);
@ -1620,14 +1618,14 @@ setty()
}
}
#if __STDC__
#ifdef __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
static void
#if __STDC__
#ifdef __STDC__
pstatus(const char *msg, ...)
#else
pstatus(msg, va_alist)
@ -1638,7 +1636,7 @@ pstatus(msg, va_alist)
register int fd;
char buf[BUFSIZ];
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, msg);
#else
va_start(ap);
@ -1651,7 +1649,7 @@ pstatus(msg, va_alist)
exit(1);
}
ftruncate(fd, 0);
(void)vsnprintf(buf, sizeof(buf), msg, ap);
(void)vsnprintf(buf, sizeof(buf) - 1, msg, ap);
va_end(ap);
strcat(buf, "\n");
(void) write(fd, buf, strlen(buf));