summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2019-03-17 19:47:52 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2019-03-17 19:48:39 +0100
commit5059653882dbd86e3bbf48389f9f81b0fac8cd0a (patch)
treec485a272add5b3a684f9ac97aad69a7c07aadb85 /miscutils
parent2bbd1e1e8ababc480ff5d373847ab98ba0cc23dd (diff)
downloadbusybox-w32-5059653882dbd86e3bbf48389f9f81b0fac8cd0a.tar.gz
busybox-w32-5059653882dbd86e3bbf48389f9f81b0fac8cd0a.tar.bz2
busybox-w32-5059653882dbd86e3bbf48389f9f81b0fac8cd0a.zip
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 'miscutils')
-rw-r--r--miscutils/crond.c2
-rw-r--r--miscutils/watchdog.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/miscutils/crond.c b/miscutils/crond.c
index 2e36c406b..25e5503c7 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -1056,7 +1056,7 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
1056 1056
1057 log8("crond (busybox "BB_VER") started, log level %d", G.log_level); 1057 log8("crond (busybox "BB_VER") started, log level %d", G.log_level);
1058 rescan_crontab_dir(); 1058 rescan_crontab_dir();
1059 write_pidfile(CONFIG_PID_FILE_PATH "/crond.pid"); 1059 write_pidfile_std_path_and_ext("crond");
1060#if ENABLE_FEATURE_CROND_SPECIAL_TIMES 1060#if ENABLE_FEATURE_CROND_SPECIAL_TIMES
1061 if (touch_reboot_file()) 1061 if (touch_reboot_file())
1062 start_jobs(START_ME_REBOOT); /* start @reboot entries, if any */ 1062 start_jobs(START_ME_REBOOT); /* start @reboot entries, if any */
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 1e9ecc5e8..86600b72f 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -64,7 +64,7 @@ static void shutdown_watchdog(void)
64 64
65static void shutdown_on_signal(int sig UNUSED_PARAM) 65static void shutdown_on_signal(int sig UNUSED_PARAM)
66{ 66{
67 remove_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid"); 67 remove_pidfile_std_path_and_ext("watchdog");
68 shutdown_watchdog(); 68 shutdown_watchdog();
69 _exit(EXIT_SUCCESS); 69 _exit(EXIT_SUCCESS);
70} 70}
@@ -136,7 +136,7 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv)
136 stimer_duration, htimer_duration * 1000); 136 stimer_duration, htimer_duration * 1000);
137#endif 137#endif
138 138
139 write_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid"); 139 write_pidfile_std_path_and_ext("watchdog");
140 140
141 while (1) { 141 while (1) {
142 /* 142 /*