Changeset 904 in MondoRescue for trunk/mindi-busybox

Timestamp:

Oct 25, 2006, 1:51:57 AM (19 years ago)

Author:

Bruno Cornec

Message:

merge -r890:902 $SVN_M/branches/stable

Location:

trunk/mindi-busybox

Files:

• .config (modified) (2 diffs)
• Config.in (modified) (1 diff)
• Rules.mak (modified) (3 diffs)
• VERSION (modified) (1 diff)
• archival/Makefile.in (modified) (1 diff)
• archival/libunarchive/decompress_uncompress.c (modified) (5 diffs)
• archival/libunarchive/find_list_entry.c (modified) (1 diff)
• changelog (modified) (1 diff)
• coreutils/md5_sha1_sum.c (modified) (1 diff)
• coreutils/test.c (modified) (2 diffs)
• distributions/rpm/mindi-busybox.spec (modified) (1 diff)
• docs/autodocifier.pl (modified) (1 diff)
• editors/sed.c (modified) (16 diffs)
• include/platform.h (modified) (1 diff)
• libbb/Makefile.in (modified) (2 diffs)
• loginutils/Config.in (modified) (1 diff)
• loginutils/getty.c (modified) (1 diff)
• loginutils/sulogin.c (modified) (4 diffs)
• miscutils/Makefile.in (modified) (1 diff)
• miscutils/hdparm.c (modified) (2 diffs)
• modutils/lsmod.c (modified) (2 diffs)
• modutils/modprobe.c (modified) (2 diffs)
• networking/dnsd.c (modified) (7 diffs)
• networking/httpd.c (modified) (2 diffs)
• networking/ping6.c (modified) (1 diff)
• networking/traceroute.c (modified) (1 diff)
• networking/zcip.c (modified) (15 diffs)
• shell/msh.c (modified) (1 diff)
• testsuite/README (modified) (1 diff)
• testsuite/sed.tests (modified) (1 diff)
• util-linux/mdev.c (modified) (3 diffs)
• util-linux/mount.c (modified) (1 diff)
• util-linux/readprofile.c (modified) (2 diffs)
• util-linux/umount.c (modified) (4 diffs)

trunk/mindi-busybox/.config

@@ -355 +355 @@
 # Linux Module Utilities
 #
-# CONFIG_INSMOD is not set
+CONFIG_INSMOD=y
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
@@ -361 +361 @@
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+
+#
+# Options common to multiple modutils
+#
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_2_6_MODULES is not set
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
 # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
 

trunk/mindi-busybox/Config.in

@@ -77 +77 @@
     bool "Store applet usage messages in compressed form"
     default y
-    depends on CONFIG_SHOW_USAGE && CONFIG_NITPICK
+    depends on CONFIG_SHOW_USAGE
     help
       Store usage messages in compressed form, uncompress them on-the-fly

trunk/mindi-busybox/Rules.mak

@@ -15 +15 @@
 MAJOR_VERSION   :=1
 MINOR_VERSION   :=2
-SUBLEVEL_VERSION:=1
+SUBLEVEL_VERSION:=2
 EXTRAVERSION    :=
 VERSION   :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
@@ -266 +266 @@
     CFLAGS +=-DNDEBUG
     CHECKED_LDFLAGS += $(call check_ld,$(LD),--sort-common,)
-    CHECKED_LDFLAGS += $(call check_ld,--gc-sections,)
+    CHECKED_LDFLAGS += $(call check_ld,$(LD),--gc-sections,)
 endif
 
@@ -296 +296 @@
 
 ifeq ($(strip $(CONFIG_SELINUX)),y)
-    LIBRARIES += -lselinux
+    LIBRARIES += -lselinux -lsepol
 endif
 

trunk/mindi-busybox/VERSION

@@ -1 @@
-1.2.1
+1.2.2

trunk/mindi-busybox/archival/Makefile.in

@@ -12 +12 @@
 
 ARCHIVAL-y:=
-ARCHIVAL-$(CONFIG_APT_GET)  +=
 ARCHIVAL-$(CONFIG_AR)       += ar.o
 ARCHIVAL-$(CONFIG_BUNZIP2)  += bunzip2.o

trunk/mindi-busybox/archival/libunarchive/decompress_uncompress.c

@@ -70 +70 @@
 static int maxbits = BITS;
 
-/* Input buffer */
-static unsigned char inbuf[IBUFSIZ + 64];
-
-/* Output buffer */
-static unsigned char outbuf[OBUFSIZ + 2048];
-
-
-static unsigned char htab[HSIZE];
-static unsigned short codetab[HSIZE];
-
 #define htabof(i)               htab[i]
 #define codetabof(i)            codetab[i]
@@ -85 +75 @@
 #define tab_suffixof(i)         ((unsigned char *)(htab))[i]
 #define de_stack                ((unsigned char *)&(htab[HSIZE-1]))
-#define clear_htab()            memset(htab, -1, sizeof(htab))
+#define clear_htab()            memset(htab, -1, HSIZE)
 #define clear_tab_prefixof()    memset(codetab, 0, 256);
 
@@ -113 +103 @@
     int n_bits;
     int rsize = 0;
+    RESERVE_CONFIG_UBUFFER(inbuf, IBUFSIZ + 64);
+    RESERVE_CONFIG_UBUFFER(outbuf, OBUFSIZ + 2048);
+    unsigned char htab[HSIZE];
+    unsigned short codetab[HSIZE];
+    memset(inbuf, 0, IBUFSIZ + 64);
+    memset(outbuf, 0, OBUFSIZ + 2048);
 
     insize = 0;
@@ -160 +156 @@
         }
 
-        if (insize < (int) sizeof(inbuf) - IBUFSIZ) {
+        if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) {
             rsize = safe_read(fd_in, inbuf + insize, IBUFSIZ);
             insize += rsize;
@@ -286 +282 @@
     }
 
+    RELEASE_CONFIG_BUFFER(inbuf);
+    RELEASE_CONFIG_BUFFER(outbuf);
     return 0;
 }

trunk/mindi-busybox/archival/libunarchive/find_list_entry.c

