diff options
| author | Denys Vlasenko | 2019-03-17 19:47:52 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2019-03-17 19:48:39 +0100 |
| commit | 5059653882dbd86e3bbf48389f9f81b0fac8cd0a (patch) | |
| tree | c485a272add5b3a684f9ac97aad69a7c07aadb85 /networking | |
| parent | 2bbd1e1e8ababc480ff5d373847ab98ba0cc23dd (diff) | |
| download | busybox-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 'networking')
| -rw-r--r-- | networking/inetd.c | 4 | ||||
| -rw-r--r-- | networking/ntpd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/networking/inetd.c b/networking/inetd.c index 8f871ee..da65511 100644 --- a/networking/inetd.c +++ b/networking/inetd.c @@ -1207,7 +1207,7 @@ static void clean_up_and_exit(int sig UNUSED_PARAM) if (ENABLE_FEATURE_CLEAN_UP) close(sep->se_fd); } - remove_pidfile(CONFIG_PID_FILE_PATH "/inetd.pid"); + remove_pidfile_std_path_and_ext("inetd"); exit(EXIT_SUCCESS); } @@ -1256,7 +1256,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv) setgroups(1, &gid); } - write_pidfile(CONFIG_PID_FILE_PATH "/inetd.pid"); + write_pidfile_std_path_and_ext("inetd"); /* never fails under Linux (except if you pass it bad arguments) */ getrlimit(RLIMIT_NOFILE, &rlim_ofile); diff --git a/networking/ntpd.c b/networking/ntpd.c index 0f474bc..b2e7792 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c @@ -2641,7 +2641,7 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv) */ cnt = G.peer_cnt * (INITIAL_SAMPLES + 1); - write_pidfile(CONFIG_PID_FILE_PATH "/ntpd.pid"); + write_pidfile_std_path_and_ext("ntpd"); while (!bb_got_signal) { llist_t *item; @@ -2814,7 +2814,7 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv) } } /* while (!bb_got_signal) */ - remove_pidfile(CONFIG_PID_FILE_PATH "/ntpd.pid"); + remove_pidfile_std_path_and_ext("ntpd"); kill_myself_with_sig(bb_got_signal); } |