summaryrefslogtreecommitdiff
path: root/sysklogd
diff options
context:
space:
mode:
authorDenys Vlasenko2019-03-17 19:47:52 +0100
committerDenys Vlasenko2019-03-17 19:48:39 +0100
commit5059653882dbd86e3bbf48389f9f81b0fac8cd0a (patch)
treec485a272add5b3a684f9ac97aad69a7c07aadb85 /sysklogd
parent2bbd1e1e8ababc480ff5d373847ab98ba0cc23dd (diff)
downloadbusybox-5059653882dbd86e3bbf48389f9f81b0fac8cd0a.zip
busybox-5059653882dbd86e3bbf48389f9f81b0fac8cd0a.tar.gz
do not duplicate CONFIG_PID_FILE_PATH and ".pid" strings
text data bss dec hex filename 981737 485 7296 989518 f194e busybox_old 981704 485 7296 989485 f192d busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'sysklogd')
-rw-r--r--sysklogd/klogd.c4
-rw-r--r--sysklogd/syslogd.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 76eccf1..17b6ca2 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -231,7 +231,7 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
- write_pidfile(CONFIG_PID_FILE_PATH "/klogd.pid");
+ write_pidfile_std_path_and_ext("klogd");
used = 0;
while (!bb_got_signal) {
@@ -295,7 +295,7 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
klogd_close();
syslog(LOG_NOTICE, "klogd: exiting");
- remove_pidfile(CONFIG_PID_FILE_PATH "/klogd.pid");
+ remove_pidfile_std_path_and_ext("klogd");
if (bb_got_signal)
kill_myself_with_sig(bb_got_signal);
return EXIT_FAILURE;
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index f123594..d0dd1bd 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -1098,7 +1098,7 @@ static void do_syslogd(void)
} /* while (!bb_got_signal) */
timestamp_and_log_internal("syslogd exiting");
- remove_pidfile(CONFIG_PID_FILE_PATH "/syslogd.pid");
+ remove_pidfile_std_path_and_ext("syslogd");
ipcsyslog_cleanup();
if (option_mask32 & OPT_kmsg)
kmsg_cleanup();
@@ -1164,7 +1164,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
}
//umask(0); - why??
- write_pidfile(CONFIG_PID_FILE_PATH "/syslogd.pid");
+ write_pidfile_std_path_and_ext("syslogd");
do_syslogd();
/* return EXIT_SUCCESS; */