svn commit: trunk/busybox: archival archival/libunarchive networkin etc...

[aldot at busybox.net]

Author: aldot
Date: 2005-10-07 04:34:50 -0700 (Fri, 07 Oct 2005)
New Revision: 11797

Log:
- remove superfluous C statements ";;" in decompress_unzip.c, dpkg_deb.c ifconfig.c
- gzip.c: see if O_NOFOLLOW is defined before using it, else take alternate path
closes bug #221 (partially; The rest will follow later).


Modified:
   trunk/busybox/archival/dpkg_deb.c
   trunk/busybox/archival/gzip.c
   trunk/busybox/archival/libunarchive/decompress_unzip.c
   trunk/busybox/networking/ifconfig.c


Changeset:
Modified: trunk/busybox/archival/dpkg_deb.c
===================================================================
--- trunk/busybox/archival/dpkg_deb.c	2005-10-07 10:53:15 UTC (rev 11796)
+++ trunk/busybox/archival/dpkg_deb.c	2005-10-07 11:34:50 UTC (rev 11797)
@@ -75,7 +75,7 @@
 		 * it should accept a second argument which specifies a
 		 * specific field to print */
 		ar_archive->accept = control_tar_llist;
-		tar_archive->accept = llist_add_to(NULL, "./control");;
+		tar_archive->accept = llist_add_to(NULL, "./control");
 		tar_archive->filter = filter_accept_list;
 		tar_archive->action_data = data_extract_to_stdout;
 	}

Modified: trunk/busybox/archival/gzip.c
===================================================================
--- trunk/busybox/archival/gzip.c	2005-10-07 10:53:15 UTC (rev 11796)
+++ trunk/busybox/archival/gzip.c	2005-10-07 11:34:50 UTC (rev 11797)
@@ -1270,7 +1270,7 @@
 					strcat(path, ".gz");
 
 					/* Open output file */
-#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
+#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) && defined O_NOFOLLOW
 					outFileNum =
 						open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW);
 #else

Modified: trunk/busybox/archival/libunarchive/decompress_unzip.c
===================================================================
--- trunk/busybox/archival/libunarchive/decompress_unzip.c	2005-10-07 10:53:15 UTC (rev 11796)
+++ trunk/busybox/archival/libunarchive/decompress_unzip.c	2005-10-07 11:34:50 UTC (rev 11797)
@@ -442,7 +442,7 @@
 		if ((e = (t = tl + ((unsigned) b & ml))->e) > 16)
 			do {
 				if (e == 99) {
-					bb_error_msg_and_die("inflate_codes error 1");;
+					bb_error_msg_and_die("inflate_codes error 1");
 				}
 				b >>= t->b;
 				k -= t->b;
@@ -478,7 +478,7 @@
 			if ((e = (t = td + ((unsigned) b & md))->e) > 16)
 				do {
 					if (e == 99)
-						bb_error_msg_and_die("inflate_codes error 2");;
+						bb_error_msg_and_die("inflate_codes error 2");
 					b >>= t->b;
 					k -= t->b;
 					e -= 16;

Modified: trunk/busybox/networking/ifconfig.c
===================================================================
--- trunk/busybox/networking/ifconfig.c	2005-10-07 10:53:15 UTC (rev 11796)
+++ trunk/busybox/networking/ifconfig.c	2005-10-07 11:34:50 UTC (rev 11797)
@@ -353,7 +353,7 @@
 		for (op = OptArray; op->name; op++) {	/* Find table entry. */
 			if (strcmp(p, op->name) == 0) {	/* If name matches... */
 				if ((mask &= op->flags)) {	/* set the mask and go. */
-					goto FOUND_ARG;;
+					goto FOUND_ARG;
 				}
 				/* If we get here, there was a valid arg with an */
 				/* invalid '-' prefix. */