shared: add formats-util.h

[elogind.git] / src / shared / log.c

diff --git a/src/shared/log.c b/src/shared/log.c
index a870415a0065e202017d972942e20ed2daad2511..32ec581d8d591e5b3bf9637b8505bfd9b0545dd3 100644 (file)
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -34,6 +34,7 @@
 #include "missing.h"
 #include "macro.h"
 #include "socket-util.h"
 #include "missing.h"
 #include "macro.h"
 #include "socket-util.h"

+#include "formats-util.h"

 
 #define SNDBUF_SIZE (8*1024*1024)
 
 
 #define SNDBUF_SIZE (8*1024*1024)
 


@@ -331,7 +332,6 @@ static int write_to_console(
 
         if (show_location) {
                 snprintf(location, sizeof(location), "(%s:%i) ", file, line);
 
         if (show_location) {
                 snprintf(location, sizeof(location), "(%s:%i) ", file, line);

-                char_array_0(location);

                 IOVEC_SET_STRING(iovec[n++], location);
         }
 
                 IOVEC_SET_STRING(iovec[n++], location);
         }
 


@@ -375,7 +375,9 @@ static int write_to_syslog(
                 const char *object,
                 const char *buffer) {
 
                 const char *object,
                 const char *buffer) {
 

-        char header_priority[1 + DECIMAL_STR_MAX(int) + 2], header_time[64], header_pid[1 + DECIMAL_STR_MAX(pid_t) + 4];
+        char header_priority[2 + DECIMAL_STR_MAX(int) + 1],
+             header_time[64],
+             header_pid[4 + DECIMAL_STR_MAX(pid_t) + 1];

         struct iovec iovec[5] = {};
         struct msghdr msghdr = {
                 .msg_iov = iovec,
         struct iovec iovec[5] = {};
         struct msghdr msghdr = {
                 .msg_iov = iovec,


@@ -387,8 +389,7 @@ static int write_to_syslog(
         if (syslog_fd < 0)
                 return 0;
 
         if (syslog_fd < 0)
                 return 0;
 

-        snprintf(header_priority, sizeof(header_priority), "<%i>", level);
-        char_array_0(header_priority);
+        xsprintf(header_priority, "<%i>", level);

 
         t = (time_t) (now(CLOCK_REALTIME) / USEC_PER_SEC);
         tm = localtime(&t);
 
         t = (time_t) (now(CLOCK_REALTIME) / USEC_PER_SEC);
         tm = localtime(&t);


@@ -398,8 +399,7 @@ static int write_to_syslog(
         if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0)
                 return -EINVAL;
 
         if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0)
                 return -EINVAL;
 

-        snprintf(header_pid, sizeof(header_pid), "["PID_FMT"]: ", getpid());
-        char_array_0(header_pid);
+        xsprintf(header_pid, "["PID_FMT"]: ", getpid());

 
         IOVEC_SET_STRING(iovec[0], header_priority);
         IOVEC_SET_STRING(iovec[1], header_time);
 
         IOVEC_SET_STRING(iovec[0], header_priority);
         IOVEC_SET_STRING(iovec[1], header_time);


@@ -438,17 +438,15 @@ static int write_to_kmsg(
                 const char *object,
                 const char *buffer) {
 
                 const char *object,
                 const char *buffer) {
 

-        char header_priority[1 + DECIMAL_STR_MAX(int) + 2], header_pid[1 + DECIMAL_STR_MAX(pid_t) + 4];
+        char header_priority[2 + DECIMAL_STR_MAX(int) + 1],
+             header_pid[4 + DECIMAL_STR_MAX(pid_t) + 1];

         struct iovec iovec[5] = {};
 
         if (kmsg_fd < 0)
                 return 0;
 
         struct iovec iovec[5] = {};
 
         if (kmsg_fd < 0)
                 return 0;
 

-        snprintf(header_priority, sizeof(header_priority), "<%i>", level);
-        char_array_0(header_priority);
-
-        snprintf(header_pid, sizeof(header_pid), "["PID_FMT"]: ", getpid());
-        char_array_0(header_pid);
+        xsprintf(header_priority, "<%i>", level);
+        xsprintf(header_pid, "["PID_FMT"]: ", getpid());

 
         IOVEC_SET_STRING(iovec[0], header_priority);
         IOVEC_SET_STRING(iovec[1], program_invocation_short_name);
 
         IOVEC_SET_STRING(iovec[0], header_priority);
         IOVEC_SET_STRING(iovec[1], program_invocation_short_name);


@@ -497,7 +495,6 @@ static int log_do_header(
                  isempty(object) ? "" : object,
                  isempty(object) ? "" : "\n",
                  program_invocation_short_name);
                  isempty(object) ? "" : object,
                  isempty(object) ? "" : "\n",
                  program_invocation_short_name);

-        header[size - 1] = '\0';

 
         return 0;
 }
 
         return 0;
 }


@@ -659,7 +656,6 @@ int log_internalv(
                 errno = error;
 
         vsnprintf(buffer, sizeof(buffer), format, ap);
                 errno = error;
 
         vsnprintf(buffer, sizeof(buffer), format, ap);

-        char_array_0(buffer);

 
         return log_dispatch(level, error, file, line, func, NULL, NULL, buffer);
 }
 
         return log_dispatch(level, error, file, line, func, NULL, NULL, buffer);
 }


@@ -707,7 +703,6 @@ int log_object_internalv(
                 errno = error;
 
         vsnprintf(buffer, sizeof(buffer), format, ap);
                 errno = error;
 
         vsnprintf(buffer, sizeof(buffer), format, ap);

-        char_array_0(buffer);

 
         return log_dispatch(level, error, file, line, func, object_field, object, buffer);
 }
 
         return log_dispatch(level, error, file, line, func, object_field, object, buffer);
 }


