[git commit] do not duplicate CONFIG_PID_FILE_PATH and ".pid" strings

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Mon Mar 18 07:54:43 UTC 2019


On 17 March 2019 19:48:39 CET, Denys Vlasenko <vda.linux at googlemail.com> wrote:
>commit:
>https://git.busybox.net/busybox/commit/?id=5059653882dbd86e3bbf48389f9f81b0fac8cd0a
>branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
>
>   text	   data	    bss	    dec	    hex	filename
> 981737	    485	   7296	 989518	  f194e	busybox_old
> 981704	    485	   7296	 989485	  f192d	busybox_unstripped
>

>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);

concat_path_file()?

>+	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);

Ditto.

Thanks,

>+	unlink(buf);
>+}



More information about the busybox mailing list