From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 27 Oct 2010 03:45:57 +0000 (+0200)
Subject: main: move make_null_stdio() to util.c
X-Git-Tag: v12~133
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ade509ce73ba1de3bcda8b012961a3045f721df7;hp=4690698d4949d8b42e4c3a87944075ceaf685e5a

main: move make_null_stdio() to util.c
---

diff --git a/src/main.c b/src/main.c
index 7dad015e3..83cf2e705 100644
--- a/src/main.c
+++ b/src/main.c
@@ -180,20 +180,6 @@ static void install_crash_handler(void) {
         sigaction_many(&sa, SIGNALS_CRASH_HANDLER, -1);
 }
 
-static int make_null_stdio(void) {
-        int null_fd, r;
-
-        if ((null_fd = open("/dev/null", O_RDWR|O_NOCTTY)) < 0) {
-                log_error("Failed to open /dev/null: %m");
-                return -errno;
-        }
-
-        if ((r = make_stdio(null_fd)) < 0)
-                log_warning("Failed to dup2() device: %s", strerror(-r));
-
-        return r;
-}
-
 static int console_setup(bool do_reset) {
         int tty_fd, r;
 
diff --git a/src/util.c b/src/util.c
index d653d6b54..9a82c71dc 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2605,6 +2605,15 @@ int make_stdio(int fd) {
         return 0;
 }
 
+int make_null_stdio(void) {
+        int null_fd;
+
+        if ((null_fd = open("/dev/null", O_RDWR|O_NOCTTY)) < 0)
+                return -errno;
+
+        return make_stdio(null_fd);
+}
+
 bool is_clean_exit(int code, int status) {
 
         if (code == CLD_EXITED)
diff --git a/src/util.h b/src/util.h
index 71889f142..ddf089cfe 100644
--- a/src/util.h
+++ b/src/util.h
@@ -265,6 +265,7 @@ char *format_timestamp_pretty(char *buf, size_t l, usec_t t);
 char *format_timespan(char *buf, size_t l, usec_t t);
 
 int make_stdio(int fd);
+int make_null_stdio(void);
 
 bool is_clean_exit(int code, int status);
 bool is_clean_exit_lsb(int code, int status);