@@ -14 +14 @@
 {
     while (list) {
-        if (fnmatch(list->data, filename, 0) == 0) {
+        if (fnmatch(list->data, filename, FNM_LEADING_DIR) == 0) {
             return (list);
         }

trunk/mindi-busybox/changelog

@@ -1 @@
-Various bug fixes that apply to busybox 1.2.0, cherry-picked from the
-ongoing development branch.  This will form the basis for busybox 1.2.1.
+Various bug fixes that apply to busybox 1.2.1, cherry-picked from the
+ongoing development branch.  This will form the basis for busybox 1.2.2.
 
 I'll append fixes to this as they come up.  (Check the file date, or the bug
 list below.)  This file is basically a concatenation of the following:
 
-http://busybox.net/downloads/patches/svn-15575.patch
-http://busybox.net/downloads/patches/svn-15653.patch
-http://busybox.net/downloads/patches/svn-15656.patch
-http://busybox.net/downloads/patches/svn-15658.patch
-http://busybox.net/downloads/patches/svn-15659.patch
-http://busybox.net/downloads/patches/svn-15660.patch
-http://busybox.net/downloads/patches/svn-15670.patch
-http://busybox.net/downloads/patches/svn-15698.patch
-http://busybox.net/downloads/patches/svn-15700.patch
-http://busybox.net/downloads/patches/svn-15702.patch
-http://busybox.net/downloads/patches/svn-15705.patch
-http://busybox.net/downloads/patches/svn-15727.patch
-
- ------------------------------------------------------------------------
-r15575 | landley | 2006-07-01 13:19:02 -0400 (Sat, 01 Jul 2006) | 2 lines
-Changed paths:
-   M /trunk/busybox/shell/lash.c
-
-Patch from Shaun Jackman moving the var=value logic to where it can do some
-good.
-
- ------------------------------------------------------------------------
-Index: shell/lash.c
-===================================================================
---- shell/lash.c    (revision 15574)
-+++ shell/lash.c    (revision 15575)
-@@ -1171,12 +1171,6 @@
+http://busybox.net/downloads/patches/svn-15746.patch
+http://busybox.net/downloads/patches/svn-15751.patch
+http://busybox.net/downloads/patches/svn-15753.patch
+http://busybox.net/downloads/patches/svn-15769.patch
+http://busybox.net/downloads/patches/svn-15745.patch
+http://busybox.net/downloads/patches/svn-15765.patch
+http://busybox.net/downloads/patches/svn-15766.patch
+http://busybox.net/downloads/patches/svn-15772.patch
+http://busybox.net/downloads/patches/svn-15773.patch
+http://busybox.net/downloads/patches/svn-15782.patch
+http://busybox.net/downloads/patches/svn-15787.patch
+http://busybox.net/downloads/patches/svn-15788.patch
+http://busybox.net/downloads/patches/svn-15795.patch
+http://busybox.net/downloads/patches/svn-15800.patch
+http://busybox.net/downloads/patches/svn-15806.patch
+http://busybox.net/downloads/patches/svn-15826.patch
+http://busybox.net/downloads/patches/svn-15855.patch
+http://busybox.net/downloads/patches/svn-15890.patch
+http://busybox.net/downloads/patches/svn-15905.patch
+http://busybox.net/downloads/patches/svn-15906.patch
+http://busybox.net/downloads/patches/svn-15984.patch
+http://busybox.net/downloads/patches/svn-16004.patch
+http://busybox.net/downloads/patches/svn-16008.patch
+http://busybox.net/downloads/patches/svn-16026.patch
+http://busybox.net/downloads/patches/svn-16032.patch
+http://busybox.net/downloads/patches/svn-16033.patch
+http://busybox.net/downloads/patches/svn-16045.patch
+http://busybox.net/downloads/patches/svn-16056.patch
+http://busybox.net/downloads/patches/svn-16057.patch
+http://busybox.net/downloads/patches/svn-16062.patch
+http://busybox.net/downloads/patches/svn-16067.patch
+http://busybox.net/downloads/patches/svn-16109.patch
+And an otherwise unmerged patch to dnsd (at the very end).
+
+That's a bugfix to sed, two fixes to documentation generation (BusyBox.html
+shouldn't have USE() macros showing up in it anymore), fix umount to report
+the right errno on failure and to handle umount block devices by name with
+newer kernels, fix mount to handle symlinks properly, make mdev delete
+device nodes when called for hotplug remove, a segfault in traceroute, a minor
+portability fix to md5sum option parsing, a build fix for httpd with old gccs,
+an options parsing tweak to hdparm, make test fail gracefully when getgroups()
+returns -1, fix a race condition in modprobe when two instances run at once
+(hotplug does this), make "tar xf foo.tar dir/dir" extract all subdirectories,
+make our getty initialize the terminal more like mingetty, an selinux build
+fix, endianness issue in ping6, fix for zcip defending addresses, clean up some
+global variables in gzip to save memory, fix sulogin -tNNN, a help text tweak,
+several warning fixes and build fixes, the dnsd fix, and a partridge in a pear
+tree.
+
+It might have been nice to include 16042 and 16044, but they don't apply and
+I'm not fixing them up right now.  16081 mixes unrelated changes in
+with a bug fix, and thus disqualifies itself.
+
+This is the last release of BusyBox under the old "GPLv2 or later" dual
+license.  Future versions (containing changes after svn 16112) will just be
+GPLv2 only, without the "or later".  If this makes you mad enough to fork the
+project, this release or svn-16112 are what to fork from.
+
+See http://busybox.net/license.html for details.
+
+It was fun, guys.  Later...
+
+ ------------------------------------------------------------------------
+r15745 | landley | 2006-07-26 12:10:39 -0400 (Wed, 26 Jul 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/coreutils/md5_sha1_sum.c
+
+Patch from Shaun Jackman, set optind by hand if we don't call getopt.
+
+ ------------------------------------------------------------------------
+Index: coreutils/md5_sha1_sum.c
+===================================================================
+--- coreutils/md5_sha1_sum.c    (revision 15744)
++++ coreutils/md5_sha1_sum.c    (revision 15745)
+@@ -98,6 +98,7 @@
+ 
+    if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
+        flags = bb_getopt_ulflags(argc, argv, "scw");
++   else optind = 1;
+ 
+    if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && !(flags & FLAG_CHECK)) {
+        if (flags & FLAG_SILENT) {
+ ------------------------------------------------------------------------
+r15746 | landley | 2006-07-26 13:25:08 -0400 (Wed, 26 Jul 2006) | 5 lines
+Changed paths:
+   M /trunk/busybox/editors/sed.c
+   M /trunk/busybox/testsuite/sed.tests
+
+Rich Filker spotted that sed -e 's/xxx/[/' didn't work right.  Did a smaller
+fix than his, and shrank the code a bit on top of that so the net size is
+smaller, and added a test to the test suite for this case.  Plus I cleaned up
+the #includes and removed unnecessary "const"s while I was there.
+
+ ------------------------------------------------------------------------
+Index: testsuite/sed.tests
+===================================================================
+--- testsuite/sed.tests (revision 15745)
++++ testsuite/sed.tests (revision 15746)
+@@ -174,6 +174,8 @@
+    "yes\n" "" ""
+ rm ./-     # Clean up
+ 
++testing "sed s/xxx/[/" "sed -e 's/xxx/[/'" "[\n" "" "xxx\n"
++
+ # Ponder this a bit more, why "woo not found" from gnu version?
+ #testing "sed doesn't substitute in deleted line" \
+ #  "sed -e '/ook/d;s/ook//;t woo;a bang;'" "bang" "" "ook\n"
+Index: editors/sed.c
+===================================================================
+--- editors/sed.c   (revision 15745)
++++ editors/sed.c   (revision 15746)
+@@ -58,12 +58,6 @@
+    Reference http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html
+ */
+ 
+-#include <stdio.h>
+-#include <unistd.h>        /* for getopt() */
+-#include <errno.h>
+-#include <ctype.h>     /* for isspace() */
+-#include <stdlib.h>
+-#include <string.h>
+ #include "busybox.h"
+ #include "xregex.h"
+ 
+@@ -94,8 +88,6 @@
+     struct sed_cmd_s *next;    /* Next command (linked list, NULL terminated) */
+ } sed_cmd_t;
+ 
+-static const char bad_format_in_subst[] =
+-   "bad format in substitution expression";
+ static const char *const semicolon_whitespace = "; \n\r\t\v";
+ 
+ struct sed_globals
+@@ -175,7 +167,7 @@
+ 
+ /* strdup, replacing "\n" with '\n', and "\delimiter" with 'delimiter' */
+ 
+-static void parse_escapes(char *dest, const char *string, int len, char from, char to)
++static void parse_escapes(char *dest, char *string, int len, char from, char to)
  {
-    struct built_in_command *x;
- 
--   /* Check if the command sets an environment variable. */
--   if( strchr(child->argv[0], '=') != NULL ) {
--       child->argv[1] = child->argv[0];
--       _exit(builtin_export(child));
+    int i=0;
+ 
+@@ -192,7 +184,7 @@
+    *dest=0;
+ }
+ 
+-static char *copy_parsing_escapes(const char *string, int len)
++static char *copy_parsing_escapes(char *string, int len)
+ {
+    char *dest=xmalloc(len+1);
+ 
+@@ -205,18 +197,22 @@
+  * index_of_next_unescaped_regexp_delim - walks left to right through a string
+  * beginning at a specified index and returns the index of the next regular
+  * expression delimiter (typically a forward * slash ('/')) not preceded by
+- * a backslash ('\').
++ * a backslash ('\').  A negative delimiter disables square bracket checking.
+  */
+-static int index_of_next_unescaped_regexp_delim(const char delimiter,
+-   const char *str)
++static int index_of_next_unescaped_regexp_delim(int delimiter, char *str)
+ {
+    int bracket = -1;
+    int escaped = 0;
+    int idx = 0;
+    char ch;
+ 
++   if (delimiter < 0) {
++       bracket--;
++       delimiter *= -1;
++   }
++
+    for (; (ch = str[idx]); idx++) {
+-       if (bracket != -1) {
++       if (bracket >= 0) {
+            if (ch == ']' && !(bracket == idx - 1 || (bracket == idx - 2
+                    && str[idx - 1] == '^')))
+                bracket = -1;
+@@ -224,43 +220,38 @@
+            escaped = 0;
+        else if (ch == '\\')
+            escaped = 1;
+-       else if (ch == '[')
++       else if (bracket == -1 && ch == '[')
+            bracket = idx;
+        else if (ch == delimiter)
+            return idx;
+    }
+ 
+    /* if we make it to here, we've hit the end of the string */
+-   return -1;
++   bb_error_msg_and_die("unmatched '%c'",delimiter);
+ }
+ 
+ /*
+  *  Returns the index of the third delimiter
+  */
+-static int parse_regex_delim(const char *cmdstr, char **match, char **replace)
++static int parse_regex_delim(char *cmdstr, char **match, char **replace)
+ {
+-   const char *cmdstr_ptr = cmdstr;
++   char *cmdstr_ptr = cmdstr;
+    char delimiter;
+    int idx = 0;
+ 
+    /* verify that the 's' or 'y' is followed by something.  That something
+     * (typically a 'slash') is now our regexp delimiter... */
+-   if (*cmdstr == '\0') bb_error_msg_and_die(bad_format_in_subst);
++   if (*cmdstr == '\0')
++       bb_error_msg_and_die("bad format in substitution expression");
+    delimiter = *(cmdstr_ptr++);
+ 
+    /* save the match string */
+    idx = index_of_next_unescaped_regexp_delim(delimiter, cmdstr_ptr);
+-   if (idx == -1) {
+-       bb_error_msg_and_die(bad_format_in_subst);
 -   }
+    *match = copy_parsing_escapes(cmdstr_ptr, idx);
+ 
+    /* save the replacement string */
+    cmdstr_ptr += idx + 1;
+-   idx = index_of_next_unescaped_regexp_delim(delimiter, cmdstr_ptr);
+-   if (idx == -1) {
+-       bb_error_msg_and_die(bad_format_in_subst);
+-   }
++   idx = index_of_next_unescaped_regexp_delim(-delimiter, cmdstr_ptr);
+    *replace = copy_parsing_escapes(cmdstr_ptr, idx);
+ 
+    return ((cmdstr_ptr - cmdstr) + idx);
+@@ -287,21 +278,18 @@
+        if (*my_str == '\\') delimiter = *(++pos);
+        else delimiter = '/';
+        next = index_of_next_unescaped_regexp_delim(delimiter, ++pos);
+-       if (next == -1)
+-           bb_error_msg_and_die("unterminated match expression");
 -
-    /* Check if the command matches any of the non-forking builtins.
-     * Depending on context, this might be redundant.  But it's
-     * easier to waste a few CPU cycles than it is to figure out
-@@ -1300,6 +1294,12 @@
-         * is doomed to failure, and doesn't work on bash, either.
-         */
-        if (newjob->num_progs == 1) {
-+           /* Check if the command sets an environment variable. */
-+           if (strchr(child->argv[0], '=') != NULL) {
-+               child->argv[1] = child->argv[0];
-+               return builtin_export(child);
-+           }
+-       temp=copy_parsing_escapes(pos,next);
++       temp = copy_parsing_escapes(pos,next);
+        *regex = (regex_t *) xmalloc(sizeof(regex_t));
+        xregcomp(*regex, temp, bbg.regex_type|REG_NEWLINE);
+        free(temp);
+        /* Move position to next character after last delimiter */
+-       pos+=(next+1);
++       pos += (next+1);
+    }
+    return pos - my_str;
+ }
+ 
+ /* Grab a filename.  Whitespace at start is skipped, then goes to EOL. */
+-static int parse_file_cmd(sed_cmd_t *sed_cmd, const char *filecmdstr, char **retval)
++static int parse_file_cmd(sed_cmd_t *sed_cmd, char *filecmdstr, char **retval)
+ {
+    int start = 0, idx, hack=0;
+ 
+@@ -318,7 +306,7 @@
+    return idx;
+ }
+ 
+-static int parse_subst_cmd(sed_cmd_t *const sed_cmd, char *substr)
++static int parse_subst_cmd(sed_cmd_t *sed_cmd, char *substr)
+ {
+    int cflags = bbg.regex_type;
+    char *match;
+@@ -569,7 +557,7 @@
+    bbg.pipeline.buf[bbg.pipeline.idx++] = c;
+ }
+ 
+-static void do_subst_w_backrefs(const char *line, const char *replace)
++static void do_subst_w_backrefs(char *line, char *replace)
+ {
+    int i,j;
+ 
+@@ -669,7 +657,7 @@
+ }
+ 
+ /* Set command pointer to point to this label.  (Does not handle null label.) */
+-static sed_cmd_t *branch_to(const char *label)
++static sed_cmd_t *branch_to(char *label)
+ {
+    sed_cmd_t *sed_cmd;
+ 
+ ------------------------------------------------------------------------
+r15751 | landley | 2006-07-27 10:59:36 -0400 (Thu, 27 Jul 2006) | 7 lines
+Changed paths:
+   M /trunk/busybox/docs/autodocifier.pl
+
+I touched perl.  I feel dirty.
+
+Make autodocifier suck less.  It still doesn't handle nested USE( USE() ) case
+(the inner USE() winds up in the output), but making it recursive involves
+getting perl to accept a "for" loop and it's telling me that "break" is an
+unrecognized bareword and I hate perl.  This is at least an improvement.
+
+ ------------------------------------------------------------------------
+Index: docs/autodocifier.pl
+===================================================================
+--- docs/autodocifier.pl    (revision 15750)
++++ docs/autodocifier.pl    (revision 15751)
+@@ -21,8 +21,8 @@
+ # regex && eval away unwanted strings from documentation
+ sub beautify {
+    my $text = shift;
+-   $text =~ s/USAGE_NOT\w+\(.*?"\s*\)//sxg;
+-   $text =~ s/USAGE_\w+\(\s*?(.*?)"\s*\)/$1"/sxg;
++   $text =~ s/SKIP_\w+\(.*?"\s*\)//sxg;
++   $text =~ s/USE_\w+\(\s*?(.*?)"\s*\)/$1"/sxg;
+    $text =~ s/"\s*"//sg;
+    my @line = split("\n", $text);
+    $text = join('',
+ ------------------------------------------------------------------------
+r15753 | landley | 2006-07-27 11:12:21 -0400 (Thu, 27 Jul 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/docs/autodocifier.pl
+
+And now, with a for loop, so it can handle the nested USE() case.
+
+ ------------------------------------------------------------------------
+Index: docs/autodocifier.pl
+===================================================================
+--- docs/autodocifier.pl    (revision 15752)
++++ docs/autodocifier.pl    (revision 15753)
+@@ -21,8 +21,12 @@
+ # regex && eval away unwanted strings from documentation
+ sub beautify {
+    my $text = shift;
+-   $text =~ s/SKIP_\w+\(.*?"\s*\)//sxg;
+-   $text =~ s/USE_\w+\(\s*?(.*?)"\s*\)/$1"/sxg;
++   for (;;) {
++       my $text2 = $text;
++       $text =~ s/SKIP_\w+\(.*?"\s*\)//sxg;
++       $text =~ s/USE_\w+\(\s*?(.*?)"\s*\)/$1"/sxg;
++       last if ( $text2 eq $text );
++   }
+    $text =~ s/"\s*"//sg;
+    my @line = split("\n", $text);
+    $text = join('',
+ ------------------------------------------------------------------------
+r15765 | rpjday | 2006-08-03 06:50:39 -0400 (Thu, 03 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/networking/httpd.c
+
+Move declaration to be compatible with older gcc's.
+
+ ------------------------------------------------------------------------
+Index: networking/httpd.c
+===================================================================
+--- networking/httpd.c  (revision 15764)
++++ networking/httpd.c  (revision 15765)
+@@ -863,6 +863,7 @@
+ {
+   struct sockaddr_in lsocket;
+   int fd;
++  int on = 1;
+ 
+   /* create the socket right now */
+   /* inet_addr() returns a value that is already in network order */
+@@ -873,7 +874,6 @@
+   fd = bb_xsocket(AF_INET, SOCK_STREAM, 0);
+   /* tell the OS it's OK to reuse a previous address even though */
+   /* it may still be in a close down state.  Allows bind to succeed. */
+-  int on = 1;
+ #ifdef SO_REUSEPORT
+   setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (void *)&on, sizeof(on)) ;
+ #else
+ ------------------------------------------------------------------------
+r15766 | rpjday | 2006-08-03 07:28:36 -0400 (Thu, 03 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/loginutils/Config.in
+
+Remove apparent typo in "bool" line.
+
+ ------------------------------------------------------------------------
+Index: loginutils/Config.in
+===================================================================
+--- loginutils/Config.in    (revision 15765)
++++ loginutils/Config.in    (revision 15766)
+@@ -14,7 +14,7 @@
+      publicly readable.
+ 
+ config CONFIG_USE_BB_SHADOW
+-   bool #"  Use busybox shadow password functions"
++   bool "  Use busybox shadow password functions"
+    default y
+    depends on CONFIG_USE_BB_PWD_GRP && CONFIG_FEATURE_SHADOWPASSWDS
+    help
+ ------------------------------------------------------------------------
+r15769 | landley | 2006-08-03 13:54:45 -0400 (Thu, 03 Aug 2006) | 5 lines
+Changed paths:
+   M /trunk/busybox/util-linux/umount.c
+
+Fix umount so loop device disassociation hopefully doesn't screw up errno on
+a failed mount.  And while I'm at it, legacy mdev removal was only being done
+in the _failure_ case?  That can't be right.  Plus minor header cleanups
+and an option parsing tweak.
+
+ ------------------------------------------------------------------------
+Index: util-linux/umount.c
+===================================================================
+--- util-linux/umount.c (revision 15768)
++++ util-linux/umount.c (revision 15769)
+@@ -13,17 +13,15 @@
+ #include "busybox.h"
+ #include <mntent.h>
+ #include <errno.h>
+-#include <string.h>
+ #include <getopt.h>
+ 
+-#define OPTION_STRING      "flDnrvad"
++#define OPTION_STRING      "flDnravd"
+ #define OPT_FORCE          1
+ #define OPT_LAZY           2
+ #define OPT_DONTFREELOOP   4
+ #define OPT_NO_MTAB            8
+ #define OPT_REMOUNT            16
+-#define OPT_IGNORED            32  // -v is ignored
+-#define OPT_ALL                (ENABLE_FEATURE_UMOUNT_ALL ? 64 : 0)
++#define OPT_ALL                (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0)
+ 
+ int umount_main(int argc, char **argv)
+ {
+@@ -77,8 +74,6 @@
+        m = 0;
+        if (!argc) bb_show_usage();
+    }
+-
+-
+    
+    // Loop through everything we're supposed to umount, and do so.
+    for (;;) {
+@@ -114,19 +109,20 @@
+                         "%s busy - remounted read-only", m->device);
+        }
+ 
+-       /* De-allocate the loop device.  This ioctl should be ignored on any
+-        * non-loop block devices. */
+-       if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONTFREELOOP) && m)
+-           del_loop(m->device);
+-
+        if (curstat) {
+-           /* Yes, the ENABLE is redundant here, but the optimizer for ARM
+-            * can't do simple constant propagation in local variables... */
+-           if(ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
+-               erase_mtab(m->dir);
+            status = EXIT_FAILURE;
+            bb_perror_msg("Couldn't umount %s", path);
++       } else {
++           /* De-allocate the loop device.  This ioctl should be ignored on
++            * any non-loop block devices. */
++           if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONTFREELOOP) && m)
++               del_loop(m->device);
++           if (ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
++               erase_mtab(m->dir);
+        }
 +
-            for (x = bltins; x->cmd; x++) {
-                if (strcmp(child->argv[0], x->cmd) == 0 ) {
-                    int rcode;
- ------------------------------------------------------------------------
-r15653 | landley | 2006-07-05 21:09:21 -0400 (Wed, 05 Jul 2006) | 6 lines
-Changed paths:
-   M /trunk/busybox/shell/ash.c
-
-Bug fix from Vladimir Oleynic via Paul Fox for:
-echo "+bond0" > /sys/class/net/bonding_masters
-while true; do
-  echo hello
-done  
-
- ------------------------------------------------------------------------
-Index: shell/ash.c
-===================================================================
---- shell/ash.c (revision 15652)
-+++ shell/ash.c (revision 15653)
-@@ -3469,6 +3469,7 @@
-    flushall();
- cmddone:
-    exitstatus |= ferror(stdout);
-+   clearerr(stdout);
-    commandname = savecmdname;
-    exsig = 0;
-    handler = savehandler;
- ------------------------------------------------------------------------
-r15656 | landley | 2006-07-06 12:41:56 -0400 (Thu, 06 Jul 2006) | 5 lines
-Changed paths:
-   M /trunk/busybox/util-linux/dmesg.c
-
-Fix three embarassing thinkos in the new dmesg.c:
-1) the c argument shouldn't have had a : after that, dunno how that got there.
-2) the xgetlarg for level was using size
-3) because xgetlarg's error message _SUCKS_ (it does a show_usage() rather than giving any specific info about the range that was violated) I dropped the range down to 2 bytes.  (Which works fine, I dunno why we were nit-picking about that...)
-
- ------------------------------------------------------------------------
-Index: util-linux/dmesg.c
-===================================================================
---- util-linux/dmesg.c  (revision 15655)
-+++ util-linux/dmesg.c  (revision 15656)
-@@ -15,16 +15,16 @@
- int dmesg_main(int argc, char *argv[])
++
++
+        // Find next matching mtab entry for -a or umount /dev
+        while (m && (m = m->next))
+            if ((opt & OPT_ALL) || !strcmp(path,m->device))
+ ------------------------------------------------------------------------
+r15772 | landley | 2006-08-03 16:22:37 -0400 (Thu, 03 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/miscutils/hdparm.c
+
+Patch from tito to improve options parsing.
+
+ ------------------------------------------------------------------------
+Index: miscutils/hdparm.c
+===================================================================
+--- miscutils/hdparm.c  (revision 15771)
++++ miscutils/hdparm.c  (revision 15772)
+@@ -1481,7 +1481,7 @@
  {
-    char *size, *level;
--   int flags = bb_getopt_ulflags(argc, argv, "c:s:n:", &size, &level);
-+   int flags = bb_getopt_ulflags(argc, argv, "cs:n:", &size, &level);
- 
-    if (flags & 4) {
--       if(klogctl(8, NULL, bb_xgetlarg(size, 10, 0, 10)))
-+       if(klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10)))
-            bb_perror_msg_and_die("klogctl");
-    } else {
-        int len;
-        char *buf;
- 
--       len = (flags & 2) ? bb_xgetlarg(size, 10, 4096, INT_MAX) : 16384;
-+       len = (flags & 2) ? bb_xgetlarg(size, 10, 2, INT_MAX) : 16384;
-        buf = xmalloc(len);
-        if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
-            bb_perror_msg_and_die("klogctl");
- ------------------------------------------------------------------------
-r15658 | pgf | 2006-07-06 16:00:43 -0400 (Thu, 06 Jul 2006) | 4 lines
-Changed paths:
-   M /trunk/busybox/Makefile
-
-fix dependencies so that compressed usage gets rebuilt if
-    a) include/usage.h is changed, and 
-    b) after "make clean".
-
- ------------------------------------------------------------------------
-Index: Makefile
-===================================================================
---- Makefile    (revision 15657)
-+++ Makefile    (revision 15658)
-@@ -436,13 +436,16 @@
- 
- ifeq ($(strip $(CONFIG_FEATURE_COMPRESS_USAGE)),y)
- USAGE_BIN:=scripts/usage
--$(USAGE_BIN): $(top_srcdir)/scripts/usage.c .config
-+$(USAGE_BIN): $(top_srcdir)/scripts/usage.c .config \
-+       $(top_srcdir)/include/usage.h
-    $(do_link.h)
- 
- DEP_INCLUDES += include/usage_compressed.h
- 
--include/usage_compressed.h: .config $(USAGE_BIN) $(top_srcdir)/scripts/usage_compressed
--   $(Q)SED="$(SED)" $(SHELL) $(top_srcdir)/scripts/usage_compressed "$(top_builddir)/scripts" > $@
-+include/usage_compressed.h: .config $(USAGE_BIN) \
-+       $(top_srcdir)/scripts/usage_compressed
-+   $(Q)SED="$(SED)" $(SHELL) $(top_srcdir)/scripts/usage_compressed \
-+   "$(top_builddir)/scripts" > $@
- endif # CONFIG_FEATURE_COMPRESS_USAGE
- 
- # workaround alleged bug in make-3.80, make-3.81
-@@ -470,7 +473,8 @@
-        docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
-        docs/busybox.net/BusyBox.html busybox.links \
-        libbusybox.so* \
--       .config.old busybox busybox_unstripped
-+       .config.old busybox busybox_unstripped \
-+       include/usage_compressed.h scripts/usage
-    - rm -r -f _install testsuite/links
-    - find . -name .\*.flags -o -name \*.o  -o -name \*.om -o -name \*.syn \
-        -o -name \*.os -o -name \*.osm -o -name \*.a | xargs rm -f
- ------------------------------------------------------------------------
-r15659 | landley | 2006-07-06 16:02:47 -0400 (Thu, 06 Jul 2006) | 3 lines
-Changed paths:
-   M /trunk/busybox/libbb/Makefile
-
-Attempt to address Shaun Jackman's problem adding "busybox: busybox.bflt" to
-.config.mak.
-
- ------------------------------------------------------------------------
-Index: libbb/Makefile
-===================================================================
---- libbb/Makefile  (revision 15658)
-+++ libbb/Makefile  (revision 15659)
-@@ -12,6 +12,12 @@
- endif
- srcdir=$(top_srcdir)/libbb
- LIBBB_DIR:=./
-+
-+# Ensure "all" is still the default target when make is run by itself in
-+# libbb, even if the files we include define rules for targets.
-+
-+all:
-+
- include $(top_srcdir)/Rules.mak
- include $(top_builddir)/.config
- include Makefile.in
- ------------------------------------------------------------------------
-r15660 | landley | 2006-07-06 16:30:19 -0400 (Thu, 06 Jul 2006) | 3 lines
-Changed paths:
-   M /trunk/busybox/archival/libunarchive/get_header_tar.c
-
-Fix tar so it can extract git-generated tarballs, based on a suggestion
-from Erik Frederiksen.
-
- ------------------------------------------------------------------------
-Index: archival/libunarchive/get_header_tar.c
-===================================================================
---- archival/libunarchive/get_header_tar.c  (revision 15659)
-+++ archival/libunarchive/get_header_tar.c  (revision 15660)
-@@ -137,10 +137,6 @@
-    case '1':
-        file_header->mode |= S_IFREG;
-        break;
--   case 'x':
--   case 'g':
--       bb_error_msg_and_die("pax is not tar");
--       break;
-    case '7':
-        /* Reserved for high performance files, treat as normal file */
-    case 0:
-@@ -188,8 +184,11 @@
-    case 'N':   /* Old GNU for names > 100 characters */
-    case 'S':   /* Sparse file */
-    case 'V':   /* Volume header */
--       bb_error_msg("Ignoring GNU extension type %c", tar.formated.typeflag);
+    unsigned int t;
+ 
+-
++   printf(" (");
+    if (standby == 0)
+        printf("off");
+    else if (standby == 252)
+@@ -2082,7 +2082,7 @@
+    USE_FEATURE_HDPARM_GET_IDENTITY("iI")
+    USE_FEATURE_HDPARM_HDIO_GETSET_DMA("d::")
+ #ifdef HDIO_DRIVE_CMD
+-                                   "S::D::P::X::K::A::L::W::CyYzZ"
++                                   "S:D:P:X:K:A:L:W:CyYzZ"
  #endif
-+   case 'g':   /* pax global header */
-+   case 'x':   /* pax extended header */
-+       bb_error_msg("Ignoring extension type %c", tar.formated.typeflag);
-+       break;
-    default:
-        bb_error_msg("Unknown typeflag: 0x%x", tar.formated.typeflag);
+    USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF("U:")
+ #ifdef HDIO_GET_QDMA
+ ------------------------------------------------------------------------
+r15773 | landley | 2006-08-03 16:39:59 -0400 (Thu, 03 Aug 2006) | 3 lines
+Changed paths:
+   M /trunk/busybox/modutils/lsmod.c
+
+Try to make a "type-punned pointer" warning go away for somebody on the
+buildroot list.
+
+ ------------------------------------------------------------------------
+Index: modutils/lsmod.c
+===================================================================
+--- modutils/lsmod.c    (revision 15772)
++++ modutils/lsmod.c    (revision 15773)
+@@ -93,8 +93,7 @@
+    size_t bufsize, depsize, nmod, count, i, j;
+ 
+    module_names = xmalloc(bufsize = 256);
+-   if (my_query_module(NULL, QM_MODULES, (void **)&module_names, &bufsize,
+-               &nmod)) {
++   if (my_query_module(NULL, QM_MODULES, &module_names, &bufsize, &nmod)) {
+        bb_perror_msg_and_die("QM_MODULES");
     }
- ------------------------------------------------------------------------
-r15670 | landley | 2006-07-09 13:03:07 -0400 (Sun, 09 Jul 2006) | 3 lines
-Changed paths:
-   M /trunk/busybox/shell/lash.c
-
-Bugfix from Shaun Jackman (check that argv[optind] isn't null before
-dereferencing it) plus a bunch of tweaks from me.
-
- ------------------------------------------------------------------------
-Index: shell/lash.c
-===================================================================
---- shell/lash.c    (revision 15669)
-+++ shell/lash.c    (revision 15670)
-@@ -1498,6 +1498,8 @@
-        remove_job(&job_list, job_list.fg);
-    }
- }
-+#else
-+void free_memory(void);
- #endif
- 
- #ifdef CONFIG_LASH_JOB_CONTROL
-@@ -1528,7 +1530,7 @@
-    /* Put ourselves in our own process group.  */
-    setsid();
-    shell_pgrp = getpid ();
--   setpgid (shell_pgrp, shell_pgrp);
-+   setpgid(shell_pgrp, shell_pgrp);
- 
-    /* Grab control of the terminal.  */
-    tcsetpgrp(shell_terminal, shell_pgrp);
-@@ -1577,7 +1579,7 @@
-                argv = argv+optind;
-                break;
-            case 'i':
--               interactive = TRUE;
-+               interactive++;
-                break;
-            default:
-                bb_show_usage();
-@@ -1591,18 +1593,18 @@
-     *    standard output is a terminal
-     *    Refer to Posix.2, the description of the `sh' utility. */
-    if (argv[optind]==NULL && input==stdin &&
--           isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
--       interactive=TRUE;
-+           isatty(STDIN_FILENO) && isatty(STDOUT_FILENO))
-+   {
-+       interactive++;
-    }
-    setup_job_control();
--   if (interactive==TRUE) {
--       //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
-+   if (interactive) {
-        /* Looks like they want an interactive shell */
--#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET
--       printf( "\n\n%s Built-in shell (lash)\n", BB_BANNER);
--       printf( "Enter 'help' for a list of built-in commands.\n\n");
--#endif
--   } else if (local_pending_command==NULL) {
-+       if (!ENABLE_FEATURE_SH_EXTRA_QUIET) {
-+           printf( "\n\n%s Built-in shell (lash)\n", BB_BANNER);
-+           printf( "Enter 'help' for a list of built-in commands.\n\n");
-+       }
-+   } else if (!local_pending_command && argv[optind]) {
-        //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
-        input = bb_xfopen(argv[optind], "r");
-        /* be lazy, never mark this closed */
-@@ -1614,15 +1616,10 @@
-    if (!cwd)
-        cwd = bb_msg_unknown;
- 
--#ifdef CONFIG_FEATURE_CLEAN_UP
--   atexit(free_memory);
--#endif
-+   if (ENABLE_FEATURE_CLEAN_UP) atexit(free_memory);
- 
--#ifdef CONFIG_FEATURE_COMMAND_EDITING
--   cmdedit_set_initial_prompt();
--#else
--   PS1 = NULL;
--#endif
-+   if (ENABLE_FEATURE_COMMAND_EDITING) cmdedit_set_initial_prompt();
-+   else PS1 = NULL;
- 
-    return (busy_loop(input));
- }
- ------------------------------------------------------------------------
-r15698 | vapier | 2006-07-14 23:59:00 -0400 (Fri, 14 Jul 2006) | 2 lines
-Changed paths:
-   M /trunk/busybox/libbb/obscure.c
-
-Tito writes: If the gecos field of an user is empty, obscure reports a false "similar to gecos" error.
-
- ------------------------------------------------------------------------
-Index: libbb/obscure.c
-===================================================================
---- libbb/obscure.c (revision 15697)
-+++ libbb/obscure.c (revision 15698)
-@@ -109,7 +109,7 @@
-        return "similar to username";
-    }
-    /* no gecos as-is, as sub-string, reversed, capitalized, doubled */
--   if (string_checker(new_p, pw->pw_gecos)) {
-+   if (*pw->pw_gecos && string_checker(new_p, pw->pw_gecos)) {
-        return "similar to gecos";
-    }
-    /* hostname as-is, as sub-string, reversed, capitalized, doubled */
- ------------------------------------------------------------------------
-r15700 | landley | 2006-07-15 19:00:46 -0400 (Sat, 15 Jul 2006) | 4 lines
-Changed paths:
-   M /trunk/busybox/include/libbb.h
-   M /trunk/busybox/libbb/xfuncs.c
-
-We need xsetuid() and xsetgid() because per-user process resource limits can
-prevent a process from switching to a user that has too many processes, and
-when that happens WE'RE STILL ROOT.  See http://lwn.net/Articles/190331/
-
- ------------------------------------------------------------------------
-Index: libbb/xfuncs.c
-===================================================================
---- libbb/xfuncs.c  (revision 15699)
-+++ libbb/xfuncs.c  (revision 15700)
-@@ -232,3 +232,15 @@
-    return 0;
- }
- #endif 
-+
-+#ifdef L_setuid
-+void xsetgid(gid_t gid)
-+{
-+   if (setgid(gid)) bb_error_msg_and_die("setgid");
-+}
-+
-+void xsetuid(uid_t uid)
-+{
-+   if (setuid(uid)) bb_error_msg_and_die("setuid");
-+}
-+#endif
-Index: include/libbb.h
-===================================================================
---- include/libbb.h (revision 15699)
-+++ include/libbb.h (revision 15700)
-@@ -185,6 +185,8 @@
- extern bb_xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen);
- extern void bb_xlisten(int s, int backlog);
- extern void bb_xchdir(const char *path);
-+extern void xsetgid(gid_t gid);
-+extern void xsetuid(uid_t uid);
- 
- #define BB_GETOPT_ERROR 0x80000000UL
- extern const char *bb_opt_complementally;
- ------------------------------------------------------------------------
-r15702 | landley | 2006-07-16 04:06:34 -0400 (Sun, 16 Jul 2006) | 2 lines
-Changed paths:
-   M /trunk/busybox/loginutils/passwd.c
-   M /trunk/busybox/networking/arping.c
-   M /trunk/busybox/networking/ether-wake.c
-   M /trunk/busybox/networking/fakeidentd.c
-   M /trunk/busybox/networking/inetd.c
-   M /trunk/busybox/networking/traceroute.c
-
-Convert setuid/setgid users to xsetuid/xsetgid.
-
- ------------------------------------------------------------------------
-Index: networking/fakeidentd.c
-===================================================================
---- networking/fakeidentd.c (revision 15701)
-+++ networking/fakeidentd.c (revision 15702)
-@@ -159,8 +159,8 @@
- 
-        close(0);
-        inetbind();
--       if (setgid(nogrp))   bb_error_msg_and_die("Could not setgid()");
--       if (setuid(nobody))  bb_error_msg_and_die("Could not setuid()");
-+       xsetgid(nogrp);
-+       xsetuid(nobody);
-        close(1);
-        close(2);
- 
-Index: networking/ether-wake.c
-===================================================================
---- networking/ether-wake.c (revision 15701)
-+++ networking/ether-wake.c (revision 15702)
-@@ -145,7 +145,7 @@
-    s = make_socket();
- 
-    /* now that we have a raw socket we can drop root */
--   setuid(getuid());
-+   xsetuid(getuid());
- 
-    /* look up the dest mac address */
-    get_dest_addr(argv[optind], &eaddr);
-Index: networking/inetd.c
-===================================================================
---- networking/inetd.c  (revision 15701)
-+++ networking/inetd.c  (revision 15702)
-@@ -1513,11 +1513,11 @@
-              if (sep->se_group) {
-                pwd->pw_gid = grp->gr_gid;
-              }
--             setgid ((gid_t) pwd->pw_gid);
-+             xsetgid ((gid_t) pwd->pw_gid);
-              initgroups (pwd->pw_name, pwd->pw_gid);
--             setuid ((uid_t) pwd->pw_uid);
-+             xsetuid((uid_t) pwd->pw_uid);
-            } else if (sep->se_group) {
--             setgid (grp->gr_gid);
-+             xsetgid(grp->gr_gid);
-              setgroups (1, &grp->gr_gid);
+ 
+@@ -111,7 +110,7 @@
+            /* else choke */
+            bb_perror_msg_and_die("module %s: QM_INFO", mn);
+        }
+-       if (my_query_module(mn, QM_REFS, (void **)&deps, &depsize, &count)) {
++       if (my_query_module(mn, QM_REFS, &deps, &depsize, &count)) {
+            if (errno == ENOENT) {
+                /* The module was removed out from underneath us. */
+                continue;
+ ------------------------------------------------------------------------
+r15782 | landley | 2006-08-04 17:12:14 -0400 (Fri, 04 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/archival/Makefile.in
+
+We haven't got a CONFIG_APT_GET.
+
+ ------------------------------------------------------------------------
+Index: archival/Makefile.in
+===================================================================
+--- archival/Makefile.in    (revision 15781)
++++ archival/Makefile.in    (revision 15782)
+@@ -11,7 +11,6 @@
+ srcdir=$(top_srcdir)/archival
+ 
+ ARCHIVAL-y:=
+-ARCHIVAL-$(CONFIG_APT_GET) +=
+ ARCHIVAL-$(CONFIG_AR)      += ar.o
+ ARCHIVAL-$(CONFIG_BUNZIP2) += bunzip2.o
+ ARCHIVAL-$(CONFIG_UNLZMA)  += unlzma.o
+ ------------------------------------------------------------------------
+r15787 | landley | 2006-08-06 16:41:11 -0400 (Sun, 06 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/util-linux/readprofile.c
+
+Make a warning go away on 64-bit systems.
+
+ ------------------------------------------------------------------------
+Index: util-linux/readprofile.c
+===================================================================
+--- util-linux/readprofile.c    (revision 15786)
++++ util-linux/readprofile.c    (revision 15787)
+@@ -47,7 +47,7 @@
+    int proFd;
+    const char *mapFile, *proFile, *mult=0;
+    unsigned long len=0, indx=1;
+-   unsigned long long add0=0;
++   uint64_t add0=0;
+    unsigned int step;
+    unsigned int *buf, total, fn_len;
+    unsigned long long fn_add, next_add;          /* current and next address */
+@@ -223,7 +223,7 @@
+                    printf ("%s:\n", fn_name);
+                    header_printed = 1;
+                }
+-               printf ("\t%llx\t%u\n", (indx - 1)*step + add0, buf[indx]);
++               printf ("\t%"PRIx64"\t%u\n", (indx - 1)*step + add0, buf[indx]);
             }
-            dup2 (ctrl, 0);
-Index: networking/traceroute.c
-===================================================================
---- networking/traceroute.c (revision 15701)
-+++ networking/traceroute.c (revision 15702)
-@@ -941,7 +941,6 @@
- #endif
-    u_short off = 0;
-    struct IFADDRLIST *al;
--   int uid = getuid();
-    char *device = NULL;
-    int max_ttl = 30;
-    char *max_ttl_str = NULL;
-@@ -1010,8 +1009,7 @@
-         * set the ip source address of the outbound
-         * probe (e.g., on a multi-homed host).
-         */
--        if (uid)
--       bb_error_msg_and_die("-s %s: Permission denied", source);
-+        if (getuid()) bb_error_msg_and_die("-s %s: Permission denied", source);
-    }
-    if(waittime_str)
-        waittime = str2val(waittime_str, "wait time", 2, 24 * 60 * 60);
-@@ -1160,8 +1158,8 @@
-            sizeof(on));
- 
-    /* Revert to non-privileged user after opening sockets */
--   setgid(getgid());
--   setuid(uid);
-+   xsetgid(getgid());
-+   xsetuid(getuid());
- 
-    outip = (struct ip *)xcalloc(1, (unsigned)packlen);
- 
-Index: networking/arping.c
-===================================================================
---- networking/arping.c (revision 15701)
-+++ networking/arping.c (revision 15702)
-@@ -262,7 +262,8 @@
-    s = socket(PF_PACKET, SOCK_DGRAM, 0);
-    ifindex = errno;
- 
--   setuid(getuid());
-+   // Drop suid root privileges
-+   xsetuid(getuid());
- 
-    {
-        unsigned long opt;
-Index: loginutils/passwd.c
-===================================================================
---- loginutils/passwd.c (revision 15701)
-+++ loginutils/passwd.c (revision 15702)
-@@ -227,10 +227,7 @@
-    signal(SIGINT, SIG_IGN);
-    signal(SIGQUIT, SIG_IGN);
-    umask(077);
--   if (setuid(0)) {
--       syslog(LOG_ERR, "can't setuid(0)");
--       bb_error_msg_and_die( "Cannot change ID to root.\n");
--   }
-+   xsetuid(0);
-    if (!update_passwd(pw, crypt_passwd)) {
-        syslog(LOG_INFO, "password for `%s' changed by user `%s'", name,
-               myname);
- ------------------------------------------------------------------------
-r15705 | landley | 2006-07-16 14:58:18 -0400 (Sun, 16 Jul 2006) | 2 lines
-Changed paths:
-   M /trunk/busybox/loginutils/adduser.c
-
-Bugfix from Tito to make sure /etc/group gets updated.
-
- ------------------------------------------------------------------------
-Index: loginutils/adduser.c
-===================================================================
---- loginutils/adduser.c    (revision 15704)
-+++ loginutils/adduser.c    (revision 15705)
-@@ -96,6 +96,7 @@
- static int adduser(struct passwd *p, unsigned long flags)
- {
-    FILE *file;
-+   int addgroup = !p->pw_gid;
- 
-    /* make sure everything is kosher and setup uid && gid */
-    file = bb_xfopen(bb_path_passwd_file, "a");
-@@ -132,9 +133,8 @@
-    /* add to group */
-    /* addgroup should be responsible for dealing w/ gshadow */
-    /* if using a pre-existing group, don't create one */
--   if (p->pw_gid == 0) {
--       addgroup_wrapper(p);
--   }
-+   if (addgroup) addgroup_wrapper(p);
-+
-    /* Clear the umask for this process so it doesn't
-     * * screw up the permissions on the mkdir and chown. */
+            this += buf[indx++];
+        }
+ ------------------------------------------------------------------------
+r15788 | landley | 2006-08-07 20:47:17 -0400 (Mon, 07 Aug 2006) | 3 lines
+Changed paths:
+   M /trunk/busybox/util-linux/mount.c
+
+Using lstat() instead of stat() means that attempting to loopback mount
+a symlink doesn't work.
+
+ ------------------------------------------------------------------------
+Index: util-linux/mount.c
+===================================================================
+--- util-linux/mount.c  (revision 15787)
++++ util-linux/mount.c  (revision 15788)
+@@ -285,7 +285,7 @@
+    // Look at the file.  (Not found isn't a failure for remount, or for
+    // a synthetic filesystem like proc or sysfs.)
+ 
+-   if (lstat(mp->mnt_fsname, &st));
++   if (stat(mp->mnt_fsname, &st));
+    else if (!(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
+        // Do we need to allocate a loopback device for it?
+ 
+ ------------------------------------------------------------------------
+r15795 | landley | 2006-08-09 21:09:37 -0400 (Wed, 09 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/util-linux/mdev.c
+
+Patch from Chris Steel to fix mdev deleting device nodes.
+
+ ------------------------------------------------------------------------
+Index: util-linux/mdev.c
+===================================================================
+--- util-linux/mdev.c   (revision 15794)
++++ util-linux/mdev.c   (revision 15795)
+@@ -37,18 +37,19 @@
+     * because sscanf() will stop at the first nondigit, which \n is.  We
+     * also depend on path having writeable space after it. */
+ 
+-   strcat(path, "/dev");
+-   fd = open(path, O_RDONLY);
+-   len = read(fd, temp + 1, 64);
+-   *temp++ = 0;
+-   close(fd);
+-   if (len < 1) return;
++   if (!delete) {
++       strcat(path, "/dev");
++       fd = open(path, O_RDONLY);
++       len = read(fd, temp + 1, 64);
++       *temp++ = 0;
++       close(fd);
++       if (len < 1) return;
++   }
+ 
+    /* Determine device name, type, major and minor */
+ 
+    device_name = strrchr(path, '/') + 1;
+    type = path[5]=='c' ? S_IFCHR : S_IFBLK;
+-   if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
+ 
+    /* If we have a config file, look up permissions for this device */
+ 
+@@ -164,6 +165,7 @@
+ 
     umask(0);
- ------------------------------------------------------------------------
-r15727 | landley | 2006-07-19 17:33:42 -0400 (Wed, 19 Jul 2006) | 4 lines
-Changed paths:
-   M /trunk/busybox/modutils/modprobe.c
-
-Patch from Yann Morin to look for modules.conf in the right place on 2.6.
-Fixes http://bugs.busybox.net/view.php?id=942
-
-
- ------------------------------------------------------------------------
-Index: modutils/modprobe.c
-===================================================================
---- modutils/modprobe.c (revision 15726)
-+++ modutils/modprobe.c (revision 15727)
-@@ -545,29 +545,37 @@
-    }
-    close ( fd );
- 
-+   /*
-+    * First parse system-specific options and aliases
-+    * as they take precedence over the kernel ones.
-+    */
-    if (!ENABLE_FEATURE_2_6_MODULES
-            || ( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 )
-        if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 )
--           if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 )
--               return first;
-+           fd = open ( "/etc/conf.modules", O_RDONLY );
- 
--   include_conf (&first, &current, buffer, sizeof(buffer), fd);
--   close(fd);
-+   if (fd >= 0) {
-+       include_conf (&first, &current, buffer, sizeof(buffer), fd);
-+       close(fd);
-+   }
- 
--   filename = bb_xasprintf("/lib/modules/%s/modules.alias", un.release);
--   fd = open ( filename, O_RDONLY );
--   if (ENABLE_FEATURE_CLEAN_UP)
--       free(filename);
--   if (fd < 0) {
--       /* Ok, that didn't work.  Fall back to looking in /lib/modules */
--       if (( fd = open ( "/lib/modules/modules.alias", O_RDONLY )) < 0 ) {
--           return first;
-+   /* Only 2.6 has a modules.alias file */
-+   if (ENABLE_FEATURE_2_6_MODULES) {
-+       /* Parse kernel-declared aliases */
-+       filename = bb_xasprintf("/lib/modules/%s/modules.alias", un.release);
-+       if ((fd = open ( filename, O_RDONLY )) < 0) {
-+           /* Ok, that didn't work.  Fall back to looking in /lib/modules */
-+           fd = open ( "/lib/modules/modules.alias", O_RDONLY );
-        }
-+       if (ENABLE_FEATURE_CLEAN_UP)
-+           free(filename);
-+
-+       if (fd >= 0) {
-+           include_conf (&first, &current, buffer, sizeof(buffer), fd);
-+           close(fd);
+    if (!delete) {
++       if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
+        if (mknod(device_name, mode | type, makedev(major, minor)) && errno != EEXIST)
+            bb_perror_msg_and_die("mknod %s failed", device_name);
+ 
+ ------------------------------------------------------------------------
+r15800 | landley | 2006-08-10 17:46:43 -0400 (Thu, 10 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/shell/msh.c
+
+Make a warning go away when standalone shell is disabled.
+
+ ------------------------------------------------------------------------
+Index: shell/msh.c
+===================================================================
+--- shell/msh.c (revision 15799)
++++ shell/msh.c (revision 15800)
+@@ -3126,18 +3126,17 @@
+    int i;
+    char *sp, *tp;
+    int eacces = 0, asis = 0;
+-
+-#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
+    char *name = c;
+ 
+-   optind = 1;
+-   if (find_applet_by_name(name)) {
+-       /* We have to exec here since we vforked.  Running
+-        * run_applet_by_name() won't work and bad things
+-        * will happen. */
+-       execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
++   if (ENABLE_FEATURE_SH_STANDALONE_SHELL) {
++       optind = 1;
++       if (find_applet_by_name(name)) {
++           /* We have to exec here since we vforked.  Running
++            * run_applet_by_name() won't work and bad things
++            * will happen. */
++           execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
 +       }
     }
- 
--   include_conf (&first, &current, buffer, sizeof(buffer), fd);
--   close(fd);
+-#endif
+ 
+    DBGPRINTF(("REXECVE: c=%p, v=%p, envp=%p\n", c, v, envp));
+ 
+ ------------------------------------------------------------------------
+r15806 | landley | 2006-08-17 15:07:20 -0400 (Thu, 17 Aug 2006) | 13 lines
+Changed paths:
+   M /trunk/busybox/util-linux/umount.c
+
+The kernel can't handle umount /dev/hdc, we have to do it through mtab,
+except that we still have to work when there is no mtab.
+
+Oh, and while we're at it, take advantage of the fact that modern processors
+avoid branches via conditional assignment where possible.  ("x = a ? b : c;"
+turns into "x = c; if (a) x = b;" because that way there's no branch to
+potentially mispredict and thus never a bubble in the pipeline.  The if(a)
+turns into an assembly test followed by a conditional assignment (rather
+than a conditional jump).)  So since the compiler is going to do that _anyway_,
+we might as well take advantage of it to produce a slightly smaller binary.
+
+So there.
+
+ ------------------------------------------------------------------------
+Index: util-linux/umount.c
+===================================================================
+--- util-linux/umount.c (revision 15805)
++++ util-linux/umount.c (revision 15806)
+@@ -78,6 +78,7 @@
+    // Loop through everything we're supposed to umount, and do so.
+    for (;;) {
+        int curstat;
++       char *zapit = *argv;
+ 
+        // Do we already know what to umount this time through the loop?
+        if (m) safe_strncpy(path, m->dir, PATH_MAX);
+@@ -86,32 +87,37 @@
+        // Get next command line argument (and look it up in mtab list)
+        else if (!argc--) break;
+        else {
+-           realpath(*argv++, path);
++           argv++;
++           realpath(zapit, path);
+            for (m = mtl; m; m = m->next)
+                if (!strcmp(path, m->dir) || !strcmp(path, m->device))
+                    break;
+        }
++       // If we couldn't find this sucker in /etc/mtab, punt by passing our
++       // command line argument straight to the umount syscall.  Otherwise,
++       // umount the directory even if we were given the block device.
++       if (m) zapit = m->dir;
+ 
+        // Let's ask the thing nicely to unmount.
+-       curstat = umount(path);
++       curstat = umount(zapit);
+ 
+        // Force the unmount, if necessary.
+        if (curstat && doForce) {
+-           curstat = umount2(path, doForce);
++           curstat = umount2(zapit, doForce);
+            if (curstat)
+-               bb_error_msg_and_die("forced umount of %s failed!", path);
++               bb_error_msg_and_die("forced umount of %s failed!", zapit);
+        }
+ 
+        // If still can't umount, maybe remount read-only?
+        if (curstat && (opt & OPT_REMOUNT) && errno == EBUSY && m) {
+-           curstat = mount(m->device, path, NULL, MS_REMOUNT|MS_RDONLY, NULL);
++           curstat = mount(m->device, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL);
+            bb_error_msg(curstat ? "Cannot remount %s read-only" :
+                         "%s busy - remounted read-only", m->device);
+        }
+ 
+        if (curstat) {
+            status = EXIT_FAILURE;
+-           bb_perror_msg("Couldn't umount %s", path);
++           bb_perror_msg("Couldn't umount %s", zapit);
+        } else {
+            /* De-allocate the loop device.  This ioctl should be ignored on
+             * any non-loop block devices. */
+@@ -121,9 +127,9 @@
+                erase_mtab(m->dir);
+        }
+ 
 -
-    return first;
+-
+        // Find next matching mtab entry for -a or umount /dev
++       // Note this means that "umount /dev/blah" will unmount all instances
++       // of /dev/blah, not just the most recent.
+        while (m && (m = m->next))
+            if ((opt & OPT_ALL) || !strcmp(path,m->device))
+                break;
+ ------------------------------------------------------------------------
+r15826 | aldot | 2006-08-18 14:29:40 -0400 (Fri, 18 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/networking/traceroute.c
+
+- typo: s/optarg/nprobes_str; fixes segfault as reported by Raphael HUCK
+
+ ------------------------------------------------------------------------
+Index: networking/traceroute.c
+===================================================================
+--- networking/traceroute.c (revision 15825)
++++ networking/traceroute.c (revision 15826)
+@@ -1003,7 +1003,7 @@
+    if(port_str)
+        port = (u_short)str2val(port_str, "port", 1, (1 << 16) - 1);
+    if(nprobes_str)
+-       nprobes = str2val(optarg, "nprobes", 1, -1);
++       nprobes = str2val(nprobes_str, "nprobes", 1, -1);
+    if(source) {
+        /*
+         * set the ip source address of the outbound
+ ------------------------------------------------------------------------
+r15855 | landley | 2006-08-20 19:13:33 -0400 (Sun, 20 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/Rules.mak
+
+Yann E. Morin spotted a broken check_ld macro.
+
+ ------------------------------------------------------------------------
+Index: Rules.mak
+===================================================================
+--- Rules.mak   (revision 15854)
++++ Rules.mak   (revision 15855)
+@@ -267,7 +267,7 @@
+ else
+     CFLAGS +=-DNDEBUG
+     CHECKED_LDFLAGS += $(call check_ld,$(LD),--sort-common,)
+-    CHECKED_LDFLAGS += $(call check_ld,--gc-sections,)
++    CHECKED_LDFLAGS += $(call check_ld,$(LD),--gc-sections,)
+ endif
+ 
+ ifneq ($(strip $(CONFIG_DEBUG_PESSIMIZE)),y)
+ ------------------------------------------------------------------------
+r15890 | landley | 2006-08-21 13:42:03 -0400 (Mon, 21 Aug 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/miscutils/Makefile.in
+
+Michael Opdenacker spotted that makefile should use () instead of {}.
+
+ ------------------------------------------------------------------------
+Index: miscutils/Makefile.in
+===================================================================
+--- miscutils/Makefile.in   (revision 15889)
++++ miscutils/Makefile.in   (revision 15890)
+@@ -20,7 +20,7 @@
+ MISCUTILS-$(CONFIG_EJECT)       += eject.o
+ MISCUTILS-$(CONFIG_HDPARM)      += hdparm.o
+ MISCUTILS-$(CONFIG_LAST)        += last.o
+-MISCUTILS-${CONFIG_LESS}        += less.o
++MISCUTILS-$(CONFIG_LESS)        += less.o
+ MISCUTILS-$(CONFIG_MAKEDEVS)    += makedevs.o
+ MISCUTILS-$(CONFIG_MOUNTPOINT)  += mountpoint.o
+ MISCUTILS-$(CONFIG_MT)          += mt.o
+ ------------------------------------------------------------------------
+r15905 | landley | 2006-08-22 19:40:28 -0400 (Tue, 22 Aug 2006) | 9 lines
+Changed paths:
+   M /trunk/busybox/coreutils/test.c
+
+"Jordan Crouse" <jordan.crouse@amd.com> says:
+The following patch makes coreutils/test.c act fail gracefully if getgroups() 
+returns a -1.  This fixes a problem on the One Laptop Per Child ROM image
+whereby we were getting odd Memory exhausted messages for '[' and 'test'.
+
+Found by Mitch Bradley <wmb@firmworks.com>
+(Tweaked by Rob: no need to initialize a static to NULL, or realloc something
+that's only allocated when it's NULL.)
+
+ ------------------------------------------------------------------------
+Index: coreutils/test.c
+===================================================================
+--- coreutils/test.c    (revision 15904)
++++ coreutils/test.c    (revision 15905)
+@@ -151,7 +151,7 @@
+ 
+ static char **t_wp;
+ static struct t_op const *t_wp_op;
+-static gid_t *group_array = NULL;
++static gid_t *group_array;
+ static int ngroups;
+ 
+ static enum token t_lex(char *s);
+@@ -547,8 +547,10 @@
+ static void initialize_group_array(void)
+ {
+    ngroups = getgroups(0, NULL);
+-   group_array = xrealloc(group_array, ngroups * sizeof(gid_t));
+-   getgroups(ngroups, group_array);
++   if (ngroups > 0) {
++       group_array = xmalloc(ngroups * sizeof(gid_t));
++       getgroups(ngroups, group_array);
++   }
  }
  
+ /* Return non-zero if GID is one that we have in our groups list. */
+ ------------------------------------------------------------------------
+r15906 | landley | 2006-08-22 19:50:11 -0400 (Tue, 22 Aug 2006) | 3 lines
+Changed paths:
+   M /trunk/busybox/modutils/modprobe.c
+
+Patch from Yann Morin so modprobe won't return failure if the module gets
+loaded while it's running (ala multi-device hotplug).
+
+ ------------------------------------------------------------------------
+Index: modutils/modprobe.c
+===================================================================
+--- modutils/modprobe.c (revision 15905)
++++ modutils/modprobe.c (revision 15906)
+@@ -679,7 +679,7 @@
+            }
+            if (!show_only) {
+                int rc2 = wait4pid(bb_spawn(argv));
+-               
++
+                if (do_insert) {
+                    rc = rc2; /* only last module matters */
+                }
+@@ -859,7 +859,16 @@
+        }
+ 
+        // process tail ---> head
+-       rc = mod_process ( tail, 1 );
++       if ((rc = mod_process ( tail, 1 )) != 0) {
++           /*
++            * In case of using udev, multiple instances of modprobe can be
++            * spawned to load the same module (think of two same usb devices,
++            * for example; or cold-plugging at boot time). Thus we shouldn't
++            * fail if the module was loaded, and not by us.
++            */
++           if (already_loaded (mod) )
++               rc = 0;
++       }
+    }
+    else
+        rc = 1;
+ ------------------------------------------------------------------------
+r15984 | landley | 2006-08-24 16:00:44 -0400 (Thu, 24 Aug 2006) | 6 lines
+Changed paths:
+   M /trunk/busybox/loginutils/getty.c
+
+Antti Seppala (with dots over the last two a's) wants our getty to initialize
+the terminal the way mingetty does instead of the way agetty does.  It's
+a bit ugly for somebody else to be writing to a console sitting at a
+login: prompt, but it's uglier when newline doesn't work as expected if
+they do.
+
+ ------------------------------------------------------------------------
+Index: loginutils/getty.c
+===================================================================
+--- loginutils/getty.c  (revision 15983)
++++ loginutils/getty.c  (revision 15984)
+@@ -474,7 +474,8 @@
+        tp->c_cflag |= CLOCAL;
+    }
+ 
+-   tp->c_iflag = tp->c_lflag = tp->c_oflag = tp->c_line = 0;
++   tp->c_iflag = tp->c_lflag = tp->c_line = 0;
++   tp->c_oflag = OPOST | ONLCR;
+    tp->c_cc[VMIN] = 1;
+    tp->c_cc[VTIME] = 0;
+ 
+ ------------------------------------------------------------------------
+r16004 | landley | 2006-08-28 16:04:46 -0400 (Mon, 28 Aug 2006) | 3 lines
+Changed paths:
+   M /trunk/busybox/libbb/Makefile.in
+
+Jordan Crouse submitted a patch to only include xregcomp.c when we actually
+use it, thus fixing building against uClibc with regex support disabled.
+
+ ------------------------------------------------------------------------
+Index: libbb/Makefile.in
+===================================================================
+--- libbb/Makefile.in   (revision 16003)
++++ libbb/Makefile.in   (revision 16004)
+@@ -29,7 +29,7 @@
+    safe_strncpy.c setup_environment.c sha1.c simplify_path.c \
+    trim.c u_signal_names.c vdprintf.c verror_msg.c \
+    vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xstat.c \
+-   xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c xgetlarg.c \
++   xgethostbyname.c xgethostbyname2.c xreadlink.c xgetlarg.c \
+    bb_xsocket.c bb_xdaemon.c bb_xbind.c bb_xlisten.c bb_xchdir.c \
+    get_terminal_width_height.c fclose_nonstdin.c fflush_stdout_and_exit.c \
+    getopt_ulflags.c default_error_retval.c wfopen_input.c speed_table.c \
+@@ -49,6 +49,20 @@
+ LIBBB-$(CONFIG_DF)+= find_mount_point.c
+ LIBBB-$(CONFIG_EJECT)+= find_mount_point.c
+ 
++# We shouldn't build xregcomp.c if we don't need it - this ensures we don't
++# require regex.h to be in the include dir even if we don't need it thereby
++# allowing us to build busybox even if uclibc regex support is disabled.
++
++regex-y:=
++
++regex-$(CONFIG_AWK) += xregcomp.c
++regex-$(CONFIG_SED) += xregcomp.c
++regex-$(CONFIG_LESS) += xregcomp.c
++regex-$(CONFIG_DEVFSD) += xregcomp.c
++
++# Sort has the happy side efect of returning a unique list
++LIBBB-y += $(sort $(regex-y))
++
+ LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y))
+ 
+ get-file-subparts = $(addsuffix .o,$(shell sed -n -e "s/^\#ifdef L_//p" ${1}))
+ ------------------------------------------------------------------------
+r16008 | vapier | 2006-08-28 19:24:38 -0400 (Mon, 28 Aug 2006) | 1 line
+Changed paths:
+   M /trunk/busybox/Rules.mak
+
+need libsepol in addtion to libselinux
+ ------------------------------------------------------------------------
+Index: Rules.mak
+===================================================================
+--- Rules.mak   (revision 16007)
++++ Rules.mak   (revision 16008)
+@@ -298,7 +298,7 @@
+ endif
+ 
+ ifeq ($(strip $(CONFIG_SELINUX)),y)
+-    LIBRARIES += -lselinux
++    LIBRARIES += -lselinux -lsepol
+ endif
+ 
+ ifeq ($(strip $(PREFIX)),)
+ ------------------------------------------------------------------------
+r16026 | vda | 2006-09-02 12:11:44 -0400 (Sat, 02 Sep 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/networking/ping6.c
+
+Fix endianness issue in ping6
+
+ ------------------------------------------------------------------------
+Index: networking/ping6.c
+===================================================================
+--- networking/ping6.c  (revision 16025)
++++ networking/ping6.c  (revision 16026)
+@@ -198,7 +198,7 @@
+    pkt->icmp6_type = ICMP6_ECHO_REQUEST;
+    pkt->icmp6_code = 0;
+    pkt->icmp6_cksum = 0;
+-   pkt->icmp6_seq = ntransmitted++;
++   pkt->icmp6_seq = SWAP_BE16(ntransmitted++);
+    pkt->icmp6_id = myid;
+    CLR(pkt->icmp6_seq % MAX_DUP_CHK);
+ 
+ ------------------------------------------------------------------------
+r16032 | vda | 2006-09-02 14:40:10 -0400 (Sat, 02 Sep 2006) | 4 lines
+Changed paths:
+   M /trunk/busybox/archival/libunarchive/find_list_entry.c
+   M /trunk/busybox/testsuite/README
+   A /trunk/busybox/testsuite/tar/tar-extracts-all-subdirs
+
+tar: tar xf foo.tar dir/dir did not extract all subdirs.
+Added testsuite entry for this
+
+
+ ------------------------------------------------------------------------
+Index: archival/libunarchive/find_list_entry.c
+===================================================================
+--- archival/libunarchive/find_list_entry.c (revision 16031)
++++ archival/libunarchive/find_list_entry.c (revision 16032)
+@@ -13,7 +13,7 @@
+ const llist_t *find_list_entry(const llist_t *list, const char *filename)
+ {
+    while (list) {
+-       if (fnmatch(list->data, filename, 0) == 0) {
++       if (fnmatch(list->data, filename, FNM_LEADING_DIR) == 0) {
+            return (list);
+        }
+        list = list->link;
+Index: testsuite/tar/tar-extracts-all-subdirs
+===================================================================
+--- testsuite/tar/tar-extracts-all-subdirs  (revision 0)
++++ testsuite/tar/tar-extracts-all-subdirs  (revision 16032)
+@@ -0,0 +1,12 @@
++# FEATURE: CONFIG_FEATURE_TAR_CREATE
++mkdir -p foo/{1,2,3}
++mkdir -p foo/1/{10,11}
++mkdir -p foo/1/10/{100,101,102}
++tar cf foo.tar -C foo .
++rm -rf foo/*
++busybox tar xf foo.tar -C foo ./1/10
++find foo | sort >logfile.bb
++rm -rf foo/*
++tar xf foo.tar -C foo ./1/10
++find foo | sort >logfile.gnu
++cmp logfile.gnu logfile.bb
+Index: testsuite/README
+===================================================================
+--- testsuite/README    (revision 16031)
++++ testsuite/README    (revision 16032)
+@@ -1,3 +1,6 @@
++Update: doesn't work as described. Try "make check" from parent dir...
++* * *
++
+ To run the test suite, change to this directory and run "./runtest".  It will
+ run all of the test cases, and list those with unexpected outcomes.  Adding the
+ -v option will cause it to show expected outcomes as well.  To only run the test
+ ------------------------------------------------------------------------
+r16033 | vda | 2006-09-03 08:20:36 -0400 (Sun, 03 Sep 2006) | 5 lines
+Changed paths:
+   M /trunk/busybox/networking/zcip.c
+
+zcip: apply patch from
+      http://bugs.busybox.net/view.php?id=1005
+      zcip does not claim another IP after defending
+
+
+ ------------------------------------------------------------------------
+Index: networking/zcip.c
+===================================================================
+--- networking/zcip.c   (revision 16032)
++++ networking/zcip.c   (revision 16033)
+@@ -15,7 +15,7 @@
+  * certainly be used.  Its naming is built over multicast DNS.
+  */
+ 
+-// #define      DEBUG
++//#define DEBUG
+ 
+ // TODO:
+ // - more real-world usage/testing, especially daemon mode
+@@ -43,12 +43,7 @@
+ 
+ struct arp_packet {
+    struct ether_header hdr;
+-   // FIXME this part is netinet/if_ether.h "struct ether_arp"
+-   struct arphdr arp;
+-   struct ether_addr source_addr;
+-   struct in_addr source_ip;
+-   struct ether_addr target_addr;
+-   struct in_addr target_ip;
++   struct ether_arp arp;
+ } ATTRIBUTE_PACKED;
+ 
+ enum {
+@@ -68,10 +63,19 @@
+    DEFEND_INTERVAL = 10
+ };
+ 
+-static const struct in_addr null_ip = { 0 };
+-static const struct ether_addr null_addr = { {0, 0, 0, 0, 0, 0} };
++/* States during the configuration process. */
++enum {
++   PROBE = 0,
++   RATE_LIMIT_PROBE,
++   ANNOUNCE,
++   MONITOR,
++   DEFEND
++};
+ 
+-static int verbose = 0;
++/* Implicitly zero-initialized */
++static const struct in_addr null_ip;
++static const struct ether_addr null_addr;
++static int verbose;
+ 
+ #define DBG(fmt,args...) \
+    do { } while (0)
+@@ -100,6 +104,7 @@
+    const struct ether_addr *target_addr, struct in_addr target_ip)
+ {
+    struct arp_packet p;
++   memset(&p, 0, sizeof(p));
+ 
+    // ether header
+    p.hdr.ether_type = htons(ETHERTYPE_ARP);
+@@ -107,15 +112,15 @@
+    memset(p.hdr.ether_dhost, 0xff, ETH_ALEN);
+ 
+    // arp request
+-   p.arp.ar_hrd = htons(ARPHRD_ETHER);
+-   p.arp.ar_pro = htons(ETHERTYPE_IP);
+-   p.arp.ar_hln = ETH_ALEN;
+-   p.arp.ar_pln = 4;
+-   p.arp.ar_op = htons(op);
+-   memcpy(&p.source_addr, source_addr, ETH_ALEN);
+-   memcpy(&p.source_ip, &source_ip, sizeof (p.source_ip));
+-   memcpy(&p.target_addr, target_addr, ETH_ALEN);
+-   memcpy(&p.target_ip, &target_ip, sizeof (p.target_ip));
++   p.arp.arp_hrd = htons(ARPHRD_ETHER);
++   p.arp.arp_pro = htons(ETHERTYPE_IP);
++   p.arp.arp_hln = ETH_ALEN;
++   p.arp.arp_pln = 4;
++   p.arp.arp_op = htons(op);
++   memcpy(&p.arp.arp_sha, source_addr, ETH_ALEN);
++   memcpy(&p.arp.arp_spa, &source_ip, sizeof (p.arp.arp_spa));
++   memcpy(&p.arp.arp_tha, target_addr, ETH_ALEN);
++   memcpy(&p.arp.arp_tpa, &target_ip, sizeof (p.arp.arp_tpa));
+ 
+    // send it
+    if (sendto(fd, &p, sizeof (p), 0, saddr, sizeof (*saddr)) < 0) {
+@@ -196,11 +201,11 @@
+    int fd;
+    int ready = 0;
+    suseconds_t timeout = 0;    // milliseconds
+-   time_t defend = 0;
+    unsigned conflicts = 0;
+    unsigned nprobes = 0;
+    unsigned nclaims = 0;
+    int t;
++   int state = PROBE;
+ 
+    // parse commandline: prog [options] ifname script
+    while ((t = getopt(argc, argv, "fqr:v")) != EOF) {
+@@ -307,6 +312,9 @@
+        fds[0].events = POLLIN;
+        fds[0].revents = 0;
+ 
++       int source_ip_conflict = 0;
++       int target_ip_conflict = 0;
++
+        // poll, being ready to adjust current timeout
+        if (!timeout) {
+            timeout = ms_rdelay(PROBE_WAIT);
+@@ -314,6 +322,7 @@
+            // make the kernel filter out all packets except
+            // ones we'd care about.
+        }
++       // set tv1 to the point in time when we timeout
+        gettimeofday(&tv1, NULL);
+        tv1.tv_usec += (timeout % 1000) * 1000;
+        while (tv1.tv_usec > 1000000) {
+@@ -326,64 +335,113 @@
+                timeout, intf, nprobes, nclaims);
+        switch (poll(fds, 1, timeout)) {
+ 
+-       // timeouts trigger protocol transitions
++       // timeout
+        case 0:
+-           // probes
+-           if (nprobes < PROBE_NUM) {
+-               nprobes++;
+-               VDBG("probe/%d %s@%s\n",
+-                       nprobes, intf, inet_ntoa(ip));
+-               (void)arp(fd, &saddr, ARPOP_REQUEST,
+-                       &addr, null_ip,
+-                       &null_addr, ip);
++           VDBG("state = %d\n", state);
++           switch (state) {
++           case PROBE:
++               // timeouts in the PROBE state means no conflicting ARP packets
++               // have been received, so we can progress through the states
+                if (nprobes < PROBE_NUM) {
++                   nprobes++;
++                   VDBG("probe/%d %s@%s\n",
++                           nprobes, intf, inet_ntoa(ip));
++                   (void)arp(fd, &saddr, ARPOP_REQUEST,
++                           &addr, null_ip,
++                           &null_addr, ip);
+                    timeout = PROBE_MIN * 1000;
+                    timeout += ms_rdelay(PROBE_MAX
+                            - PROBE_MIN);
+-               } else
+-                   timeout = ANNOUNCE_WAIT * 1000;
+-           }
+-           // then announcements
+-           else if (nclaims < ANNOUNCE_NUM) {
+-               nclaims++;
++               }
++               else {
++                   // Switch to announce state.
++                   state = ANNOUNCE;
++                   nclaims = 0;
++                   VDBG("announce/%d %s@%s\n",
++                           nclaims, intf, inet_ntoa(ip));
++                   (void)arp(fd, &saddr, ARPOP_REQUEST,
++                           &addr, ip,
++                           &addr, ip);
++                   timeout = ANNOUNCE_INTERVAL * 1000;
++               }
++               break;
++           case RATE_LIMIT_PROBE:
++               // timeouts in the RATE_LIMIT_PROBE state means no conflicting ARP packets
++               // have been received, so we can move immediately to the announce state
++               state = ANNOUNCE;
++               nclaims = 0;
+                VDBG("announce/%d %s@%s\n",
+                        nclaims, intf, inet_ntoa(ip));
+                (void)arp(fd, &saddr, ARPOP_REQUEST,
+                        &addr, ip,
+                        &addr, ip);
++               timeout = ANNOUNCE_INTERVAL * 1000;
++               break;
++           case ANNOUNCE:
++               // timeouts in the ANNOUNCE state means no conflicting ARP packets
++               // have been received, so we can progress through the states
+                if (nclaims < ANNOUNCE_NUM) {
++                   nclaims++;
++                   VDBG("announce/%d %s@%s\n",
++                           nclaims, intf, inet_ntoa(ip));
++                   (void)arp(fd, &saddr, ARPOP_REQUEST,
++                           &addr, ip,
++                           &addr, ip);
+                    timeout = ANNOUNCE_INTERVAL * 1000;
+-               } else {
++               }
++               else {
++                   // Switch to monitor state.
++                   state = MONITOR;
+                    // link is ok to use earlier
++                   // FIXME update filters
+                    run(script, "config", intf, &ip);
+                    ready = 1;
+                    conflicts = 0;
+-                   timeout = -1;
++                   timeout = -1; // Never timeout in the monitor state.
+ 
+                    // NOTE:  all other exit paths
+                    // should deconfig ...
+                    if (quit)
+                        return EXIT_SUCCESS;
+-                   // FIXME update filters
+                }
+-           }
+-           break;
+-
++               break;
++           case DEFEND:
++               // We won!  No ARP replies, so just go back to monitor.
++               state = MONITOR;
++               timeout = -1;
++               conflicts = 0;
++               break;
++           default:
++               // Invalid, should never happen.  Restart the whole protocol.
++               state = PROBE;
++               pick(&ip);
++               timeout = 0;
++               nprobes = 0;
++               nclaims = 0;
++               break;
++           } // switch (state)
++           break; // case 0 (timeout)
+        // packets arriving
+        case 1:
+-           // maybe adjust timeout
++           // We need to adjust the timeout in case we didn't receive
++           // a conflicting packet.
+            if (timeout > 0) {
+                struct timeval tv2;
+ 
+                gettimeofday(&tv2, NULL);
+                if (timercmp(&tv1, &tv2, <)) {
++                   // Current time is greater than the expected timeout time.
++                   // Should never happen.
++                   VDBG("missed an expected timeout\n");
+                    timeout = 0;
+                } else {
++                   VDBG("adjusting timeout\n");
+                    timersub(&tv1, &tv2, &tv1);
+                    timeout = 1000 * tv1.tv_sec
+                            + tv1.tv_usec / 1000;
+                }
+            }
++
+            if ((fds[0].revents & POLLIN) == 0) {
+                if (fds[0].revents & POLLERR) {
+                    // FIXME: links routinely go down;
+@@ -397,6 +455,7 @@
+                }
+                continue;
+            }
++
+            // read ARP packet
+            if (recv(fd, &p, sizeof (p), 0) < 0) {
+                why = "recv";
+@@ -405,71 +464,102 @@
+            if (p.hdr.ether_type != htons(ETHERTYPE_ARP))
+                continue;
+ 
+-           VDBG("%s recv arp type=%d, op=%d,\n",
++#ifdef DEBUG
++           {
++               struct ether_addr * sha = (struct ether_addr *) p.arp.arp_sha;
++               struct ether_addr * tha = (struct ether_addr *) p.arp.arp_tha;
++               struct in_addr * spa = (struct in_addr *) p.arp.arp_spa;
++               struct in_addr * tpa = (struct in_addr *) p.arp.arp_tpa;
++               VDBG("%s recv arp type=%d, op=%d,\n",
+                    intf, ntohs(p.hdr.ether_type),
+-                   ntohs(p.arp.ar_op));
+-           VDBG("\tsource=%s %s\n",
+-                   ether_ntoa(&p.source_addr),
+-                   inet_ntoa(p.source_ip));
+-           VDBG("\ttarget=%s %s\n",
+-                   ether_ntoa(&p.target_addr),
+-                   inet_ntoa(p.target_ip));
+-           if (p.arp.ar_op != htons(ARPOP_REQUEST)
+-                   && p.arp.ar_op != htons(ARPOP_REPLY))
++                   ntohs(p.arp.arp_op));
++               VDBG("\tsource=%s %s\n",
++                   ether_ntoa(sha),
++                   inet_ntoa(*spa));
++               VDBG("\ttarget=%s %s\n",
++                   ether_ntoa(tha),
++                   inet_ntoa(*tpa));
++           }
++#endif
++           if (p.arp.arp_op != htons(ARPOP_REQUEST)
++                   && p.arp.arp_op != htons(ARPOP_REPLY))
+                continue;
+ 
+-           // some cases are always conflicts
+-           if ((p.source_ip.s_addr == ip.s_addr)
+-                   && (memcmp(&addr, &p.source_addr,
+-                           ETH_ALEN) != 0)) {
+-collision:
+-               VDBG("%s ARP conflict from %s\n", intf,
+-                       ether_ntoa(&p.source_addr));
+-               if (ready) {
+-                   time_t now = time(0);
++           if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0 &&
++               memcmp(&addr, &p.arp.arp_sha, ETH_ALEN) != 0) {
++               source_ip_conflict = 1;
++           }
++           if (memcmp(p.arp.arp_tpa, &ip.s_addr, sizeof(struct in_addr)) == 0 &&
++               p.arp.arp_op == htons(ARPOP_REQUEST) &&
++               memcmp(&addr, &p.arp.arp_tha, ETH_ALEN) != 0) {
++               target_ip_conflict = 1;
++           }
+ 
+-                   if ((defend + DEFEND_INTERVAL)
+-                           < now) {
+-                       defend = now;
+-                       (void)arp(fd, &saddr,
+-                               ARPOP_REQUEST,
+-                               &addr, ip,
+-                               &addr, ip);
+-                       VDBG("%s defend\n", intf);
+-                       timeout = -1;
+-                       continue;
++           VDBG("state = %d, source ip conflict = %d, target ip conflict = %d\n", 
++               state, source_ip_conflict, target_ip_conflict);
++           switch (state) {
++           case PROBE:
++           case ANNOUNCE:
++               // When probing or announcing, check for source IP conflicts
++               // and other hosts doing ARP probes (target IP conflicts).
++               if (source_ip_conflict || target_ip_conflict) {
++                   conflicts++;
++                   if (conflicts >= MAX_CONFLICTS) {
++                       VDBG("%s ratelimit\n", intf);
++                       timeout = RATE_LIMIT_INTERVAL * 1000;
++                       state = RATE_LIMIT_PROBE;
+                    }
+-                   defend = now;
++
++                   // restart the whole protocol
++                   pick(&ip);
++                   timeout = 0;
++                   nprobes = 0;
++                   nclaims = 0;
++               }
++               break;
++           case MONITOR:
++               // If a conflict, we try to defend with a single ARP probe.
++               if (source_ip_conflict) {
++                   VDBG("monitor conflict -- defending\n");
++                   state = DEFEND;
++                   timeout = DEFEND_INTERVAL * 1000;
++                   (void)arp(fd, &saddr,
++                           ARPOP_REQUEST,
++                           &addr, ip,
++                           &addr, ip);
++               }
++               break;
++           case DEFEND:
++               // Well, we tried.  Start over (on conflict).
++               if (source_ip_conflict) {
++                   state = PROBE;
++                   VDBG("defend conflict -- starting over\n");
+                    ready = 0;
+                    run(script, "deconfig", intf, &ip);
+-                   // FIXME rm filters: setsockopt(fd,
+-                   // SO_DETACH_FILTER, ...)
++
++                   // restart the whole protocol
++                   pick(&ip);
++                   timeout = 0;
++                   nprobes = 0;
++                   nclaims = 0;
+                }
+-               conflicts++;
+-               if (conflicts >= MAX_CONFLICTS) {
+-                   VDBG("%s ratelimit\n", intf);
+-                   sleep(RATE_LIMIT_INTERVAL);
+-               }
+-               // restart the whole protocol
++               break;
++           default:
++               // Invalid, should never happen.  Restart the whole protocol.
++               VDBG("invalid state -- starting over\n");
++               state = PROBE;
+                pick(&ip);
+                timeout = 0;
+                nprobes = 0;
+                nclaims = 0;
+-           }
+-           // two hosts probing one address is a collision too
+-           else if (p.target_ip.s_addr == ip.s_addr
+-                   && nclaims == 0
+-                   && p.arp.ar_op == htons(ARPOP_REQUEST)
+-                   && memcmp(&addr, &p.target_addr,
+-                           ETH_ALEN) != 0) {
+-               goto collision;
+-           }
+-           break;
++               break;
++           } // switch state
+ 
++           break; // case 1 (packets arriving)
+        default:
+            why = "poll";
+            goto bad;
+-       }
++       } // switch poll
+    }
+ bad:
+    if (foreground)
+ ------------------------------------------------------------------------
+r16045 | vda | 2006-09-03 13:11:34 -0400 (Sun, 03 Sep 2006) | 3 lines
+Changed paths:
+   M /trunk/busybox/loginutils/sulogin.c
+
+sulogin: fix bug: -tNNN didn't work
+
+
+ ------------------------------------------------------------------------
+Index: loginutils/sulogin.c
+===================================================================
+--- loginutils/sulogin.c    (revision 16044)
++++ loginutils/sulogin.c    (revision 16045)
+@@ -52,7 +52,7 @@
+ int sulogin_main(int argc, char **argv)
+ {
+    char *cp;
+-   char *device = (char *) 0;
++   char *device = NULL;
+    const char *name = "root";
+    int timeout = 0;
+ 
+@@ -68,14 +68,15 @@
+    openlog("sulogin", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_AUTH);
+    if (argc > 1) {
+        if (strncmp(argv[1], "-t", 2) == 0) {
+-           if (strcmp(argv[1], "-t") == 0) {
++           if (argv[1][2] == '\0') { /* -t NN */
+                if (argc > 2) {
+                    timeout = atoi(argv[2]);
+                    if (argc > 3) {
+                        device = argv[3];
+                    }
+                }
+-           } else {
++           } else { /* -tNNN */
++               timeout = atoi(&argv[1][2]);
+                if (argc > 2) {
+                    device = argv[2];
+                }
+@@ -87,7 +88,7 @@
+            close(0);
+            close(1);
+            close(2);
+-           if (open(device, O_RDWR) >= 0) {
++           if (open(device, O_RDWR) == 0) {
+                dup(0);
+                dup(0);
+            } else {
+ ------------------------------------------------------------------------
+r16056 | aldot | 2006-09-06 09:24:39 -0400 (Wed, 06 Sep 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/libbb/Makefile.in
+
+- mdev and grep use xregcomp. Closes bug #1021
+
+ ------------------------------------------------------------------------
+Index: libbb/Makefile.in
+===================================================================
+--- libbb/Makefile.in   (revision 16055)
++++ libbb/Makefile.in   (revision 16056)
+@@ -56,11 +56,12 @@
+ # allowing us to build busybox even if uclibc regex support is disabled.
+ 
+ regex-y:=
+-
+ regex-$(CONFIG_AWK) += xregcomp.c
+ regex-$(CONFIG_SED) += xregcomp.c
+ regex-$(CONFIG_LESS) += xregcomp.c
+ regex-$(CONFIG_DEVFSD) += xregcomp.c
++regex-$(CONFIG_MDEV) += xregcomp.c
++regex-$(CONFIG_GREP) += xregcomp.c
+ 
+ # Sort has the happy side efect of returning a unique list
+ LIBBB-y += $(sort $(regex-y))
+ ------------------------------------------------------------------------
+r16057 | aldot | 2006-09-06 11:28:32 -0400 (Wed, 06 Sep 2006) | 16 lines
+Changed paths:
+   M /trunk/busybox/archival/libunarchive/decompress_uncompress.c
+
+- strip 399424 off the bss by making decompress_uncompress buffers config buffers.
+  Compile tested (too lazy to look for a small .Z on the net).
+$ size busybox.old busybox
+   text    data     bss     dec     hex filename
+ 859555   10232  645732 1515519  171fff busybox.old
+ 859683   10232  246308 1116223  11083f busybox
+$ make bloatcheck
+function                                             old     new   delta
+uncompress                                          1036    1160    +124
+inbuf                                               2116       4   -2112
+outbuf                                              4100       4   -4096
+htab                                              131072       - -131072
+codetab                                           262144       - -262144
+ ------------------------------------------------------------------------------
+(add/remove: 0/2 grow/shrink: 1/2 up/down: 124/-399424)   Total: -399300 bytes
+
+ ------------------------------------------------------------------------
+Index: archival/libunarchive/decompress_uncompress.c
+===================================================================
+--- archival/libunarchive/decompress_uncompress.c   (revision 16056)
++++ archival/libunarchive/decompress_uncompress.c   (revision 16057)
+@@ -70,22 +70,12 @@
+ /* user settable max # bits/code */
+ static int maxbits = BITS;
+ 
+-/* Input buffer */
+-static unsigned char inbuf[IBUFSIZ + 64];
+-
+-/* Output buffer */
+-static unsigned char outbuf[OBUFSIZ + 2048];
+-
+-
+-static unsigned char htab[HSIZE];
+-static unsigned short codetab[HSIZE];
+-
+ #define    htabof(i)               htab[i]
+ #define    codetabof(i)            codetab[i]
+ #define    tab_prefixof(i)         codetabof(i)
+ #define    tab_suffixof(i)         ((unsigned char *)(htab))[i]
+ #define    de_stack                ((unsigned char *)&(htab[HSIZE-1]))
+-#define    clear_htab()            memset(htab, -1, sizeof(htab))
++#define    clear_htab()            memset(htab, -1, HSIZE)
+ #define    clear_tab_prefixof()    memset(codetab, 0, 256);
+ 
+ 
+@@ -113,6 +103,12 @@
+    long int maxmaxcode;
+    int n_bits;
+    int rsize = 0;
++   RESERVE_CONFIG_UBUFFER(inbuf, IBUFSIZ + 64);
++   RESERVE_CONFIG_UBUFFER(outbuf, OBUFSIZ + 2048);
++   unsigned char htab[HSIZE];
++   unsigned short codetab[HSIZE];
++   memset(inbuf, 0, IBUFSIZ + 64);
++   memset(outbuf, 0, OBUFSIZ + 2048);
+ 
+    insize = 0;
+ 
+@@ -160,7 +156,7 @@
+            posbits = 0;
+        }
+ 
+-       if (insize < (int) sizeof(inbuf) - IBUFSIZ) {
++       if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) {
+            rsize = safe_read(fd_in, inbuf + insize, IBUFSIZ);
+            insize += rsize;
+        }
+@@ -286,5 +282,7 @@
+        write(fd_out, outbuf, outpos);
+    }
+ 
++   RELEASE_CONFIG_BUFFER(inbuf);
++   RELEASE_CONFIG_BUFFER(outbuf);
+    return 0;
+ }
+ ------------------------------------------------------------------------
+r16062 | vda | 2006-09-07 01:43:38 -0400 (Thu, 07 Sep 2006) | 4 lines
+Changed paths:
+   M /trunk/busybox/Config.in
+
+CONFIG_FEATURE_COMPRESS_USAGE was impossible to turn on
+if !CONFIG_NITPICK
+
+
+ ------------------------------------------------------------------------
+Index: Config.in
+===================================================================
+--- Config.in   (revision 16061)
++++ Config.in   (revision 16062)
+@@ -76,7 +76,7 @@
+ config CONFIG_FEATURE_COMPRESS_USAGE
+    bool "Store applet usage messages in compressed form"
+    default y
+-   depends on CONFIG_SHOW_USAGE && CONFIG_NITPICK
++   depends on CONFIG_SHOW_USAGE
+    help
+      Store usage messages in compressed form, uncompress them on-the-fly
+      when <applet> --help is called.
+ ------------------------------------------------------------------------
+r16067 | landley | 2006-09-07 20:01:02 -0400 (Thu, 07 Sep 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/editors/sed.c
+
+Bugfix for: echo '123456789' | sed 's/./|&/5'
+
+ ------------------------------------------------------------------------
+Index: editors/sed.c
+===================================================================
+--- editors/sed.c   (revision 16066)
++++ editors/sed.c   (revision 16067)
+@@ -627,7 +627,7 @@
+           end of match and continue */
+        if(sed_cmd->which_match && sed_cmd->which_match!=match_count) {
+            for(i=0;i<bbg.regmatch[0].rm_eo;i++)
+-               pipe_putc(oldline[i]);
++               pipe_putc(*(oldline++));
+            continue;
+        }
+ 
+ ------------------------------------------------------------------------
+r16109 | landley | 2006-09-12 16:29:22 -0400 (Tue, 12 Sep 2006) | 2 lines
+Changed paths:
+   M /trunk/busybox/include/platform.h
+
+Fix from Bernhard for somebody trying to limp along with gcc 2.95.4.
+
+ ------------------------------------------------------------------------
+Index: include/platform.h
+===================================================================
+--- include/platform.h  (revision 16108)
++++ include/platform.h  (revision 16109)
+@@ -83,6 +83,14 @@
+ # endif
+ #endif
+ 
++/* gcc-2.95 had no va_copy but only __va_copy. */
++#if !__GNUC_PREREQ (3,0)
++# include <stdarg.h>
++# if !defined va_copy && defined __va_copy
++#  define va_copy(d,s) __va_copy((d),(s))
++# endif
++#endif
++
+ /* ---- Endian Detection ------------------------------------ */
+ 
+ #if (defined __digital__ && defined __unix__)
+
+ ------------------------------------------------------------------------
+Patch from Roberto Foglietta to fix various things in dnsd (for example,
+don't segfault if dnsd.conf doesn't exist).
+
+--- networking/dnsd.c   2006-07-01 00:42:02.000000000 +0200
++++ networking/dnsd.c   2006-10-17 18:11:22.000000000 +0200
+@@ -29,6 +29,11 @@ static char *fileconf = "/etc/dnsd.conf"
+ #define LOCK_FILE       "/var/run/dnsd.lock"
+ #define LOG_FILE        "/var/log/dnsd.log"
+ 
++#define is_daemon()  (flags&16)
++#define is_verbose() (flags&32)
++//#define DEBUG 
++
++
+ enum {
+    MAX_HOST_LEN = 16,      // longest host name allowed is 15
+    IP_STRING_LEN = 18,     // .xxx.xxx.xxx.xxx\0
+@@ -223,29 +228,35 @@ static int listen_socket(char *iface_add
+ static int table_lookup(uint16_t type, uint8_t * as, uint8_t * qs)
+ {
+    int i;
+-   struct dns_entry *d=dnsentry;
++   struct dns_entry *d = dnsentry;
+ 
+-   do {
++   if(d) do {
+ #ifdef DEBUG
+-       char *p,*q;
+-       q = (char *)&(qs[1]);
+-       p = &(d->name[1]);
+-       fprintf(stderr, "\ntest: %d <%s> <%s> %d", strlen(p), p, q, strlen(q));
++       if(qs && d) {
++           char *p,*q;
++           q = (char *)&(qs[1]);
++           p = &(d->name[1]);
++           fprintf(stderr, "\n%s: %d/%d p:%s q:%s %d", 
++               __FUNCTION__, strlen(p), (int)(d->name[0]), 
++               p, q, strlen(q));
++       }
+ #endif
+-       if (type == REQ_A) { /* search by host name */
++       if (type == REQ_A) {            /* search by host name */
+            for(i = 1; i <= (int)(d->name[0]); i++)
+                if(tolower(qs[i]) != d->name[i])
+-                   continue;
++                   break;
++           if(i > (int)(d->name[0])) {
+ #ifdef DEBUG
+-           fprintf(stderr, " OK");
++               fprintf(stderr, " OK");
+ #endif
+-           strcpy((char *)as, d->ip);
++               strcpy((char *)as, d->ip);
+ #ifdef DEBUG
+-           fprintf(stderr, " %s ", as);
++               fprintf(stderr, " as:%s\n", as);
+ #endif
+-                   return 0;
+-               }
+-       else if (type == REQ_PTR) { /* search by IP-address */
++               return 0;
++           }
++       } else 
++       if (type == REQ_PTR) {          /* search by IP-address */
+            if (!strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) {
+                strcpy((char *)as, d->name);
+                return 0;
+@@ -281,7 +292,7 @@ static int process_packet(uint8_t * buf)
+        eret("ignoring response packet");
+ 
+    from = (void *)&head[1];    //  start of query string
+-   next = answb = from + strlen((char *)&head[1]) + 1 + sizeof(struct dns_prop);   // where to append answer block
++   next = answb = from + strlen((char *)from) + 1 + sizeof(struct dns_prop);   // where to append answer block
+ 
+    outr.rlen = 0;          // may change later
+    outr.r = NULL;
+@@ -305,9 +316,8 @@ static int process_packet(uint8_t * buf)
+        goto empty_packet;
+ 
+    // We have a standard query
+-
+-   log_message(LOG_FILE, (char *)head);
+-   lookup_result = table_lookup(type, answstr, (uint8_t*)(&head[1]));
++   log_message(LOG_FILE, (char *)from);
++   lookup_result = table_lookup(type, answstr, (uint8_t*)from);
+    if (lookup_result != 0) {
+        outr.flags = 3 | 0x0400;    //name do not exist and auth
+        goto empty_packet;
+@@ -341,8 +351,7 @@ static int process_packet(uint8_t * buf)
+    memcpy(next, (void *)answstr, outr.rlen);
+    next += outr.rlen;
+ 
+-      empty_packet:
+-
++empty_packet:
+    flags = ntohs(head->flags);
+    // clear rcode and RA, set responsebit and our new flags
+    flags |= (outr.flags & 0xff80) | 0x8000;
+@@ -364,9 +373,6 @@ static void interrupt(int x)
+    exit(2);
+ }
+ 
+-#define is_daemon()  (flags&16)
+-#define is_verbose() (flags&32)
+-//#define DEBUG 1
+ 
+ int dnsd_main(int argc, char **argv)
+ {
+@@ -437,8 +443,8 @@ int dnsd_main(int argc, char **argv)
+                     (struct sockaddr *)&from,
+                     (void *)&fromlen);
+            if(is_verbose())
+-               fprintf(stderr, "\n--- Got UDP  ");
+-           log_message(LOG_FILE, "\n--- Got UDP  ");
++               fprintf(stderr, "\n--- Got UDP size=%d ", r);
++           log_message(LOG_FILE, "\n--- Got UDP ");
+ 
+            if (r < 12 || r > 512) {
+                bb_error_msg("invalid packet size");

trunk/mindi-busybox/coreutils/md5_sha1_sum.c

@@ -99 +99 @@
     if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
         flags = bb_getopt_ulflags(argc, argv, "scw");
+    else optind = 1;
 
     if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && !(flags & FLAG_CHECK)) {

trunk/mindi-busybox/coreutils/test.c

@@ -152 +152 @@
 static char **t_wp;
 static struct t_op const *t_wp_op;
-static gid_t *group_array = NULL;
+static gid_t *group_array;
 static int ngroups;
 
@@ -548 +548 @@
 {
     ngroups = getgroups(0, NULL);
-    group_array = xrealloc(group_array, ngroups * sizeof(gid_t));
-    getgroups(ngroups, group_array);
+    if (ngroups > 0) {
+        group_array = xmalloc(ngroups * sizeof(gid_t));
+        getgroups(ngroups, group_array);
+    }
 }
 

trunk/mindi-busybox/distributions/rpm/mindi-busybox.spec

@@ -13 +13 @@
 REQ
 ExcludeArch:    ppc
-Conflicts:  busybox
 OBS
 

trunk/mindi-busybox/docs/autodocifier.pl

@@ -22 +22 @@
 sub beautify {
     my $text = shift;
-    $text =~ s/USAGE_NOT\w+\(.*?"\s*\)//sxg;
-    $text =~ s/USAGE_\w+\(\s*?(.*?)"\s*\)/$1"/sxg;
+    for (;;) {
+        my $text2 = $text;
+        $text =~ s/SKIP_\w+\(.*?"\s*\)//sxg;
+        $text =~ s/USE_\w+\(\s*?(.*?)"\s*\)/$1"/sxg;
+        last if ( $text2 eq $text );
+    }
     $text =~ s/"\s*"//sg;
     my @line = split("\n", $text);

trunk/mindi-busybox/editors/sed.c

@@ -59 +59 @@
 */
 
-#include <stdio.h>
-#include <unistd.h>     /* for getopt() */
-#include <errno.h>
-#include <ctype.h>      /* for isspace() */
-#include <stdlib.h>
-#include <string.h>
 #include "busybox.h"
 #include "xregex.h"
@@ -95 +89 @@
 } sed_cmd_t;
 
-static const char bad_format_in_subst[] =
-    "bad format in substitution expression";
 static const char *const semicolon_whitespace = "; \n\r\t\v";
 
@@ -176 +168 @@
 /* strdup, replacing "\n" with '\n', and "\delimiter" with 'delimiter' */
 
-static void parse_escapes(char *dest, const char *string, int len, char from, char to)
+static void parse_escapes(char *dest, char *string, int len, char from, char to)
 {
     int i=0;
@@ -193 +185 @@
 }
 
-static char *copy_parsing_escapes(const char *string, int len)
+static char *copy_parsing_escapes(char *string, int len)
 {
     char *dest=xmalloc(len+1);
@@ -206 +198 @@
  * beginning at a specified index and returns the index of the next regular
  * expression delimiter (typically a forward * slash ('/')) not preceded by
- * a backslash ('\').
+ * a backslash ('\').  A negative delimiter disables square bracket checking.
  */
-static int index_of_next_unescaped_regexp_delim(const char delimiter,
-    const char *str)
+static int index_of_next_unescaped_regexp_delim(int delimiter, char *str)
 {
     int bracket = -1;
@@ -216 +207 @@
     char ch;
 
+    if (delimiter < 0) {
+        bracket--;
+        delimiter *= -1;
+    }
+
     for (; (ch = str[idx]); idx++) {
-        if (bracket != -1) {
+        if (bracket >= 0) {
             if (ch == ']' && !(bracket == idx - 1 || (bracket == idx - 2
                     && str[idx - 1] == '^')))
@@ -225 +221 @@
         else if (ch == '\\')
             escaped = 1;
-        else if (ch == '[')
+        else if (bracket == -1 && ch == '[')
             bracket = idx;
         else if (ch == delimiter)
@@ -232 +228 @@
 
     /* if we make it to here, we've hit the end of the string */
-    return -1;
+    bb_error_msg_and_die("unmatched '%c'",delimiter);
 }
 
@@ -238 +234 @@
  *  Returns the index of the third delimiter
  */
-static int parse_regex_delim(const char *cmdstr, char **match, char **replace)
-{
-    const char *cmdstr_ptr = cmdstr;
+static int parse_regex_delim(char *cmdstr, char **match, char **replace)
+{
+    char *cmdstr_ptr = cmdstr;
     char delimiter;
     int idx = 0;
@@ -246 +242 @@
     /* verify that the 's' or 'y' is followed by something.  That something
      * (typically a 'slash') is now our regexp delimiter... */
-    if (*cmdstr == '\0') bb_error_msg_and_die(bad_format_in_subst);
+    if (*cmdstr == '\0')
+        bb_error_msg_and_die("bad format in substitution expression");
     delimiter = *(cmdstr_ptr++);
 
     /* save the match string */
     idx = index_of_next_unescaped_regexp_delim(delimiter, cmdstr_ptr);
-    if (idx == -1) {
-        bb_error_msg_and_die(bad_format_in_subst);
-    }
     *match = copy_parsing_escapes(cmdstr_ptr, idx);
 
     /* save the replacement string */
     cmdstr_ptr += idx + 1;
-    idx = index_of_next_unescaped_regexp_delim(delimiter, cmdstr_ptr);
-    if (idx == -1) {
-        bb_error_msg_and_die(bad_format_in_subst);
-    }
+    idx = index_of_next_unescaped_regexp_delim(-delimiter, cmdstr_ptr);
     *replace = copy_parsing_escapes(cmdstr_ptr, idx);
 
@@ -288 +279 @@
         else delimiter = '/';
         next = index_of_next_unescaped_regexp_delim(delimiter, ++pos);
-        if (next == -1)
-            bb_error_msg_and_die("unterminated match expression");
-
-        temp=copy_parsing_escapes(pos,next);
+        temp = copy_parsing_escapes(pos,next);
         *regex = (regex_t *) xmalloc(sizeof(regex_t));
         xregcomp(*regex, temp, bbg.regex_type|REG_NEWLINE);
         free(temp);
         /* Move position to next character after last delimiter */
-        pos+=(next+1);
+        pos += (next+1);
     }
     return pos - my_str;
@@ -302 +290 @@
 
 /* Grab a filename.  Whitespace at start is skipped, then goes to EOL. */
-static int parse_file_cmd(sed_cmd_t *sed_cmd, const char *filecmdstr, char **retval)
+static int parse_file_cmd(sed_cmd_t *sed_cmd, char *filecmdstr, char **retval)
 {
     int start = 0, idx, hack=0;
@@ -319 +307 @@
 }
 
-static int parse_subst_cmd(sed_cmd_t *const sed_cmd, char *substr)
+static int parse_subst_cmd(sed_cmd_t *sed_cmd, char *substr)
 {
     int cflags = bbg.regex_type;
@@ -570 +558 @@
 }
 
-static void do_subst_w_backrefs(const char *line, const char *replace)
+static void do_subst_w_backrefs(char *line, char *replace)
 {
     int i,j;
@@ -640 +628 @@
         if(sed_cmd->which_match && sed_cmd->which_match!=match_count) {
             for(i=0;i<bbg.regmatch[0].rm_eo;i++)
-                pipe_putc(oldline[i]);
+                pipe_putc(*(oldline++));
             continue;
         }
@@ -670 +658 @@
 
 /* Set command pointer to point to this label.  (Does not handle null label.) */
-static sed_cmd_t *branch_to(const char *label)
+static sed_cmd_t *branch_to(char *label)
 {
     sed_cmd_t *sed_cmd;

trunk/mindi-busybox/include/platform.h

@@ -73 +73 @@
 # ifndef __extension__
 #  define __extension__
+# endif
+#endif
+
+/* gcc-2.95 had no va_copy but only __va_copy. */
+#if !__GNUC_PREREQ (3,0)
+# include <stdarg.h>
+# if !defined va_copy && defined __va_copy
+#  define va_copy(d,s) __va_copy((d),(s))
 # endif
 #endif

trunk/mindi-busybox/libbb/Makefile.in

@@ -30 +30 @@
     trim.c u_signal_names.c vdprintf.c verror_msg.c \
     vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xstat.c \
-    xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c xgetlarg.c \
+    xgethostbyname.c xgethostbyname2.c xreadlink.c xgetlarg.c \
     bb_xsocket.c bb_xdaemon.c bb_xbind.c bb_xlisten.c bb_xchdir.c \
     get_terminal_width_height.c fclose_nonstdin.c fflush_stdout_and_exit.c \
@@ -51 +51 @@
 LIBBB-$(CONFIG_DF)+= find_mount_point.c
 LIBBB-$(CONFIG_EJECT)+= find_mount_point.c
+
+# We shouldn't build xregcomp.c if we don't need it - this ensures we don't
+# require regex.h to be in the include dir even if we don't need it thereby
+# allowing us to build busybox even if uclibc regex support is disabled.
+
+regex-y:=
+regex-$(CONFIG_AWK) += xregcomp.c
+regex-$(CONFIG_SED) += xregcomp.c
+regex-$(CONFIG_LESS) += xregcomp.c
+regex-$(CONFIG_DEVFSD) += xregcomp.c
+regex-$(CONFIG_MDEV) += xregcomp.c
+regex-$(CONFIG_GREP) += xregcomp.c
+
+# Sort has the happy side efect of returning a unique list
+LIBBB-y += $(sort $(regex-y))
 
 LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y))

trunk/mindi-busybox/loginutils/Config.in

@@ -15 +15 @@
 
 config CONFIG_USE_BB_SHADOW
-    bool #"  Use busybox shadow password functions"
+    bool "  Use busybox shadow password functions"
     default y
     depends on CONFIG_USE_BB_PWD_GRP && CONFIG_FEATURE_SHADOWPASSWDS

trunk/mindi-busybox/loginutils/getty.c

@@ -486 +486 @@
     }
 
-    tp->c_iflag = tp->c_lflag = tp->c_oflag = tp->c_line = 0;
+    tp->c_iflag = tp->c_lflag = tp->c_line = 0;
+    tp->c_oflag = OPOST | ONLCR;
     tp->c_cc[VMIN] = 1;
     tp->c_cc[VTIME] = 0;

trunk/mindi-busybox/loginutils/sulogin.c

@@ -49 +49 @@
 {
     char *cp;
-    char *device = (char *) 0;
+    char *device = NULL;
     const char *name = "root";
     int timeout = 0;
@@ -65 +65 @@
     if (argc > 1) {
         if (strncmp(argv[1], "-t", 2) == 0) {
-            if (strcmp(argv[1], "-t") == 0) {
+            if (argv[1][2] == '\0') { /* -t NN */
                 if (argc > 2) {
                     timeout = atoi(argv[2]);
@@ -72 +72 @@
                     }
                 }
-            } else {
+            } else { /* -tNNN */
+                timeout = atoi(&argv[1][2]);
                 if (argc > 2) {
                     device = argv[2];
@@ -84 +85 @@
             close(1);
             close(2);
-            if (open(device, O_RDWR) >= 0) {
+            if (open(device, O_RDWR) == 0) {
                 dup(0);
                 dup(0);

trunk/mindi-busybox/miscutils/Makefile.in

@@ -21 +21 @@
 MISCUTILS-$(CONFIG_HDPARM)      += hdparm.o
 MISCUTILS-$(CONFIG_LAST)        += last.o
-MISCUTILS-${CONFIG_LESS}        += less.o
+MISCUTILS-$(CONFIG_LESS)        += less.o
 MISCUTILS-$(CONFIG_MAKEDEVS)    += makedevs.o
 MISCUTILS-$(CONFIG_MOUNTPOINT)  += mountpoint.o

trunk/mindi-busybox/miscutils/hdparm.c

@@ -1496 +1496 @@
     unsigned int t;
 
-
+    printf(" (");
     if (standby == 0)
         printf("off");
@@ -2097 +2097 @@
     USE_FEATURE_HDPARM_HDIO_GETSET_DMA("d::")
 #ifdef HDIO_DRIVE_CMD
-                                    "S::D::P::X::K::A::L::W::CyYzZ"
+                                    "S:D:P:X:K:A:L:W:CyYzZ"
 #endif
     USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF("U:")

trunk/mindi-busybox/modutils/lsmod.c

@@ -94 +94 @@
 
     module_names = xmalloc(bufsize = 256);
-    if (my_query_module(NULL, QM_MODULES, (void **)&module_names, &bufsize,
-                &nmod)) {
+    if (my_query_module(NULL, QM_MODULES, &module_names, &bufsize, &nmod)) {
         bb_perror_msg_and_die("QM_MODULES");
     }
@@ -112 +111 @@
             bb_perror_msg_and_die("module %s: QM_INFO", mn);
         }
-        if (my_query_module(mn, QM_REFS, (void **)&deps, &depsize, &count)) {
+        if (my_query_module(mn, QM_REFS, &deps, &depsize, &count)) {
             if (errno == ENOENT) {
                 /* The module was removed out from underneath us. */

trunk/mindi-busybox/modutils/modprobe.c

@@ -689 +689 @@
             if (!show_only) {
                 int rc2 = wait4pid(bb_spawn(argv));
-                
+
                 if (do_insert) {
                     rc = rc2; /* only last module matters */
@@ -838 +838 @@
 
         // process tail ---> head
-        rc = mod_process ( tail, 1 );
+        if ((rc = mod_process ( tail, 1 )) != 0) {
+            /*
+             * In case of using udev, multiple instances of modprobe can be
+             * spawned to load the same module (think of two same usb devices,
+             * for example; or cold-plugging at boot time). Thus we shouldn't
+             * fail if the module was loaded, and not by us.
+             */
+            if (already_loaded (mod) )
+                rc = 0;
+        }
     }
     else

trunk/mindi-busybox/networking/dnsd.c

@@ -29 +29 @@
 #define LOCK_FILE       "/var/run/dnsd.lock"
 #define LOG_FILE        "/var/log/dnsd.log"
+
+#define is_daemon()  (flags&16)
+#define is_verbose() (flags&32)
+//#define DEBUG 
+
 
 enum {
@@ -224 +229 @@
 {
     int i;
-    struct dns_entry *d=dnsentry;
-
-    do {
+    struct dns_entry *d = dnsentry;
+
+    if(d) do {
 #ifdef DEBUG
-        char *p,*q;
-        q = (char *)&(qs[1]);
-        p = &(d->name[1]);
-        fprintf(stderr, "\ntest: %d <%s> <%s> %d", strlen(p), p, q, strlen(q));
-#endif
-        if (type == REQ_A) { /* search by host name */
+        if(qs && d) {
+            char *p,*q;
+            q = (char *)&(qs[1]);
+            p = &(d->name[1]);
+            fprintf(stderr, "\n%s: %d/%d p:%s q:%s %d", 
+                __FUNCTION__, strlen(p), (int)(d->name[0]), 
+                p, q, strlen(q));
+        }
+#endif
+        if (type == REQ_A) {            /* search by host name */
             for(i = 1; i <= (int)(d->name[0]); i++)
                 if(tolower(qs[i]) != d->name[i])
-                    continue;
+                    break;
+            if(i > (int)(d->name[0])) {
 #ifdef DEBUG
-            fprintf(stderr, " OK");
-#endif
-            strcpy((char *)as, d->ip);
+                fprintf(stderr, " OK");
+#endif
+                strcpy((char *)as, d->ip);
 #ifdef DEBUG
-            fprintf(stderr, " %s ", as);
-#endif
-                    return 0;
-                }
-        else if (type == REQ_PTR) { /* search by IP-address */
+                fprintf(stderr, " as:%s\n", as);
+#endif
+                return 0;
+            }
+        } else 
+        if (type == REQ_PTR) {          /* search by IP-address */
             if (!strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) {
                 strcpy((char *)as, d->name);
@@ -282 +293 @@
 
     from = (void *)&head[1];    //  start of query string
-    next = answb = from + strlen((char *)&head[1]) + 1 + sizeof(struct dns_prop);   // where to append answer block
+    next = answb = from + strlen((char *)from) + 1 + sizeof(struct dns_prop);   // where to append answer block
 
     outr.rlen = 0;          // may change later
@@ -306 +317 @@
 
     // We have a standard query
-
-    log_message(LOG_FILE, (char *)head);
-    lookup_result = table_lookup(type, answstr, (uint8_t*)(&head[1]));
+    log_message(LOG_FILE, (char *)from);
+    lookup_result = table_lookup(type, answstr, (uint8_t*)from);
     if (lookup_result != 0) {
         outr.flags = 3 | 0x0400;    //name do not exist and auth
@@ -342 +352 @@
     next += outr.rlen;
 
-      empty_packet:
-
+empty_packet:
     flags = ntohs(head->flags);
     // clear rcode and RA, set responsebit and our new flags
@@ -365 +374 @@
 }
 
-#define is_daemon()  (flags&16)
-#define is_verbose() (flags&32)
-//#define DEBUG 1
 
 int dnsd_main(int argc, char **argv)
@@ -438 +444 @@
                      (void *)&fromlen);
             if(is_verbose())
-                fprintf(stderr, "\n--- Got UDP  ");
-            log_message(LOG_FILE, "\n--- Got UDP  ");
+                fprintf(stderr, "\n--- Got UDP size=%d ", r);
+            log_message(LOG_FILE, "\n--- Got UDP ");
 
             if (r < 12 || r > 512) {

trunk/mindi-busybox/networking/httpd.c

@@ -864 +864 @@
   struct sockaddr_in lsocket;
   int fd;
+  int on = 1;
 
   /* create the socket right now */
@@ -874 +875 @@
   /* tell the OS it's OK to reuse a previous address even though */
   /* it may still be in a close down state.  Allows bind to succeed. */
-  int on = 1;
 #ifdef SO_REUSEPORT
   setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (void *)&on, sizeof(on)) ;

trunk/mindi-busybox/networking/ping6.c

@@ -211 +211 @@
     pkt->icmp6_code = 0;
     pkt->icmp6_cksum = 0;
-    pkt->icmp6_seq = ntransmitted++;
+    pkt->icmp6_seq = SWAP_BE16(ntransmitted++);
     pkt->icmp6_id = myid;
     CLR(pkt->icmp6_seq % MAX_DUP_CHK);

trunk/mindi-busybox/networking/traceroute.c

@@ -1004 +1004 @@
         port = (u_short)str2val(port_str, "port", 1, (1 << 16) - 1);
     if(nprobes_str)
-        nprobes = str2val(optarg, "nprobes", 1, -1);
+        nprobes = str2val(nprobes_str, "nprobes", 1, -1);
     if(source) {
         /*

trunk/mindi-busybox/networking/zcip.c

@@ -15 +15 @@
  */
 
-// #define      DEBUG
+//#define DEBUG
 
 // TODO:
@@ -43 +43 @@
 struct arp_packet {
     struct ether_header hdr;
-    // FIXME this part is netinet/if_ether.h "struct ether_arp"
-    struct arphdr arp;
-    struct ether_addr source_addr;
-    struct in_addr source_ip;
-    struct ether_addr target_addr;
-    struct in_addr target_ip;
+    struct ether_arp arp;
 } ATTRIBUTE_PACKED;
 
@@ -68 +63 @@
 };
 
-static const struct in_addr null_ip = { 0 };
-static const struct ether_addr null_addr = { {0, 0, 0, 0, 0, 0} };
-
-static int verbose = 0;
+/* States during the configuration process. */
+enum {
+    PROBE = 0,
+    RATE_LIMIT_PROBE,
+    ANNOUNCE,
+    MONITOR,
+    DEFEND
+};
+
+/* Implicitly zero-initialized */
+static const struct in_addr null_ip;
+static const struct ether_addr null_addr;
+static int verbose;
 
 #define DBG(fmt,args...) \
@@ -100 +104 @@
 {
     struct arp_packet p;
+    memset(&p, 0, sizeof(p));
 
     // ether header
@@ -107 +112 @@
 
     // arp request
-    p.arp.ar_hrd = htons(ARPHRD_ETHER);
-    p.arp.ar_pro = htons(ETHERTYPE_IP);
-    p.arp.ar_hln = ETH_ALEN;
-    p.arp.ar_pln = 4;
-    p.arp.ar_op = htons(op);
-    memcpy(&p.source_addr, source_addr, ETH_ALEN);
-    memcpy(&p.source_ip, &source_ip, sizeof (p.source_ip));
-    memcpy(&p.target_addr, target_addr, ETH_ALEN);
-    memcpy(&p.target_ip, &target_ip, sizeof (p.target_ip));
+    p.arp.arp_hrd = htons(ARPHRD_ETHER);
+    p.arp.arp_pro = htons(ETHERTYPE_IP);
+    p.arp.arp_hln = ETH_ALEN;
+    p.arp.arp_pln = 4;
+    p.arp.arp_op = htons(op);
+    memcpy(&p.arp.arp_sha, source_addr, ETH_ALEN);
+    memcpy(&p.arp.arp_spa, &source_ip, sizeof (p.arp.arp_spa));
+    memcpy(&p.arp.arp_tha, target_addr, ETH_ALEN);
+    memcpy(&p.arp.arp_tpa, &target_ip, sizeof (p.arp.arp_tpa));
 
     // send it
@@ -196 +201 @@
     int ready = 0;
     suseconds_t timeout = 0;    // milliseconds
-    time_t defend = 0;
     unsigned conflicts = 0;
     unsigned nprobes = 0;
     unsigned nclaims = 0;
     int t;
+    int state = PROBE;
 
     // parse commandline: prog [options] ifname script
@@ -307 +312 @@
         fds[0].revents = 0;
 
+        int source_ip_conflict = 0;
+        int target_ip_conflict = 0;
+
         // poll, being ready to adjust current timeout
         if (!timeout) {
@@ -314 +322 @@
             // ones we'd care about.
         }
+        // set tv1 to the point in time when we timeout
         gettimeofday(&tv1, NULL);
         tv1.tv_usec += (timeout % 1000) * 1000;
@@ -326 +335 @@
         switch (poll(fds, 1, timeout)) {
 
-        // timeouts trigger protocol transitions
+        // timeout
         case 0:
-            // probes
-            if (nprobes < PROBE_NUM) {
-                nprobes++;
-                VDBG("probe/%d %s@%s\n",
-                        nprobes, intf, inet_ntoa(ip));
-                (void)arp(fd, &saddr, ARPOP_REQUEST,
-                        &addr, null_ip,
-                        &null_addr, ip);
+            VDBG("state = %d\n", state);
+            switch (state) {
+            case PROBE:
+                // timeouts in the PROBE state means no conflicting ARP packets
+                // have been received, so we can progress through the states
                 if (nprobes < PROBE_NUM) {
+                    nprobes++;
+                    VDBG("probe/%d %s@%s\n",
+                            nprobes, intf, inet_ntoa(ip));
+                    (void)arp(fd, &saddr, ARPOP_REQUEST,
+                            &addr, null_ip,
+                            &null_addr, ip);
                     timeout = PROBE_MIN * 1000;
                     timeout += ms_rdelay(PROBE_MAX
                             - PROBE_MIN);
-                } else
-                    timeout = ANNOUNCE_WAIT * 1000;
-            }
-            // then announcements
-            else if (nclaims < ANNOUNCE_NUM) {
-                nclaims++;
+                }
+                else {
+                    // Switch to announce state.
+                    state = ANNOUNCE;
+                    nclaims = 0;
+                    VDBG("announce/%d %s@%s\n",
+                            nclaims, intf, inet_ntoa(ip));
+                    (void)arp(fd, &saddr, ARPOP_REQUEST,
+                            &addr, ip,
+                            &addr, ip);
+                    timeout = ANNOUNCE_INTERVAL * 1000;
+                }
+                break;
+            case RATE_LIMIT_PROBE:
+                // timeouts in the RATE_LIMIT_PROBE state means no conflicting ARP packets
+                // have been received, so we can move immediately to the announce state
+                state = ANNOUNCE;
+                nclaims = 0;
                 VDBG("announce/%d %s@%s\n",
                         nclaims, intf, inet_ntoa(ip));
@@ -351 +375 @@
                         &addr, ip,
                         &addr, ip);
+                timeout = ANNOUNCE_INTERVAL * 1000;
+                break;
+            case ANNOUNCE:
+                // timeouts in the ANNOUNCE state means no conflicting ARP packets
+                // have been received, so we can progress through the states
                 if (nclaims < ANNOUNCE_NUM) {
+                    nclaims++;
+                    VDBG("announce/%d %s@%s\n",
+                            nclaims, intf, inet_ntoa(ip));
+                    (void)arp(fd, &saddr, ARPOP_REQUEST,
+                            &addr, ip,
+                            &addr, ip);
                     timeout = ANNOUNCE_INTERVAL * 1000;
-                } else {
+                }
+                else {
+                    // Switch to monitor state.
+                    state = MONITOR;
                     // link is ok to use earlier
+                    // FIXME update filters
                     run(script, "config", intf, &ip);
                     ready = 1;
                     conflicts = 0;
-                    timeout = -1;
+                    timeout = -1; // Never timeout in the monitor state.
 
                     // NOTE:  all other exit paths
@@ -364 +403 @@
                     if (quit)
                         return EXIT_SUCCESS;
-                    // FIXME update filters
-                }
-            }
-            break;
-
+                }
+                break;
+            case DEFEND:
+                // We won!  No ARP replies, so just go back to monitor.
+                state = MONITOR;
+                timeout = -1;
+                conflicts = 0;
+                break;
+            default:
+                // Invalid, should never happen.  Restart the whole protocol.
+                state = PROBE;
+                pick(&ip);
+                timeout = 0;
+                nprobes = 0;
+                nclaims = 0;
+                break;
+            } // switch (state)
+            break; // case 0 (timeout)
         // packets arriving
         case 1:
-            // maybe adjust timeout
+            // We need to adjust the timeout in case we didn't receive
+            // a conflicting packet.
             if (timeout > 0) {
                 struct timeval tv2;
@@ -377 +430 @@
                 gettimeofday(&tv2, NULL);
                 if (timercmp(&tv1, &tv2, <)) {
+                    // Current time is greater than the expected timeout time.
+                    // Should never happen.
+                    VDBG("missed an expected timeout\n");
                     timeout = 0;
                 } else {
+                    VDBG("adjusting timeout\n");
                     timersub(&tv1, &tv2, &tv1);
                     timeout = 1000 * tv1.tv_sec
@@ -384 +441 @@
                 }
             }
+
             if ((fds[0].revents & POLLIN) == 0) {
                 if (fds[0].revents & POLLERR) {
@@ -397 +455 @@
                 continue;
             }
+
             // read ARP packet
             if (recv(fd, &p, sizeof (p), 0) < 0) {
@@ -405 +464 @@
                 continue;
 
-            VDBG("%s recv arp type=%d, op=%d,\n",
+#ifdef DEBUG
+            {
+                struct ether_addr * sha = (struct ether_addr *) p.arp.arp_sha;
+                struct ether_addr * tha = (struct ether_addr *) p.arp.arp_tha;
+                struct in_addr * spa = (struct in_addr *) p.arp.arp_spa;
+                struct in_addr * tpa = (struct in_addr *) p.arp.arp_tpa;
+                VDBG("%s recv arp type=%d, op=%d,\n",
                     intf, ntohs(p.hdr.ether_type),
-                    ntohs(p.arp.ar_op));
-            VDBG("\tsource=%s %s\n",
-                    ether_ntoa(&p.source_addr),
-                    inet_ntoa(p.source_ip));
-            VDBG("\ttarget=%s %s\n",
-                    ether_ntoa(&p.target_addr),
-                    inet_ntoa(p.target_ip));
-            if (p.arp.ar_op != htons(ARPOP_REQUEST)
-                    && p.arp.ar_op != htons(ARPOP_REPLY))
+                    ntohs(p.arp.arp_op));
+                VDBG("\tsource=%s %s\n",
+                    ether_ntoa(sha),
+                    inet_ntoa(*spa));
+                VDBG("\ttarget=%s %s\n",
+                    ether_ntoa(tha),
+                    inet_ntoa(*tpa));
+            }
+#endif
+            if (p.arp.arp_op != htons(ARPOP_REQUEST)
+                    && p.arp.arp_op != htons(ARPOP_REPLY))
                 continue;
 
-            // some cases are always conflicts
-            if ((p.source_ip.s_addr == ip.s_addr)
-                    && (memcmp(&addr, &p.source_addr,
-                            ETH_ALEN) != 0)) {
-collision:
-                VDBG("%s ARP conflict from %s\n", intf,
-                        ether_ntoa(&p.source_addr));
-                if (ready) {
-                    time_t now = time(0);
-
-                    if ((defend + DEFEND_INTERVAL)
-                            < now) {
-                        defend = now;
-                        (void)arp(fd, &saddr,
-                                ARPOP_REQUEST,
-                                &addr, ip,
-                                &addr, ip);
-                        VDBG("%s defend\n", intf);
-                        timeout = -1;
-                        continue;
+            if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0 &&
+                memcmp(&addr, &p.arp.arp_sha, ETH_ALEN) != 0) {
+                source_ip_conflict = 1;
+            }
+            if (memcmp(p.arp.arp_tpa, &ip.s_addr, sizeof(struct in_addr)) == 0 &&
+                p.arp.arp_op == htons(ARPOP_REQUEST) &&
+                memcmp(&addr, &p.arp.arp_tha, ETH_ALEN) != 0) {
+                target_ip_conflict = 1;
+            }
+
+            VDBG("state = %d, source ip conflict = %d, target ip conflict = %d\n", 
+                state, source_ip_conflict, target_ip_conflict);
+            switch (state) {
+            case PROBE:
+            case ANNOUNCE:
+                // When probing or announcing, check for source IP conflicts
+                // and other hosts doing ARP probes (target IP conflicts).
+                if (source_ip_conflict || target_ip_conflict) {
+                    conflicts++;
+                    if (conflicts >= MAX_CONFLICTS) {
+                        VDBG("%s ratelimit\n", intf);
+                        timeout = RATE_LIMIT_INTERVAL * 1000;
+                        state = RATE_LIMIT_PROBE;
                     }
-                    defend = now;
+
+                    // restart the whole protocol
+                    pick(&ip);
+                    timeout = 0;
+                    nprobes = 0;
+                    nclaims = 0;
+                }
+                break;
+            case MONITOR:
+                // If a conflict, we try to defend with a single ARP probe.
+                if (source_ip_conflict) {
+                    VDBG("monitor conflict -- defending\n");
+                    state = DEFEND;
+                    timeout = DEFEND_INTERVAL * 1000;
+                    (void)arp(fd, &saddr,
+                            ARPOP_REQUEST,
+                            &addr, ip,
+                            &addr, ip);
+                }
+                break;
+            case DEFEND:
+                // Well, we tried.  Start over (on conflict).
+                if (source_ip_conflict) {
+                    state = PROBE;
+                    VDBG("defend conflict -- starting over\n");
                     ready = 0;
                     run(script, "deconfig", intf, &ip);
-                    // FIXME rm filters: setsockopt(fd,
-                    // SO_DETACH_FILTER, ...)
-                }
-                conflicts++;
-                if (conflicts >= MAX_CONFLICTS) {
-                    VDBG("%s ratelimit\n", intf);
-                    sleep(RATE_LIMIT_INTERVAL);
-                }
-                // restart the whole protocol
+
+                    // restart the whole protocol
+                    pick(&ip);
+                    timeout = 0;
+                    nprobes = 0;
+                    nclaims = 0;
+                }
+                break;
+            default:
+                // Invalid, should never happen.  Restart the whole protocol.
+                VDBG("invalid state -- starting over\n");
+                state = PROBE;
                 pick(&ip);
                 timeout = 0;
                 nprobes = 0;
                 nclaims = 0;
-            }
-            // two hosts probing one address is a collision too
-            else if (p.target_ip.s_addr == ip.s_addr
-                    && nclaims == 0
-                    && p.arp.ar_op == htons(ARPOP_REQUEST)
-                    && memcmp(&addr, &p.target_addr,
-                            ETH_ALEN) != 0) {
-                goto collision;
-            }
-            break;
-
+                break;
+            } // switch state
+
+            break; // case 1 (packets arriving)
         default:
             why = "poll";
             goto bad;
-        }
+        } // switch poll
     }
 bad:

trunk/mindi-busybox/shell/msh.c

@@ -3215 +3215 @@
     REGISTER char *sp, *tp;
     int eacces = 0, asis = 0;
-
-#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
     char *name = c;
 
-    optind = 1;
-    if (find_applet_by_name(name)) {
-        /* We have to exec here since we vforked.  Running
-         * run_applet_by_name() won't work and bad things
-         * will happen. */
-        execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
-    }
-#endif
+    if (ENABLE_FEATURE_SH_STANDALONE_SHELL) {
+        optind = 1;
+        if (find_applet_by_name(name)) {
+            /* We have to exec here since we vforked.  Running
+             * run_applet_by_name() won't work and bad things
+             * will happen. */
+            execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
+        }
+    }
 
     DBGPRINTF(("REXECVE: c=%p, v=%p, envp=%p\n", c, v, envp));

trunk/mindi-busybox/testsuite/README

@@ +1 @@
+Update: doesn't work as described. Try "make check" from parent dir...
+* * *
+
 To run the test suite, change to this directory and run "./runtest".  It will
 run all of the test cases, and list those with unexpected outcomes.  Adding the

trunk/mindi-busybox/testsuite/sed.tests

@@ -175 +175 @@
 rm ./-     # Clean up
 
+testing "sed s/xxx/[/" "sed -e 's/xxx/[/'" "[\n" "" "xxx\n"
+
 # Ponder this a bit more, why "woo not found" from gnu version?
 #testing "sed doesn't substitute in deleted line" \

trunk/mindi-busybox/util-linux/mdev.c

@@ -41 +41 @@
      * also depend on path having writeable space after it. */
 
-    strcat(path, "/dev");
-    fd = open(path, O_RDONLY);
-    len = read(fd, temp + 1, 64);
-    *temp++ = 0;
-    close(fd);
-    if (len < 1) return;
+    if (!delete) {
+        strcat(path, "/dev");
+        fd = open(path, O_RDONLY);
+        len = read(fd, temp + 1, 64);
+        *temp++ = 0;
+        close(fd);
+        if (len < 1) return;
+    }
 
     /* Determine device name, type, major and minor */
@@ -52 +54 @@
     device_name = strrchr(path, '/') + 1;
     type = path[5]=='c' ? S_IFCHR : S_IFBLK;
-    if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
 
     /* If we have a config file, look up permissions for this device */
@@ -168 +169 @@
     umask(0);
     if (!delete) {
+        if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
         if (mknod(device_name, mode | type, makedev(major, minor)) && errno != EEXIST)
             bb_perror_msg_and_die("mknod %s failed", device_name);

trunk/mindi-busybox/util-linux/mount.c

@@ -292 +292 @@
     // a synthetic filesystem like proc or sysfs.)
 
-    if (lstat(mp->mnt_fsname, &st));
+    if (stat(mp->mnt_fsname, &st));
     else if (!(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
         // Do we need to allocate a loopback device for it?

trunk/mindi-busybox/util-linux/readprofile.c

@@ -68 +68 @@
     const char *mapFile, *proFile, *mult=0;
     unsigned long len=0, indx=1;
-    unsigned long long add0=0;
+    uint64_t add0=0;
     unsigned int step;
     unsigned int *buf, total, fn_len;
@@ -244 +244 @@
                     header_printed = 1;
                 }
-                printf ("\t%llx\t%u\n", (indx - 1)*step + add0, buf[indx]);
+                printf ("\t%"PRIx64"\t%u\n", (indx - 1)*step + add0, buf[indx]);
             }
             this += buf[indx++];

trunk/mindi-busybox/util-linux/umount.c

@@ -15 +15 @@
 #include <mntent.h>
 #include <errno.h>
-#include <string.h>
 #include <getopt.h>
 
-#define OPTION_STRING       "flDnrvad"
+#define OPTION_STRING       "flDnravd"
 #define OPT_FORCE           1
 #define OPT_LAZY            2
@@ -24 +23 @@
 #define OPT_NO_MTAB         8
 #define OPT_REMOUNT         16
-#define OPT_IGNORED         32  // -v is ignored
-#define OPT_ALL             (ENABLE_FEATURE_UMOUNT_ALL ? 64 : 0)
+#define OPT_ALL             (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0)
 
 int umount_main(int argc, char **argv)
@@ -78 +76 @@
         if (!argc) bb_show_usage();
     }
-
-
     
     // Loop through everything we're supposed to umount, and do so.
     for (;;) {
         int curstat;
+        char *zapit = *argv;
 
         // Do we already know what to umount this time through the loop?
@@ -92 +89 @@
         else if (!argc--) break;
         else {
-            realpath(*argv++, path);
+            argv++;
+            realpath(zapit, path);
             for (m = mtl; m; m = m->next)
                 if (!strcmp(path, m->dir) || !strcmp(path, m->device))
                     break;
         }
+        // If we couldn't find this sucker in /etc/mtab, punt by passing our
+        // command line argument straight to the umount syscall.  Otherwise,
+        // umount the directory even if we were given the block device.
+        if (m) zapit = m->dir;
 
         // Let's ask the thing nicely to unmount.
-        curstat = umount(path);
+        curstat = umount(zapit);
 
         // Force the unmount, if necessary.
         if (curstat && doForce) {
-            curstat = umount2(path, doForce);
+            curstat = umount2(zapit, doForce);
             if (curstat)
-                bb_error_msg_and_die("forced umount of %s failed!", path);
+                bb_error_msg_and_die("forced umount of %s failed!", zapit);
         }
 
         // If still can't umount, maybe remount read-only?
         if (curstat && (opt & OPT_REMOUNT) && errno == EBUSY && m) {
-            curstat = mount(m->device, path, NULL, MS_REMOUNT|MS_RDONLY, NULL);
+            curstat = mount(m->device, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL);
             bb_error_msg(curstat ? "Cannot remount %s read-only" :
                          "%s busy - remounted read-only", m->device);
         }
 
-        /* De-allocate the loop device.  This ioctl should be ignored on any
-         * non-loop block devices. */
-        if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONTFREELOOP) && m)
-            del_loop(m->device);
+        if (curstat) {
+            status = EXIT_FAILURE;
+            bb_perror_msg("Couldn't umount %s", zapit);
+        } else {
+            /* De-allocate the loop device.  This ioctl should be ignored on
+             * any non-loop block devices. */
+            if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONTFREELOOP) && m)
+                del_loop(m->device);
+            if (ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
+                erase_mtab(m->dir);
+        }
 
-        if (curstat) {
-            /* Yes, the ENABLE is redundant here, but the optimizer for ARM
-             * can't do simple constant propagation in local variables... */
-            if(ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
-                erase_mtab(m->dir);
-            status = EXIT_FAILURE;
-            bb_perror_msg("Couldn't umount %s", path);
-        }
         // Find next matching mtab entry for -a or umount /dev
+        // Note this means that "umount /dev/blah" will unmount all instances
+        // of /dev/blah, not just the most recent.
         while (m && (m = m->next))
             if ((opt & OPT_ALL) || !strcmp(path,m->device))