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

Cosmetic improvements to some of the syslog() calls in here (in some cases

Browse Source 
simply getting the indentation right when the statement wraps).

MFC after:	2 weeks
This commit is contained in:
Garance A Drosehn 2002-06-04 02:48:12 +00:00
parent 609614565f
commit 0dcfaee0af
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,8 @@ printjob(struct printer *pp)
(void) write(1, "", 1); /* ack that daemon is started */ (void) write(1, "", 1); /* ack that daemon is started */
(void) close(2); /* set up log file */ (void) close(2); /* set up log file */
if (open(pp->log_file, O_WRONLY|O_APPEND, LOG_FILE_MODE) < 0) { if (open(pp->log_file, O_WRONLY|O_APPEND, LOG_FILE_MODE) < 0) {
syslog(LOG_ERR, "%s: %m", pp->log_file); syslog(LOG_ERR, "%s: open(%s): %m", pp->printer,
pp->log_file);
(void) open(_PATH_DEVNULL, O_WRONLY); (void) open(_PATH_DEVNULL, O_WRONLY);
} }
setgid(getegid()); setgid(getegid());
@ -189,7 +190,8 @@ printjob(struct printer *pp)
* uses short form file names * uses short form file names
*/ */
if (chdir(pp->spool_dir) < 0) { if (chdir(pp->spool_dir) < 0) {
syslog(LOG_ERR, "%s: %m", pp->spool_dir); syslog(LOG_ERR, "%s: chdir(%s): %m", pp->printer,
pp->spool_dir);
exit(1); exit(1);
} }
if (stat(pp->lock_file, &stb) == 0 && (stb.st_mode & LFM_PRINT_DIS)) if (stat(pp->lock_file, &stb) == 0 && (stb.st_mode & LFM_PRINT_DIS))
@ -199,12 +201,14 @@ printjob(struct printer *pp)
if (lfd < 0) { if (lfd < 0) {
if (errno == EWOULDBLOCK) /* active daemon present */ if (errno == EWOULDBLOCK) /* active daemon present */
exit(0); exit(0);
syslog(LOG_ERR, "%s: %s: %m", pp->printer, pp->lock_file); syslog(LOG_ERR, "%s: open(%s): %m", pp->printer,
pp->lock_file);
exit(1); exit(1);
} }
/* turn off non-blocking mode (was turned on for lock effects only) */ /* turn off non-blocking mode (was turned on for lock effects only) */
if (fcntl(lfd, F_SETFL, 0) < 0) { if (fcntl(lfd, F_SETFL, 0) < 0) {
syslog(LOG_ERR, "%s: %s: %m", pp->printer, pp->lock_file); syslog(LOG_ERR, "%s: fcntl(%s): %m", pp->printer,
pp->lock_file);
exit(1); exit(1);
} }
ftruncate(lfd, 0); ftruncate(lfd, 0);
@ -214,7 +218,8 @@ printjob(struct printer *pp)
sprintf(line, "%u\n", pid); sprintf(line, "%u\n", pid);
pidoff = i = strlen(line); pidoff = i = strlen(line);
if (write(lfd, line, i) != i) { if (write(lfd, line, i) != i) {
syslog(LOG_ERR, "%s: %s: %m", pp->printer, pp->lock_file); syslog(LOG_ERR, "%s: write(%s): %m", pp->printer,
pp->lock_file);
exit(1); exit(1);
} }
/* /*
@ -222,26 +227,26 @@ printjob(struct printer *pp)
*/ */
if ((nitems = getq(pp, &queue)) < 0) { if ((nitems = getq(pp, &queue)) < 0) {
syslog(LOG_ERR, "%s: can't scan %s", pp->printer, syslog(LOG_ERR, "%s: can't scan %s", pp->printer,
pp->spool_dir); pp->spool_dir);
exit(1); exit(1);
} }
if (nitems == 0) /* no work to do */ if (nitems == 0) /* no work to do */
exit(0); exit(0);
if (stb.st_mode & LFM_RESET_QUE) { /* reset queue flag */ if (stb.st_mode & LFM_RESET_QUE) { /* reset queue flag */
if (fchmod(lfd, stb.st_mode & ~LFM_RESET_QUE) < 0) if (fchmod(lfd, stb.st_mode & ~LFM_RESET_QUE) < 0)
syslog(LOG_ERR, "%s: %s: %m", pp->printer, syslog(LOG_ERR, "%s: fchmod(%s): %m", pp->printer,
pp->lock_file); pp->lock_file);
} }
/* create a file which will be used to hold stderr from filters */ /* create a file which will be used to hold stderr from filters */
if ((tempfd = mkstemp(tempstderr)) == -1) { if ((tempfd = mkstemp(tempstderr)) == -1) {
syslog(LOG_ERR, "%s: mkstemp(%s): %m", pp->printer, syslog(LOG_ERR, "%s: mkstemp(%s): %m", pp->printer,
tempstderr); tempstderr);
exit(1); exit(1);
} }
if ((i = fchmod(tempfd, 0664)) == -1) { if ((i = fchmod(tempfd, 0664)) == -1) {
syslog(LOG_ERR, "%s: fchmod(%s): %m", pp->printer, syslog(LOG_ERR, "%s: fchmod(%s): %m", pp->printer,
tempstderr); tempstderr);
exit(1); exit(1);
} }
/* lpd doesn't need it to be open, it just needs it to exist */ /* lpd doesn't need it to be open, it just needs it to exist */
@ -264,8 +269,8 @@ again:
(void) snprintf(line, sizeof(line), "%s\n", q->job_cfname); (void) snprintf(line, sizeof(line), "%s\n", q->job_cfname);
i = strlen(line); i = strlen(line);
if (write(lfd, line, i) != i) if (write(lfd, line, i) != i)
syslog(LOG_ERR, "%s: %s: %m", pp->printer, syslog(LOG_ERR, "%s: write(%s): %m", pp->printer,
pp->lock_file); pp->lock_file);
if (!pp->remote) if (!pp->remote)
i = printit(pp, q->job_cfname); i = printit(pp, q->job_cfname);
else else
@ -284,8 +289,9 @@ again:
q = *qp++; q = *qp++;
if (fchmod(lfd, stb.st_mode & ~LFM_RESET_QUE) if (fchmod(lfd, stb.st_mode & ~LFM_RESET_QUE)
< 0) < 0)
syslog(LOG_WARNING, "%s: %s: %m", syslog(LOG_WARNING,
pp->printer, pp->lock_file); "%s: fchmod(%s): %m",
pp->printer, pp->lock_file);
break; break;
} }
} }
@ -306,15 +312,15 @@ again:
} }
(void) close(pfd); /* close printer */ (void) close(pfd); /* close printer */
if (ftruncate(lfd, pidoff) < 0) if (ftruncate(lfd, pidoff) < 0)
syslog(LOG_WARNING, "%s: %s: %m", syslog(LOG_WARNING, "%s: ftruncate(%s): %m",
pp->printer, pp->lock_file); pp->printer, pp->lock_file);
openpr(pp); /* try to reopen printer */ openpr(pp); /* try to reopen printer */
goto restart; goto restart;
} else { } else {
syslog(LOG_WARNING, "%s: job could not be %s (%s)", syslog(LOG_WARNING, "%s: job could not be %s (%s)",
pp->printer, pp->printer,
pp->remote ? "sent to remote host" : "printed", pp->remote ? "sent to remote host" : "printed",
q->job_cfname); q->job_cfname);
if (i == REPRINT) { if (i == REPRINT) {
/* ensure we don't attempt this job again */ /* ensure we don't attempt this job again */
(void) unlink(q->job_cfname); (void) unlink(q->job_cfname);
@ -331,7 +337,7 @@ again:
*/ */
if ((nitems = getq(pp, &queue)) < 0) { if ((nitems = getq(pp, &queue)) < 0) {
syslog(LOG_ERR, "%s: can't scan %s", pp->printer, syslog(LOG_ERR, "%s: can't scan %s", pp->printer,
pp->spool_dir); pp->spool_dir);
exit(1); exit(1);
} }
if (nitems == 0) { /* no more work to do */ if (nitems == 0) { /* no more work to do */
@ -378,7 +384,7 @@ printit(struct printer *pp, char *file)
* open control file; ignore if no longer there. * open control file; ignore if no longer there.
*/ */
if ((cfp = fopen(file, "r")) == NULL) { if ((cfp = fopen(file, "r")) == NULL) {
syslog(LOG_INFO, "%s: %s: %m", pp->printer, file); syslog(LOG_INFO, "%s: fopen(%s): %m", pp->printer, file);
return (OK); return (OK);
} }
/* /*
@ -524,11 +530,11 @@ printit(struct printer *pp, char *file)
continue; continue;
if (!didignorehdr) { if (!didignorehdr) {
syslog(LOG_INFO, "%s: in %s :", syslog(LOG_INFO, "%s: in %s :",
pp->printer, file); pp->printer, file);
didignorehdr = 1; didignorehdr = 1;
} }
syslog(LOG_INFO, "%s: ignoring line: '%c' %s", syslog(LOG_INFO, "%s: ignoring line: '%c' %s",
pp->printer, line[0], &line[1]); pp->printer, line[0], &line[1]);
continue; continue;
} }
i = print(pp, line[0], line+1); i = print(pp, line[0], line+1);
@ -607,7 +613,7 @@ print(struct printer *pp, int format, char *file)
if (lstat(file, &stb) < 0 || (fi = open(file, O_RDONLY)) < 0) { if (lstat(file, &stb) < 0 || (fi = open(file, O_RDONLY)) < 0) {
syslog(LOG_INFO, "%s: unable to open %s ('%c' line)", syslog(LOG_INFO, "%s: unable to open %s ('%c' line)",
pp->printer, file, format); pp->printer, file, format);
return (ERROR); return (ERROR);
} }
/* /*
@ -714,7 +720,7 @@ print(struct printer *pp, int format, char *file)
(void) unlink(".railmag"); (void) unlink(".railmag");
if ((fo = creat(".railmag", FILMOD)) < 0) { if ((fo = creat(".railmag", FILMOD)) < 0) {
syslog(LOG_ERR, "%s: cannot create .railmag", syslog(LOG_ERR, "%s: cannot create .railmag",
pp->printer); pp->printer);
(void) unlink(".railmag"); (void) unlink(".railmag");
} else { } else {
for (n = 0; n < 4; n++) { for (n = 0; n < 4; n++) {
@ -754,7 +760,7 @@ print(struct printer *pp, int format, char *file)
default: default:
(void) close(fi); (void) close(fi);
syslog(LOG_ERR, "%s: illegal format character '%c'", syslog(LOG_ERR, "%s: illegal format character '%c'",
pp->printer, format); pp->printer, format);
return (ERROR); return (ERROR);
} }
if (prog == NULL) { if (prog == NULL) {
@ -781,7 +787,8 @@ print(struct printer *pp, int format, char *file)
wait3(&wstatus, WUNTRACED, 0)) > 0 && pid != ofilter) wait3(&wstatus, WUNTRACED, 0)) > 0 && pid != ofilter)
; ;
if (pid < 0) if (pid < 0)
syslog(LOG_WARNING, "%s: after stopping 'of', wait3() returned: %m", syslog(LOG_WARNING,
"%s: after stopping 'of', wait3() returned: %m",
pp->printer); pp->printer);
else if (!WIFSTOPPED(wstatus)) { else if (!WIFSTOPPED(wstatus)) {
(void) close(fi); (void) close(fi);
@ -818,7 +825,8 @@ start:
; ;
if (pid < 0) { if (pid < 0) {
retcode = 100; retcode = 100;
syslog(LOG_WARNING, "%s: after execv(%s), wait() returned: %m", syslog(LOG_WARNING,
"%s: after execv(%s), wait() returned: %m",
pp->printer, prog); pp->printer, prog);
} else { } else {
wstatus_set = 1; wstatus_set = 1;
@ -857,7 +865,7 @@ start:
return (ERROR); return (ERROR);
default: default:
syslog(LOG_WARNING, "%s: filter '%c' exited (retcode=%d)", syslog(LOG_WARNING, "%s: filter '%c' exited (retcode=%d)",
pp->printer, format, retcode); pp->printer, format, retcode);
return (FILTERERR); return (FILTERERR);
} }
} }
@ -1130,7 +1138,7 @@ sendagain:
"no space on remote; waiting for queue to drain"); "no space on remote; waiting for queue to drain");
if (i == 10) if (i == 10)
syslog(LOG_ALERT, "%s: can't send to %s; queue full", syslog(LOG_ALERT, "%s: can't send to %s; queue full",
pp->printer, pp->remote_host); pp->printer, pp->remote_host);
sleep(5 * 60); sleep(5 * 60);
} }
if (i) if (i)
@ -1656,7 +1664,7 @@ openpr(const struct printer *pp)
opentty(pp); opentty(pp);
} else { } else {
syslog(LOG_ERR, "%s: no line printer device or host name", syslog(LOG_ERR, "%s: no line printer device or host name",
pp->printer); pp->printer);
exit(1); exit(1);
} }
@ -1681,8 +1689,8 @@ openpr(const struct printer *pp)
cp++; cp++;
execl(pp->filters[LPF_OUTPUT], cp, width, length, execl(pp->filters[LPF_OUTPUT], cp, width, length,
(char *)0); (char *)0);
syslog(LOG_ERR, "%s: %s: %m", pp->printer, syslog(LOG_ERR, "%s: execl(%s): %m", pp->printer,
pp->filters[LPF_OUTPUT]); pp->filters[LPF_OUTPUT]);
exit(1); exit(1);
} }
(void) close(p[0]); /* close input side */ (void) close(p[0]); /* close input side */
@ -1709,7 +1717,7 @@ opennet(const struct printer *pp)
port = strtoul(pp->lp, &ep, 0); port = strtoul(pp->lp, &ep, 0);
if (*ep != '@' || port > 65535) { if (*ep != '@' || port > 65535) {
syslog(LOG_ERR, "%s: bad port number: %s", pp->printer, syslog(LOG_ERR, "%s: bad port number: %s", pp->printer,
pp->lp); pp->lp);
exit(1); exit(1);
} }
ep++; ep++;
@ -1861,7 +1869,8 @@ pstatus(const struct printer *pp, const char *msg, ...)
umask(0); umask(0);
fd = open(pp->status_file, O_WRONLY|O_CREAT|O_EXLOCK, STAT_FILE_MODE); fd = open(pp->status_file, O_WRONLY|O_CREAT|O_EXLOCK, STAT_FILE_MODE);
if (fd < 0) { if (fd < 0) {
syslog(LOG_ERR, "%s: %s: %m", pp->printer, pp->status_file); syslog(LOG_ERR, "%s: open(%s): %m", pp->printer,
pp->status_file);
exit(1); exit(1);
} }
ftruncate(fd, 0); ftruncate(fd, 0);