diff options
author | Sami Kerola | 2014-06-23 00:02:43 +0200 |
---|---|---|
committer | Sami Kerola | 2014-07-28 22:15:16 +0200 |
commit | d8b616c216113ba4986a9d537719e5f434dca18b (patch) | |
tree | 84811fe2a1f3247f75d19a7c6858c8f7682aff50 /misc-utils/logger.c | |
parent | logger: ensure program writes everything to syslog file descriptor (diff) | |
download | kernel-qcow2-util-linux-d8b616c216113ba4986a9d537719e5f434dca18b.tar.gz kernel-qcow2-util-linux-d8b616c216113ba4986a9d537719e5f434dca18b.tar.xz kernel-qcow2-util-linux-d8b616c216113ba4986a9d537719e5f434dca18b.zip |
logger: fix indentation issues
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'misc-utils/logger.c')
-rw-r--r-- | misc-utils/logger.c | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/misc-utils/logger.c b/misc-utils/logger.c index 37d632edf..0c6dbbdd2 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -76,8 +76,7 @@ enum { OPT_JOURNALD }; - -static char* get_prio_prefix(char *msg, int *prio) +static char *get_prio_prefix(char *msg, int *prio) { int p; char *end = NULL; @@ -133,8 +132,7 @@ static int pencode(char *s) if (fac < 0) errx(EXIT_FAILURE, _("unknown facility name: %s"), save); *s++ = '.'; - } - else { + } else { fac = LOG_USER; s = save; } @@ -261,30 +259,30 @@ static int journald_entry(FILE *fp) static void mysyslog(int fd, int logflags, int pri, char *tag, char *msg) { - char buf[1000], pid[30], *cp, *tp; - time_t now; - - if (fd > -1) { - if (logflags & LOG_PID) - snprintf (pid, sizeof(pid), "[%d]", getpid()); - else - pid[0] = 0; - if (tag) - cp = tag; - else { - cp = getlogin(); - if (!cp) - cp = "<someone>"; - } - time(&now); - tp = ctime(&now)+4; - - snprintf(buf, sizeof(buf), "<%d>%.15s %.200s%s: %.400s", - pri, tp, cp, pid, msg); - - if (write_all(fd, buf, strlen(buf)+1) < 0) - warn(_("write failed")); - } + char buf[1000], pid[30], *cp, *tp; + time_t now; + + if (fd > -1) { + if (logflags & LOG_PID) + snprintf(pid, sizeof(pid), "[%d]", getpid()); + else + pid[0] = 0; + if (tag) + cp = tag; + else { + cp = getlogin(); + if (!cp) + cp = "<someone>"; + } + time(&now); + tp = ctime(&now) + 4; + + snprintf(buf, sizeof(buf), "<%d>%.15s %.200s%s: %.400s", + pri, tp, cp, pid, msg); + + if (write_all(fd, buf, strlen(buf) + 1) < 0) + warn(_("write failed")); + } } static void __attribute__ ((__noreturn__)) usage(FILE *out) @@ -450,17 +448,19 @@ int main(int argc, char **argv) for (p = buf, endp = buf + sizeof(buf) - 2; *argv;) { len = strlen(*argv); if (p + len > endp && p > buf) { - if (!usock && !server) - syslog(pri, "%s", buf); - else - mysyslog(LogSock, logflags, pri, tag, buf); + if (!usock && !server) + syslog(pri, "%s", buf); + else + mysyslog(LogSock, logflags, pri, tag, + buf); p = buf; } if (len > sizeof(buf) - 1) { - if (!usock && !server) - syslog(pri, "%s", *argv++); - else - mysyslog(LogSock, logflags, pri, tag, *argv++); + if (!usock && !server) + syslog(pri, "%s", *argv++); + else + mysyslog(LogSock, logflags, pri, tag, + *argv++); } else { if (p != buf) *p++ = ' '; @@ -469,31 +469,31 @@ int main(int argc, char **argv) } } if (p != buf) { - if (!usock && !server) - syslog(pri, "%s", buf); - else - mysyslog(LogSock, logflags, pri, tag, buf); + if (!usock && !server) + syslog(pri, "%s", buf); + else + mysyslog(LogSock, logflags, pri, tag, buf); } } else { char *msg; int default_priority = pri; while (fgets(buf, sizeof(buf), stdin) != NULL) { - /* glibc is buggy and adds an additional newline, - so we have to remove it here until glibc is fixed */ - int len = strlen(buf); + /* glibc is buggy and adds an additional newline, + so we have to remove it here until glibc is fixed */ + int len = strlen(buf); - if (len > 0 && buf[len - 1] == '\n') - buf[len - 1] = '\0'; + if (len > 0 && buf[len - 1] == '\n') + buf[len - 1] = '\0'; msg = buf; pri = default_priority; if (prio_prefix && msg[0] == '<') msg = get_prio_prefix(msg, &pri); - if (!usock && !server) - syslog(pri, "%s", msg); - else - mysyslog(LogSock, logflags, pri, tag, msg); + if (!usock && !server) + syslog(pri, "%s", msg); + else + mysyslog(LogSock, logflags, pri, tag, msg); } } if (!usock && !server) |