summaryrefslogtreecommitdiff
path: root/packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch')
-rw-r--r--packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch b/packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch
deleted file mode 100644
index 031274908b..0000000000
--- a/packages/busybox/busybox-1.2.1/udhcppidfile-breakage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- busybox-1.00/networking/udhcp/common.c~udhcppidfile2
-+++ busybox-1.00/networking/udhcp/common.c
-@@ -74,7 +74,7 @@
-
- if (pid > 0) {
- /* parent */
-- if (pidfile_reassign(pidfile, pid) < 0) {
-+ if (pidfile != NULL && pidfile_reassign(pidfile, pid) < 0) {
- (void)kill(pid, SIGKILL);
- exit(1);
- } else
-@@ -119,7 +119,7 @@
- sanitize_fds();
-
- /* do some other misc startup stuff while we are here to save bytes */
-- if (pidfile_acquire(pidfile) < 0)
-+ if (pidfile != NULL && pidfile_acquire(pidfile) < 0)
- exit(1);
-
- /* equivelent of doing a fflush after every \n */
-@@ -166,7 +166,7 @@
- sanitize_fds();
-
- /* do some other misc startup stuff while we are here to save bytes */
-- if (pidfile_acquire(pidfile) < 0)
-+ if (pidfile != NULL && pidfile_acquire(pidfile) < 0)
- exit(1);
-
- /* equivelent of doing a fflush after every \n */
---- busybox-1.00/networking/udhcp/pidfile.c~udhcppidfile2
-+++ busybox-1.00/networking/udhcp/pidfile.c
-@@ -141,7 +141,11 @@
- int pidfile_acquire(const char *pidfile)
- {
- int fd, result;
-- if (!pidfile) return (-1);
-+
-+ if (pidfile == NULL) {
-+ LOG(LOG_ERR, "pidfile_acquire: filename is NULL\n");
-+ return (-1);
-+ }
-
- if ((fd = pidfile_open(pidfile)) < 0)
- return (-1);
-@@ -170,7 +174,11 @@
- int pidfile_reassign(const char *pidfile, int pid)
- {
- int fd, result;
-- if (!pidfile) return (-1);
-+
-+ if (pidfile == NULL) {
-+ LOG(LOG_ERR, "pidfile_reassign: filename is NULL\n");
-+ return (-1);
-+ }
-
- if ((fd = pidfile_open(pidfile)) < 0)
- return (-1);