busybox: remove stale busybox 1.11.1 patches

--- busybox-1.11.1/shell/ash.c	Wed Jun 25 14:51:23 2008

+++ busybox-1.11.1-ash/shell/ash.c	Wed Aug  6 00:47:45 2008

@@ -1569,14 +1569,14 @@

 static char *optptr;                   /* used by nextopt */

 /*

- * XXX - should get rid of.  have all builtins use getopt(3).  the

- * library getopt must have the BSD extension static variable "optreset"

- * otherwise it can't be used within the shell safely.

+ * XXX - should get rid of. Have all builtins use getopt(3).

+ * The library getopt must have the BSD extension static variable

+ * "optreset", otherwise it can't be used within the shell safely.

  *

- * Standard option processing (a la getopt) for builtin routines.  The

- * only argument that is passed to nextopt is the option string; the

- * other arguments are unnecessary.  It return the character, or '\0' on

- * end of input.

+ * Standard option processing (a la getopt) for builtin routines.

+ * The only argument that is passed to nextopt is the option string;

+ * the other arguments are unnecessary. It returns the character,

+ * or '\0' on end of input.

  */

 static int

 nextopt(const char *optstring)

@@ -1587,13 +1587,20 @@

 	p = optptr;

 	if (p == NULL || *p == '\0') {

+		/* We ate entire "-param", take next one */

 		p = *argptr;

-		if (p == NULL || *p != '-' || *++p == '\0')

+		if (p == NULL)

 			return '\0';

+		if (*p != '-')

+			return '\0';

+		if (*++p == '\0') /* just "-" ? */

+			return '\0';

 		argptr++;

-		if (LONE_DASH(p))        /* check for "--" */

+		if (LONE_DASH(p)) /* "--" ? */

 			return '\0';

+		/* p => next "-param" */

 	}

+	/* p => some option char in the middle of a "-param" */

 	c = *p++;

 	for (q = optstring; *q != c;) {

 		if (*q == '\0')

@@ -1602,8 +1609,11 @@

 			q++;

 	}

 	if (*++q == ':') {

-		if (*p == '\0' && (p = *argptr++) == NULL)

-			ash_msg_and_raise_error("no arg for -%c option", c);

+		if (*p == '\0') {

+			p = *argptr++;

+			if (p == NULL)

+				ash_msg_and_raise_error("no arg for -%c option", c);

+		}

 		optionarg = p;

 		p = NULL;

 	}

@@ -7428,8 +7438,10 @@

 		else if (c != 'p')

 			abort();

 #endif

-	if (verify)

+	/* Mimic bash: just "command -v" doesn't complain, it's a nop */

+	if (verify && (*argptr != NULL)) {

 		return describe_command(*argptr, verify - VERIFY_BRIEF);

+	}

 	return 0;

 }

