Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-27 23:29:37 +00:00
Code Issues Projects Releases Wiki Activity

if pidfile turned out to be !regular file, do not unlink it.

Browse Source 
It's most probably the /dev/null.
This commit is contained in:
Denis Vlasenko 2007-08-15 20:05:37 +00:00
parent 9f7b92a2e1
commit bb23c06919
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config.in
View File

@ -144,7 +144,7 @@ config FEATURE_PIDFILE
bool "Support writing pidfiles" bool "Support writing pidfiles"
default n default n
help help
This option makes some applets (crond, syslogd and inetd) write This option makes some applets (e.g. crond, syslogd, inetd) write
a pidfile in /var/run. Some applications rely on them. a pidfile in /var/run. Some applications rely on them.
config FEATURE_SUID config FEATURE_SUID

12
include/libbb.h
View File

@ -622,12 +622,14 @@ llist_t *llist_rev(llist_t *list);
/* start_stop_daemon and udhcpc are special - they want /* start_stop_daemon and udhcpc are special - they want
* to create pidfiles regardless of FEATURE_PIDFILE */ * to create pidfiles regardless of FEATURE_PIDFILE */
#if ENABLE_FEATURE_PIDFILE || defined(WANT_PIDFILE) #if ENABLE_FEATURE_PIDFILE || defined(WANT_PIDFILE)
int write_pidfile(const char *path); /* True only if we created pidfile which is *file*, not /dev/null etc */
#define remove_pidfile(f) ((void)unlink(f)) extern smallint wrote_pidfile;
void write_pidfile(const char *path);
#define remove_pidfile(path) do { if (wrote_pidfile) unlink(path); } while (0)
#else #else
/* Why? #defining it to 1 gives "warning: statement with no effect"... */ enum { wrote_pidfile = 0 };
static ALWAYS_INLINE int write_pidfile(const char *path) { return 1; } #define write_pidfile(path) ((void)0)
#define remove_pidfile(f) ((void)0) #define remove_pidfile(path) ((void)0)
#endif #endif
enum { enum {

24
libbb/pidfile.c
View File

@ -11,22 +11,30 @@
#define WANT_PIDFILE 1 #define WANT_PIDFILE 1
#include "libbb.h" #include "libbb.h"
int write_pidfile(const char *path) smallint wrote_pidfile;
void write_pidfile(const char *path)
{ {
int pid_fd; int pid_fd;
char *end; char *end;
char buf[sizeof(int)*3 + 2]; char buf[sizeof(int)*3 + 2];
struct stat sb;
if (!path) if (!path)
return 1; return;
/* we will overwrite stale pidfile */ /* we will overwrite stale pidfile */
pid_fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, 0666); pid_fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, 0666);
if (pid_fd < 0) if (pid_fd < 0)
return 0; return;
/* few bytes larger, but doesn't use stdio */
end = utoa_to_buf(getpid(), buf, sizeof(buf)); /* path can be "/dev/null"! Test for such cases */
*end = '\n'; wrote_pidfile = (fstat(pid_fd, &sb) == 0) && S_ISREG(sb.st_mode);
full_write(pid_fd, buf, end - buf + 1);
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); close(pid_fd);
return 1;
} }

2
networking/udhcp/dhcpc.c
View File

@ -546,7 +546,7 @@ int udhcpc_main(int argc, char **argv)
ret0: ret0:
retval = 0; retval = 0;
ret: ret:
if (client_config.pidfile) /*if (client_config.pidfile) - remove_pidfile has it's own check */
remove_pidfile(client_config.pidfile); remove_pidfile(client_config.pidfile);
return retval; return retval;
} }