@@ -749,7 +744,6 @@ static void log_assert(
         snprintf(buffer, sizeof(buffer), format, text, file, line, func);
         REENABLE_WARNING;
 
         snprintf(buffer, sizeof(buffer), format, text, file, line, func);
         REENABLE_WARNING;
 

-        char_array_0(buffer);

         log_abort_msg = buffer;
 
         log_dispatch(level, 0, file, line, func, NULL, NULL, buffer);
         log_abort_msg = buffer;
 
         log_dispatch(level, 0, file, line, func, NULL, NULL, buffer);


@@ -875,7 +869,6 @@ int log_struct_internal(
                 va_copy(aq, ap);
                 vsnprintf(buf, sizeof(buf), format, aq);
                 va_end(aq);
                 va_copy(aq, ap);
                 vsnprintf(buf, sizeof(buf), format, aq);
                 va_end(aq);

-                char_array_0(buf);

 
                 if (startswith(buf, "MESSAGE=")) {
                         found = true;
 
                 if (startswith(buf, "MESSAGE=")) {
                         found = true;


@@ -922,7 +915,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
          * The systemd.log_xyz= settings are parsed by all tools, and
          * so is "debug".
          *
          * The systemd.log_xyz= settings are parsed by all tools, and
          * so is "debug".
          *

-         * However, "quiet" is only parsed by PID 1!
+         * However, "quiet" is only parsed by PID 1, and only turns of
+         * status output to /dev/console, but does not alter the log
+         * level.

          */
 
         if (streq(key, "debug") && !value)
          */
 
         if (streq(key, "debug") && !value)


@@ -955,7 +950,11 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
 void log_parse_environment(void) {
         const char *e;
 
 void log_parse_environment(void) {
         const char *e;
 

-        (void) parse_proc_cmdline(parse_proc_cmdline_item);
+        if (get_ctty_devnr(0, NULL) < 0)
+                /* Only try to read the command line in daemons.
+                   We assume that anything that has a controlling
+                   tty is user stuff. */
+                (void) parse_proc_cmdline(parse_proc_cmdline_item);

 
         e = secure_getenv("SYSTEMD_LOG_TARGET");
         if (e && log_set_target_from_string(e) < 0)
 
         e = secure_getenv("SYSTEMD_LOG_TARGET");
         if (e && log_set_target_from_string(e) < 0)