[PATCH] remove ***some*** "#if 0"s from libbb/ dir

Robert P. J. Day rpjday at mindspring.com
Sat Mar 25 22:44:43 UTC 2006


  (some "#if 0" directives were left in libbb/ since they looked like
they might have future value and i'll let others make those
decisions.)

diff -pru busybox.orig/libbb/inet_common.c busybox/libbb/inet_common.c
--- busybox.orig/libbb/inet_common.c	2006-03-25 17:07:09.000000000 -0500
+++ busybox/libbb/inet_common.c	2006-03-25 17:42:17.000000000 -0500
@@ -135,9 +135,6 @@ int INET_rresolve(char *name, size_t len

 	if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
 		host = 1;
-#if 0
-	INET_nn = NULL;
-#endif
 	pn = INET_nn;
 	while (pn != NULL) {
 		if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {
diff -pru busybox.orig/libbb/obscure.c busybox/libbb/obscure.c
--- busybox.orig/libbb/obscure.c	2006-03-25 17:07:09.000000000 -0500
+++ busybox/libbb/obscure.c	2006-03-25 17:42:07.000000000 -0500
@@ -189,12 +189,6 @@ obscure_msg(const char *old, const char
 	oldlen = strlen(old);
 	newlen = strlen(newval);

-#if 0  /* why not check the password when set for the first time?  --marekm */
-	if (old[0] == '\0')
-		/* return (1); */
-		return NULL;
-#endif
-
 	if (newlen < 5)
 		return "too short";

diff -pru busybox.orig/libbb/wfopen_input.c busybox/libbb/wfopen_input.c
--- busybox.orig/libbb/wfopen_input.c	2006-03-25 17:07:09.000000000 -0500
+++ busybox/libbb/wfopen_input.c	2006-03-25 17:41:44.000000000 -0500
@@ -38,15 +38,6 @@ FILE *bb_wfopen_input(const char *filena
 	if ((filename != bb_msg_standard_input)
 		&& filename[0] && ((filename[0] != '-') || filename[1])
 	) {
-#if 0
-		/* This check shouldn't be necessary for linux, but is left
-		 * here disabled just in case. */
-		struct stat stat_buf;
-		if (is_directory(filename, 1, &stat_buf)) {
-			bb_error_msg("%s: Is a directory", filename);
-			return NULL;
-		}
-#endif
 		fp = bb_wfopen(filename, "r");
 	}



Signed off by:  Robert P. J. Day <rpjday at mindspring.com>



More information about the busybox mailing list