X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fpidfile.c;h=7b8fee21c23e065db0a15f6dc129d7f2a2dc76a9;hb=9f5a577a3241597cb5e7ba9f6df33c2e3c440e44;hp=64e67c322013d81d0304bb411b6829796f3dacea;hpb=80edead5ea731c0c144def4d249eb88fb16001ef;p=oweals%2Fbusybox.git diff --git a/libbb/pidfile.c b/libbb/pidfile.c index 64e67c322..7b8fee21c 100644 --- a/libbb/pidfile.c +++ b/libbb/pidfile.c @@ -11,22 +11,30 @@ #define WANT_PIDFILE 1 #include "libbb.h" -int write_pidfile(const char *path) +smallint wrote_pidfile; + +void FAST_FUNC write_pidfile(const char *path) { int pid_fd; char *end; char buf[sizeof(int)*3 + 2]; + struct stat sb; if (!path) - return 1; + return; /* we will overwrite stale pidfile */ pid_fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, 0666); if (pid_fd < 0) - return 0; - /* few bytes larger, but doesn't use stdio */ - end = utoa_to_buf(getpid(), buf, sizeof(buf)); - *end = '\n'; - full_write(pid_fd, buf, end - buf + 1); + return; + + /* path can be "/dev/null"! Test for such cases */ + wrote_pidfile = (fstat(pid_fd, &sb) == 0) && S_ISREG(sb.st_mode); + + if (wrote_pidfile) { + /* few bytes larger, but doesn't use stdio */ + end = utoa_to_buf(getpid(), buf, sizeof(buf)); + *end = '\n'; + full_write(pid_fd, buf, end - buf + 1); + } close(pid_fd); - return 1; }