Rip out setting of the log level from udev_new and put it in a new function

This function is internal to elogind code, so external users of libudev
will not see those log messages. I think this is better. If we want to
allow that, the function could be put in libudev and exported.

v2: check that the string is more than one char before stripping quotes

diff --git a/Makefile.am b/Makefile.am
index f5bfd26425e985ce02bc9521dbd98eda0cb0e523..f41296b13eeb95f8f95c31e050e7ff9d7b64bd87 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -456,6 +456,8 @@ noinst_LTLIBRARIES += \
        libshared.la
 
 libshared_la_SOURCES = \
+       src/shared/udev-util.h \
+       src/shared/udev-util.c \
        src/shared/bus-util.c \
        src/shared/bus-util.h \
        src/shared/clean-ipc.c \

diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
new file mode 100644 (file)
index 0000000..f708dcf
--- /dev/null
+++ b/src/shared/udev-util.c
@@ -0,0 +1,56 @@
+/***
+  This file is part of systemd.
+
+  Copyright 2017 Zbigniew Jędrzejewski-Szmek
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <string.h>
+
+#include "fileio.h"
+#include "log.h"
+#include "string-util.h"
+#include "udev-util.h"
+
+int udev_parse_config(void) {
+        _cleanup_free_ char *val = NULL;
+        const char *log;
+        size_t n;
+        int r;
+
+        r = parse_env_file("/etc/udev/udev.conf", NEWLINE, "udev_log", &val, NULL);
+        if (r == -ENOENT || !val)
+                return 0;
+        if (r < 0)
+                return r;
+
+        /* unquote */
+        n = strlen(val);
+        if (n >= 2 &&
+            ((val[0] == '"' && val[n-1] == '"') ||
+             (val[0] == '\'' && val[n-1] == '\''))) {
+                val[n - 1] = '\0';
+                log = val + 1;
+        } else
+                log = val;
+
+        /* we set the udev log level here explicitly, this is supposed
+         * to regulate the code in libudev/ and udev/. */
+        r = log_set_max_level_from_string_realm(LOG_REALM_UDEV, log);
+        if (r < 0)
+                log_debug_errno(r, "/etc/udev/udev.conf: failed to set udev log level '%s', ignoring: %m", log);
+
+        return 0;
+}

diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index d76ff52863e7805e174eb74026eb731a0fd3e3e4..bbbdd7b955527be380b9a81f22e111624eedbdd4 100644 (file)
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -50,3 +50,5 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_monitor*, udev_monitor_unref);
 #endif // 0
 #define _cleanup_udev_monitor_unref_ _cleanup_(udev_monitor_unrefp)
 #define _cleanup_udev_list_cleanup_ _cleanup_(udev_list_cleanup)
+
+int udev_parse_config(void);