summaryrefslogtreecommitdiff
path: root/openembedded/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-21 10:10:31 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-21 10:10:31 +0000
commitb2f192faabe412adce79534e22efe9fb69ee40e2 (patch)
tree7076c49d4286f8a1733650bd8fbc7161af200d57 /openembedded/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch
parent2cf0eadf9f730027833af802d7e6c90b44248f80 (diff)
downloadopenembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz
openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.bz2
openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.zip
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch')
-rw-r--r--openembedded/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/openembedded/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch b/openembedded/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch
deleted file mode 100644
index 031274908b..0000000000
--- a/openembedded/packages/busybox/busybox-1.01/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);