summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--src/basic/log.c1
-rw-r--r--src/basic/syslog-util.c115
-rw-r--r--src/basic/syslog-util.h34
-rw-r--r--src/basic/util.c88
-rw-r--r--src/basic/util.h10
-rw-r--r--src/core/dbus-execute.c1
-rw-r--r--src/core/dbus-manager.c1
-rw-r--r--src/core/execute.c1
-rw-r--r--src/import/importd.c1
-rw-r--r--src/journal/cat.c1
-rw-r--r--src/journal/journalctl.c1
-rw-r--r--src/journal/journald-stream.c1
-rw-r--r--src/journal/journald-syslog.c1
-rw-r--r--src/libudev/libudev-util.c1
-rw-r--r--src/shared/bus-util.c1
-rw-r--r--src/shared/conf-parser.c1
17 files changed, 163 insertions, 98 deletions
diff --git a/Makefile.am b/Makefile.am
index 549ac014e3..78788f65e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -803,6 +803,8 @@ libbasic_la_SOURCES = \
src/basic/proc-cmdline.h \
src/basic/fs-util.c \
src/basic/fs-util.h \
+ src/basic/syslog-util.c \
+ src/basic/syslog-util.h \
src/basic/stat-util.c \
src/basic/stat-util.h \
src/basic/mount-util.c \
diff --git a/src/basic/log.c b/src/basic/log.c
index d0db77eca0..c99746f916 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -43,6 +43,7 @@
#include "socket-util.h"
#include "string-table.h"
#include "string-util.h"
+#include "syslog-util.h"
#include "terminal-util.h"
#include "util.h"
diff --git a/src/basic/syslog-util.c b/src/basic/syslog-util.c
new file mode 100644
index 0000000000..01577941a0
--- /dev/null
+++ b/src/basic/syslog-util.c
@@ -0,0 +1,115 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ 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 <syslog.h>
+
+#include "assert.h"
+#include "hexdecoct.h"
+#include "string-table.h"
+#include "syslog-util.h"
+
+int syslog_parse_priority(const char **p, int *priority, bool with_facility) {
+ int a = 0, b = 0, c = 0;
+ int k;
+
+ assert(p);
+ assert(*p);
+ assert(priority);
+
+ if ((*p)[0] != '<')
+ return 0;
+
+ if (!strchr(*p, '>'))
+ return 0;
+
+ if ((*p)[2] == '>') {
+ c = undecchar((*p)[1]);
+ k = 3;
+ } else if ((*p)[3] == '>') {
+ b = undecchar((*p)[1]);
+ c = undecchar((*p)[2]);
+ k = 4;
+ } else if ((*p)[4] == '>') {
+ a = undecchar((*p)[1]);
+ b = undecchar((*p)[2]);
+ c = undecchar((*p)[3]);
+ k = 5;
+ } else
+ return 0;
+
+ if (a < 0 || b < 0 || c < 0 ||
+ (!with_facility && (a || b || c > 7)))
+ return 0;
+
+ if (with_facility)
+ *priority = a*100 + b*10 + c;
+ else
+ *priority = (*priority & LOG_FACMASK) | c;
+
+ *p += k;
+ return 1;
+}
+
+static const char *const log_facility_unshifted_table[LOG_NFACILITIES] = {
+ [LOG_FAC(LOG_KERN)] = "kern",
+ [LOG_FAC(LOG_USER)] = "user",
+ [LOG_FAC(LOG_MAIL)] = "mail",
+ [LOG_FAC(LOG_DAEMON)] = "daemon",
+ [LOG_FAC(LOG_AUTH)] = "auth",
+ [LOG_FAC(LOG_SYSLOG)] = "syslog",
+ [LOG_FAC(LOG_LPR)] = "lpr",
+ [LOG_FAC(LOG_NEWS)] = "news",
+ [LOG_FAC(LOG_UUCP)] = "uucp",
+ [LOG_FAC(LOG_CRON)] = "cron",
+ [LOG_FAC(LOG_AUTHPRIV)] = "authpriv",
+ [LOG_FAC(LOG_FTP)] = "ftp",
+ [LOG_FAC(LOG_LOCAL0)] = "local0",
+ [LOG_FAC(LOG_LOCAL1)] = "local1",
+ [LOG_FAC(LOG_LOCAL2)] = "local2",
+ [LOG_FAC(LOG_LOCAL3)] = "local3",
+ [LOG_FAC(LOG_LOCAL4)] = "local4",
+ [LOG_FAC(LOG_LOCAL5)] = "local5",
+ [LOG_FAC(LOG_LOCAL6)] = "local6",
+ [LOG_FAC(LOG_LOCAL7)] = "local7"
+};
+
+DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(log_facility_unshifted, int, LOG_FAC(~0));
+
+bool log_facility_unshifted_is_valid(int facility) {
+ return facility >= 0 && facility <= LOG_FAC(~0);
+}
+
+static const char *const log_level_table[] = {
+ [LOG_EMERG] = "emerg",
+ [LOG_ALERT] = "alert",
+ [LOG_CRIT] = "crit",
+ [LOG_ERR] = "err",
+ [LOG_WARNING] = "warning",
+ [LOG_NOTICE] = "notice",
+ [LOG_INFO] = "info",
+ [LOG_DEBUG] = "debug"
+};
+
+DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(log_level, int, LOG_DEBUG);
+
+bool log_level_is_valid(int level) {
+ return level >= 0 && level <= LOG_DEBUG;
+}
diff --git a/src/basic/syslog-util.h b/src/basic/syslog-util.h
new file mode 100644
index 0000000000..eb79c6dbd8
--- /dev/null
+++ b/src/basic/syslog-util.h
@@ -0,0 +1,34 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ 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 <stdbool.h>
+
+int log_facility_unshifted_to_string_alloc(int i, char **s);
+int log_facility_unshifted_from_string(const char *s);
+bool log_facility_unshifted_is_valid(int faciliy);
+
+int log_level_to_string_alloc(int i, char **s);
+int log_level_from_string(const char *s);
+bool log_level_is_valid(int level);
+
+int syslog_parse_priority(const char **p, int *priority, bool with_facility);
diff --git a/src/basic/util.c b/src/basic/util.c
index 8c5e88f00c..55decc7eea 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -491,52 +491,6 @@ static const char *const sigchld_code_table[] = {
DEFINE_STRING_TABLE_LOOKUP(sigchld_code, int);
-static const char *const log_facility_unshifted_table[LOG_NFACILITIES] = {
- [LOG_FAC(LOG_KERN)] = "kern",
- [LOG_FAC(LOG_USER)] = "user",
- [LOG_FAC(LOG_MAIL)] = "mail",
- [LOG_FAC(LOG_DAEMON)] = "daemon",
- [LOG_FAC(LOG_AUTH)] = "auth",
- [LOG_FAC(LOG_SYSLOG)] = "syslog",
- [LOG_FAC(LOG_LPR)] = "lpr",
- [LOG_FAC(LOG_NEWS)] = "news",
- [LOG_FAC(LOG_UUCP)] = "uucp",
- [LOG_FAC(LOG_CRON)] = "cron",
- [LOG_FAC(LOG_AUTHPRIV)] = "authpriv",
- [LOG_FAC(LOG_FTP)] = "ftp",
- [LOG_FAC(LOG_LOCAL0)] = "local0",
- [LOG_FAC(LOG_LOCAL1)] = "local1",
- [LOG_FAC(LOG_LOCAL2)] = "local2",
- [LOG_FAC(LOG_LOCAL3)] = "local3",
- [LOG_FAC(LOG_LOCAL4)] = "local4",
- [LOG_FAC(LOG_LOCAL5)] = "local5",
- [LOG_FAC(LOG_LOCAL6)] = "local6",
- [LOG_FAC(LOG_LOCAL7)] = "local7"
-};
-
-DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(log_facility_unshifted, int, LOG_FAC(~0));
-
-bool log_facility_unshifted_is_valid(int facility) {
- return facility >= 0 && facility <= LOG_FAC(~0);
-}
-
-static const char *const log_level_table[] = {
- [LOG_EMERG] = "emerg",
- [LOG_ALERT] = "alert",
- [LOG_CRIT] = "crit",
- [LOG_ERR] = "err",
- [LOG_WARNING] = "warning",
- [LOG_NOTICE] = "notice",
- [LOG_INFO] = "info",
- [LOG_DEBUG] = "debug"
-};
-
-DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(log_level, int, LOG_DEBUG);
-
-bool log_level_is_valid(int level) {
- return level >= 0 && level <= LOG_DEBUG;
-}
-
static const char* const sched_policy_table[] = {
[SCHED_OTHER] = "other",
[SCHED_BATCH] = "batch",
@@ -1199,48 +1153,6 @@ int update_reboot_param_file(const char *param) {
return 0;
}
-int syslog_parse_priority(const char **p, int *priority, bool with_facility) {
- int a = 0, b = 0, c = 0;
- int k;
-
- assert(p);
- assert(*p);
- assert(priority);
-
- if ((*p)[0] != '<')
- return 0;
-
- if (!strchr(*p, '>'))
- return 0;
-
- if ((*p)[2] == '>') {
- c = undecchar((*p)[1]);
- k = 3;
- } else if ((*p)[3] == '>') {
- b = undecchar((*p)[1]);
- c = undecchar((*p)[2]);
- k = 4;
- } else if ((*p)[4] == '>') {
- a = undecchar((*p)[1]);
- b = undecchar((*p)[2]);
- c = undecchar((*p)[3]);
- k = 5;
- } else
- return 0;
-
- if (a < 0 || b < 0 || c < 0 ||
- (!with_facility && (a || b || c > 7)))
- return 0;
-
- if (with_facility)
- *priority = a*100 + b*10 + c;
- else
- *priority = (*priority & LOG_FACMASK) | c;
-
- *p += k;
- return 1;
-}
-
int version(void) {
puts(PACKAGE_STRING "\n"
SYSTEMD_FEATURES);
diff --git a/src/basic/util.h b/src/basic/util.h
index c3992349df..6c3434d15b 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -115,14 +115,6 @@ int ioprio_class_from_string(const char *s);
const char *sigchld_code_to_string(int i) _const_;
int sigchld_code_from_string(const char *s) _pure_;
-int log_facility_unshifted_to_string_alloc(int i, char **s);
-int log_facility_unshifted_from_string(const char *s);
-bool log_facility_unshifted_is_valid(int faciliy);
-
-int log_level_to_string_alloc(int i, char **s);
-int log_level_from_string(const char *s);
-bool log_level_is_valid(int level);
-
int sched_policy_to_string_alloc(int i, char **s);
int sched_policy_from_string(const char *s);
@@ -335,8 +327,6 @@ union inotify_event_buffer {
uint8_t raw[INOTIFY_EVENT_MAX];
};
-int syslog_parse_priority(const char **p, int *priority, bool with_facility);
-
int version(void);
bool fdname_is_valid(const char *s);
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 35f1b2913b..67405a1672 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -43,6 +43,7 @@
#include "seccomp-util.h"
#endif
#include "strv.h"
+#include "syslog-util.h"
#include "utf8.h"
BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index f737140363..3f631bd9a0 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -44,6 +44,7 @@
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
+#include "syslog-util.h"
#include "virt.h"
#include "watchdog.h"
diff --git a/src/core/execute.c b/src/core/execute.c
index 2982125b82..3814fd4381 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -92,6 +92,7 @@
#include "string-table.h"
#include "string-util.h"
#include "strv.h"
+#include "syslog-util.h"
#include "terminal-util.h"
#include "unit.h"
#include "user-util.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index 2a03507d3a..3c57713fa5 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -39,6 +39,7 @@
#include "socket-util.h"
#include "string-table.h"
#include "strv.h"
+#include "syslog-util.h"
#include "util.h"
typedef struct Transfer Transfer;
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 95a1868b93..7fd4198df8 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -31,6 +31,7 @@
#include "fd-util.h"
#include "parse-util.h"
#include "string-util.h"
+#include "syslog-util.h"
#include "util.h"
static char *arg_identifier = NULL;
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 8b8c50b436..1965522dfd 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -65,6 +65,7 @@
#include "set.h"
#include "sigbus.h"
#include "strv.h"
+#include "syslog-util.h"
#include "terminal-util.h"
#include "unit-name.h"
#include "user-util.h"
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index a9c940690f..8d9c416bc9 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -44,6 +44,7 @@
#include "selinux-util.h"
#include "socket-util.h"
#include "string-util.h"
+#include "syslog-util.h"
#define STDOUT_STREAMS_MAX 4096
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 7e9ba12560..488cccb6d9 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -36,6 +36,7 @@
#include "selinux-util.h"
#include "socket-util.h"
#include "string-util.h"
+#include "syslog-util.h"
/* Warn once every 30s if we missed syslog message */
#define WARN_FORWARD_SYSLOG_MISSED_USEC (30 * USEC_PER_SEC)
diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index a614230df4..574cfeac85 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -29,6 +29,7 @@
#include "MurmurHash2.h"
#include "device-nodes.h"
#include "libudev-private.h"
+#include "syslog-util.h"
#include "utf8.h"
/**
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 9fcc61dbd2..c854ff4344 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -44,6 +44,7 @@
#include "signal-util.h"
#include "string-util.h"
#include "strv.h"
+#include "syslog-util.h"
#include "unit-name.h"
#include "utf8.h"
#include "util.h"
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 4235e95d92..fa13eb8075 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -39,6 +39,7 @@
#include "strv.h"
#include "utf8.h"
#include "util.h"
+#include "syslog-util.h"
int config_item_table_lookup(
const void *table,
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-07 18:47:04 +0000