@@ -7788,16 +7800,33 @@

 static void

 evaltree(union node *n, int flags)

 {

+

+	struct jmploc *volatile savehandler = exception_handler;

+	struct jmploc jmploc;

 	int checkexit = 0;

 	void (*evalfn)(union node *, int);

-	unsigned isor;

 	int status;

+

 	if (n == NULL) {

 		TRACE(("evaltree(NULL) called\n"));

-		goto out;

+		goto out1;

 	}

 	TRACE(("pid %d, evaltree(%p: %d, %d) called\n",

 			getpid(), n, n->type, flags));

+

+	exception_handler = &jmploc;

+	{

+		int err = setjmp(jmploc.loc);

+		if (err) {

+			/* if it was a signal, check for trap handlers */

+			if (exception == EXSIG)

+				goto out;

+			/* continue on the way out */

+			exception_handler = savehandler;

+			longjmp(exception_handler->loc, err);

+		}

+	}

+

 	switch (n->type) {

 	default:

 #if DEBUG

@@ -7843,19 +7872,20 @@

 		goto calleval;

 	case NAND:

 	case NOR:

-	case NSEMI:

+	case NSEMI: {

+

 #if NAND + 1 != NOR

 #error NAND + 1 != NOR

 #endif

 #if NOR + 1 != NSEMI

 #error NOR + 1 != NSEMI

 #endif

-		isor = n->type - NAND;

+		unsigned is_or = n->type - NAND;

 		evaltree(

 			n->nbinary.ch1,

-			(flags | ((isor >> 1) - 1)) & EV_TESTED

+			(flags | ((is_or >> 1) - 1)) & EV_TESTED

 		);

-		if (!exitstatus == isor)

+		if (!exitstatus == is_or)

 			break;

 		if (!evalskip) {

 			n = n->nbinary.ch2;

@@ -7866,6 +7896,7 @@

 			break;

 		}

 		break;

+	}

 	case NIF:

 		evaltree(n->nif.test, EV_TESTED);

 		if (evalskip)

@@ -7886,8 +7917,11 @@

 		exitstatus = status;

 		break;

 	}

+

  out:

-	if ((checkexit & exitstatus))

+	exception_handler = savehandler;

+ out1:

+	if (checkexit & exitstatus)

 		evalskip |= SKIPEVAL;

 	else if (pendingsig && dotrap())

 		goto exexit;

--- busybox-1.11.1/coreutils/basename.c	Wed Jun 25 14:51:23 2008

+++ busybox-1.11.1-basename/coreutils/basename.c	Thu Jul 17 20:04:36 2008

@@ -48,5 +48,5 @@

 	/* puts(s) will do, but we can do without stdio this way: */

 	s[m++] = '\n';

-	return full_write(STDOUT_FILENO, s, m) == (ssize_t)m;

+	return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;

 }

--- busybox-1.11.1/modutils/insmod.c	Wed Jun 25 14:51:18 2008

+++ busybox-1.11.1-modutils/modutils/insmod.c	Wed Jul 23 00:46:08 2008

@@ -840,7 +840,8 @@

 				ElfW(RelM) *rel, ElfW(Addr) v)

 {

 #if defined(__arm__) || defined(__i386__) || defined(__mc68000__) \

- || defined(__sh__) || defined(__s390__) || defined(__x86_64__)

+ || defined(__sh__) || defined(__s390__) || defined(__x86_64__) \

+ || defined(__powerpc__) || defined(__mips__)

 	struct arch_file *ifile = (struct arch_file *) f;

 #endif

 	enum obj_reloc ret = obj_reloc_ok;

--- busybox-1.11.1/archival/libunarchive/get_header_tar.c	Wed Jun 25 14:51:17 2008

+++ busybox-1.11.1-tar/archival/libunarchive/get_header_tar.c	Wed Jul 23 02:16:24 2008

@@ -261,26 +261,33 @@

 	case '0':

 #if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY

 		if (last_char_is(file_header->name, '/')) {

-			file_header->mode |= S_IFDIR;

-		} else

+			goto set_dir;

+		}

 #endif

 		file_header->mode |= S_IFREG;

 		break;

 	case '2':

 		file_header->mode |= S_IFLNK;

+		/* have seen tarballs with size field containing

+		 * the size of the link target's name */

+ size0:

+		file_header->size = 0;

 		break;

 	case '3':

 		file_header->mode |= S_IFCHR;

-		break;

+		goto size0; /* paranoia */

 	case '4':

 		file_header->mode |= S_IFBLK;

-		break;

+		goto size0;

 	case '5':

+#if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY

+ set_dir:

+#endif

 		file_header->mode |= S_IFDIR;

-		break;

+		goto size0;

 	case '6':

 		file_header->mode |= S_IFIFO;

-		break;

+		goto size0;

 #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS

 	case 'L':

 		/* free: paranoia: tar with several consecutive longnames */

--- busybox-1.11.1/archival/libunarchive/seek_by_jump.c	Wed Jun 25 14:51:17 2008

+++ busybox-1.11.1-tar/archival/libunarchive/seek_by_jump.c	Sun Jul 20 19:11:45 2008

@@ -8,7 +8,9 @@

 void seek_by_jump(const archive_handle_t *archive_handle, unsigned amount)

 {

-	if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) {

+	if (amount

+	 && lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1

+	) {

 		if (errno == ESPIPE)

 			seek_by_read(archive_handle, amount);

 		else