diff options
| -rw-r--r-- | misc.c | 5 | ||||
| -rw-r--r-- | options.c | 6 | ||||
| -rw-r--r-- | push.c | 6 | ||||
| -rw-r--r-- | status.c | 4 |
4 files changed, 11 insertions, 10 deletions
@@ -155,9 +155,8 @@ set_nice (int niceval) { #ifdef HAVE_NICE errno = 0; - nice (niceval); - if (errno != 0) - msg (M_WARN | M_ERRNO, "WARNING: nice %d failed", niceval); + if (nice (niceval) < 0 && errno != 0) + msg (M_WARN | M_ERRNO, "WARNING: nice %d failed: %s", niceval, strerror(errno)); else msg (M_INFO, "nice %d succeeded", niceval); #else @@ -4014,7 +4014,7 @@ add_option (struct options *options, { if (options->inetd != -1) { - msg (msglevel, opterr); + msg (msglevel, "%s", opterr); goto err; } else @@ -4024,7 +4024,7 @@ add_option (struct options *options, { if (options->inetd != -1) { - msg (msglevel, opterr); + msg (msglevel, "%s", opterr); goto err; } else @@ -4034,7 +4034,7 @@ add_option (struct options *options, { if (name != NULL) { - msg (msglevel, opterr); + msg (msglevel, "%s", opterr); goto err; } name = p[z]; @@ -179,7 +179,7 @@ send_push_reply (struct context *c) const int safe_cap = BCAP (&buf) - extra; bool push_sent = false; - buf_printf (&buf, cmd); + buf_printf (&buf, "%s", cmd); while (e) { @@ -196,7 +196,7 @@ send_push_reply (struct context *c) push_sent = true; multi_push = true; buf_reset_len (&buf); - buf_printf (&buf, cmd); + buf_printf (&buf, "%s", cmd); } } if (BLEN (&buf) + l >= safe_cap) @@ -232,7 +232,7 @@ send_push_reply (struct context *c) bool status = false; buf_reset_len (&buf); - buf_printf (&buf, cmd); + buf_printf (&buf, "%s", cmd); status = send_control_channel_string (c, BSTR(&buf), D_PUSH); if (!status) goto fail; @@ -168,7 +168,9 @@ status_flush (struct status_output *so) #if defined(HAVE_FTRUNCATE) { const off_t off = lseek (so->fd, (off_t)0, SEEK_CUR); - ftruncate (so->fd, off); + if (ftruncate (so->fd, off) != 0) { + msg (M_WARN, "Failed to truncate status file: %s", strerror(errno)); + } } #elif defined(HAVE_CHSIZE) { |