Merge branch 'busybox' into merge

2 files changed, 19 insertions, 0 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 58e391fd9..1f1a18aab 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -814,6 +814,7 @@ static int find_script_by_name(const char *name)
         return -1;
 }
 
+int scripted_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int scripted_main(int argc UNUSED_PARAM, char **argv)
 {
         int script = find_script_by_name(applet_name);
diff --git a/libbb/pidfile.c b/libbb/pidfile.c
index a48dfc38b..a6a282562 100644
--- a/libbb/pidfile.c
+++ b/libbb/pidfile.c
@@ -38,3 +38,21 @@ void FAST_FUNC write_pidfile(const char *path)
         }
         close(pid_fd);
 }
+
+void FAST_FUNC write_pidfile_std_path_and_ext(const char *name)
+{
+        char buf[sizeof(CONFIG_PID_FILE_PATH) + 64];
+
+        snprintf(buf, sizeof(buf), CONFIG_PID_FILE_PATH"/%s.pid", name);
+        write_pidfile(buf);
+}
+
+void FAST_FUNC remove_pidfile_std_path_and_ext(const char *name)
+{
+        char buf[sizeof(CONFIG_PID_FILE_PATH) + 64];
+
+        if (!wrote_pidfile)
+                return;
+        snprintf(buf, sizeof(buf), CONFIG_PID_FILE_PATH"/%s.pid", name);
+        unlink(buf);
+}