Simple fixes accumulated after 1.3.0.

busybox-1.3.0.ash.patch
busybox-1.3.0.bb_strtou.patch
busybox-1.3.0.CONFIG_FEATURE_TAR_GNU_EXTENSIONS.patch
busybox-1.3.0.dhcprelay.patch
busybox-1.3.0.dpkg_ar.patch
busybox-1.3.0.find.patch
busybox-1.3.0.mount.patch
busybox-1.3.0.perror.patch
busybox-1.3.0.sed.patch
busybox-1.3.0.shadow.patch
busybox-1.3.0.xregcomp.patch

diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c
index 7f8c81ca0449b59c32d3a7d4c82e004cc6d83e6b..897c8991882fe0cf744074912b4f86c4accf2b66 100644 (file)
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libunarchive/get_header_ar.c
@@ -9,6 +9,7 @@
 
 char get_header_ar(archive_handle_t *archive_handle)
 {
+       int err;
        file_header_t *typed = archive_handle->file_header;
        union {
                char raw[60];
@@ -45,15 +46,23 @@ char get_header_ar(archive_handle_t *archive_handle)
        archive_handle->offset += 60;
 
        /* align the headers based on the header magic */
-       if ((ar.formatted.magic[0] != '`') || (ar.formatted.magic[1] != '\n')) {
+       if (ar.formatted.magic[0] != '`' || ar.formatted.magic[1] != '\n')
                bb_error_msg_and_die("invalid ar header");
-       }
 
-       typed->mode = xstrtoul(ar.formatted.mode, 8);
-       typed->mtime = xatou(ar.formatted.date);
-       typed->uid = xatou(ar.formatted.uid);
-       typed->gid = xatou(ar.formatted.gid);
-       typed->size = xatoul(ar.formatted.size);
+       /* FIXME: more thorough routine would be in order here */
+       /* (we have something like that in tar) */
+       /* but for now we are lax. This code works because */
+       /* on misformatted numbers bb_strtou returns all-ones */
+       typed->mode = err = bb_strtou(ar.formatted.mode, NULL, 8);
+       if (err == -1) bb_error_msg_and_die("invalid ar header");
+       typed->mtime = err = bb_strtou(ar.formatted.date, NULL, 10);
+       if (err == -1) bb_error_msg_and_die("invalid ar header");
+       typed->uid = err = bb_strtou(ar.formatted.uid, NULL, 10);
+       if (err == -1) bb_error_msg_and_die("invalid ar header");
+       typed->gid = err = bb_strtou(ar.formatted.gid, NULL, 10);
+       if (err == -1) bb_error_msg_and_die("invalid ar header");
+       typed->size = err = bb_strtou(ar.formatted.size, NULL, 10);
+       if (err == -1) bb_error_msg_and_die("invalid ar header");
 
        /* long filenames have '/' as the first character */
        if (ar.formatted.name[0] == '/') {

diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index 66c3314a1f84fe5fdf96c10f8b7fb3eed49c1e82..88f72bd15b17962d710e391e750e7b2d83fabb64 100644 (file)
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -74,8 +74,10 @@ char get_header_tar(archive_handle_t *archive_handle)
 
        if (sizeof(tar) != 512)
                BUG_tar_header_size();
- again:
 
+#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+ again:
+#endif
        /* Align header */
        data_align(archive_handle, 512);
 

diff --git a/editors/sed.c b/editors/sed.c
index ac3d8d4635beb2a3433a987e3158810fff770c0f..a6544fd0d13cf1601de959df3d1e833bf536ccbd 100644 (file)
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -120,7 +120,6 @@ struct sed_globals {
 } bbg;
 
 
-void sed_free_and_close_stuff(void);
 #if ENABLE_FEATURE_CLEAN_UP
 static void sed_free_and_close_stuff(void)
 {
@@ -156,6 +155,8 @@ static void sed_free_and_close_stuff(void)
        while (bbg.current_input_file < bbg.input_file_count)
                fclose(bbg.input_file_list[bbg.current_input_file++]);
 }
+#else
+void sed_free_and_close_stuff(void);
 #endif
 
 /* If something bad happens during -i operation, delete temp file */

diff --git a/findutils/find.c b/findutils/find.c
index bf6b71a834d80503d3604df0d4dfdfcddbc0c162..c49a0010a5cb4187a32aa133d7b38fea29830b7f 100644 (file)
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -81,6 +81,7 @@ static inline int one_char(const char* str, char c)
 }
 
 
+#if ENABLE_FEATURE_FIND_EXEC
 static int count_subst(const char *str)
 {
        int count = 0;
@@ -108,6 +109,7 @@ static char* subst(const char *src, int count, const char* filename)
        strcpy(dst, src);
        return buf;
 }
+#endif
 
 
 static int exec_actions(action ***appp, const char *fileName, struct stat *statbuf)
@@ -562,8 +564,8 @@ int find_main(int argc, char **argv)
                        argp[0] = "-a";
                }
                argp++;
-       }
 #endif
+       }
 
        actions = parse_params(&argv[firstopt]);
 

diff --git a/include/libbb.h b/include/libbb.h
index 1d91a0a72742f52409bc37c1355f1ac47701a760..65430d2546de5f6c86de9f26d9e2d813cb1cc70d 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -51,7 +51,9 @@
 
 #include "pwd_.h"
 #include "grp_.h"
+#if ENABLE_FEATURE_SHADOWPASSWDS
 #include "shadow_.h"
+#endif
 
 /* Try to pull in PATH_MAX */
 #include <limits.h>

diff --git a/include/xatonum.h b/include/xatonum.h
index 585d846235172915066c8e1650f9273be2b2178a..8b1663789bdb3a023f755da30595f059d0013163 100644 (file)
--- a/include/xatonum.h
+++ b/include/xatonum.h
@@ -115,7 +115,7 @@ extern inline
 unsigned long bb_strtoul(const char *arg, char **endp, int base)
 { return bb_strtoull(arg, endp, base); }
 extern inline
-unsigned long bb_strtol(const char *arg, char **endp, int base)
+long bb_strtol(const char *arg, char **endp, int base)
 { return bb_strtoll(arg, endp, base); }
 #else
 unsigned long bb_strtoul(const char *arg, char **endp, int base);
@@ -124,21 +124,21 @@ long bb_strtol(const char *arg, char **endp, int base);
 
 #if UINT_MAX == ULLONG_MAX
 extern inline
-unsigned long bb_strtou(const char *arg, char **endp, int base)
+unsigned bb_strtou(const char *arg, char **endp, int base)
 { return bb_strtoull(arg, endp, base); }
 extern inline
-unsigned long bb_strtoi(const char *arg, char **endp, int base)
+int bb_strtoi(const char *arg, char **endp, int base)
 { return bb_strtoll(arg, endp, base); }
 #elif UINT_MAX == ULONG_MAX
 extern inline
-unsigned long bb_strtou(const char *arg, char **endp, int base)
+unsigned bb_strtou(const char *arg, char **endp, int base)
 { return bb_strtoul(arg, endp, base); }
 extern inline
-unsigned long bb_strtoi(const char *arg, char **endp, int base)
+int bb_strtoi(const char *arg, char **endp, int base)
 { return bb_strtol(arg, endp, base); }
 #else
-unsigned long bb_strtou(const char *arg, char **endp, int base);
-long bb_strtoi(const char *arg, char **endp, int base);
+unsigned bb_strtou(const char *arg, char **endp, int base);
+int bb_strtoi(const char *arg, char **endp, int base);
 #endif
 
 int BUG_bb_strtou32_unimplemented(void);

diff --git a/libbb/Kbuild b/libbb/Kbuild
index c15615302458bb3e8ff1f5ab626612efb3121712..827a5ce9ff1d706abed067de7b9f4415fe234004 100644 (file)
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -113,5 +113,7 @@ lib-$(CONFIG_EJECT) += find_mount_point.o
 
 lib-$(CONFIG_AWK) += xregcomp.o
 lib-$(CONFIG_SED) += xregcomp.o
+lib-$(CONFIG_GREP) += xregcomp.o
 lib-$(CONFIG_LESS) += xregcomp.o
+lib-$(CONFIG_MDEV) += xregcomp.o
 lib-$(CONFIG_DEVFSD) += xregcomp.o

diff --git a/libbb/bb_strtonum.c b/libbb/bb_strtonum.c
index 6fbd1f87d7aac0cf3b09a2d44772f3e063f94e21..50ef0ba267e54bcbaaf56b63a6dcca79d446e0ef 100644 (file)
--- a/libbb/bb_strtonum.c
+++ b/libbb/bb_strtonum.c
@@ -17,6 +17,7 @@
  * errno = ERANGE if value had alphanumeric terminating char ("1234abcg").
  * errno = ERANGE if value is out of range, missing, etc.
  * errno = ERANGE if value had minus sign for strtouXX (even "-0" is not ok )
+ *    return value is all-ones in this case.
  */
 
 static unsigned long long ret_ERANGE(void)

diff --git a/libbb/perror_nomsg.c b/libbb/perror_nomsg.c
index 3aefd530185914790abd7546060ea1a9e501e43d..8059f9fd898b43445115c203ade37da96c70984b 100644 (file)
--- a/libbb/perror_nomsg.c
+++ b/libbb/perror_nomsg.c
@@ -7,10 +7,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "libbb.h"
+/* gcc warns about a null format string, therefore we provide
+ * modified definition without "attribute (format)"
+ * instead of including libbb.h */
+//#include "libbb.h"
+extern void bb_perror_msg(const char *s, ...);
 
 void bb_perror_nomsg(void)
 {
-       /* Ignore the gcc warning about a null format string. */
-       bb_perror_msg(NULL);
+       bb_perror_msg(0);
 }

diff --git a/libbb/perror_nomsg_and_die.c b/libbb/perror_nomsg_and_die.c
index e5623c2a9321dd4d4d4ef8e5fbc2965632c57080..c416df67cded4f61a3e39f7bcf40fb9169b68da8 100644 (file)
--- a/libbb/perror_nomsg_and_die.c
+++ b/libbb/perror_nomsg_and_die.c
@@ -7,11 +7,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stddef.h>
-#include "libbb.h"
+/* gcc warns about a null format string, therefore we provide
+ * modified definition without "attribute (format)"
+ * instead of including libbb.h */
+//#include "libbb.h"
+extern void bb_perror_msg_and_die(const char *s, ...);
 
 void bb_perror_nomsg_and_die(void)
 {
-       /* Ignore the gcc warning about a null format string. */
-       bb_perror_msg_and_die(NULL);
+       bb_perror_msg_and_die(0);
 }

diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index e3a81688603b7417b74da59f880b5d29840282f3..4e84b8dd4dce367a68ff4f3175965603582b6619 100644 (file)
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -259,7 +259,8 @@ static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **cli
 {
        struct dhcpMessage dhcp_msg;
        fd_set rfds;
-       size_t packlen, addr_size;
+       size_t packlen;
+       socklen_t addr_size;
        struct sockaddr_in client_addr;
        struct timeval tv;
        int i;

diff --git a/shell/ash.c b/shell/ash.c
index 3a9998fc0e9066167f431ea5b604d61783637b89..976c3f78a2e075f0673e0e3f2d27933eb78fa4c7 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -85,7 +85,7 @@
 #ifdef CONFIG_ASH_JOB_CONTROL
 #define JOBS 1
 #else
-#undef JOBS
+#define JOBS 0
 #endif
 
 #if JOBS || defined(CONFIG_ASH_READ_NCHARS)
@@ -6647,7 +6647,7 @@ usage:
 }
 #endif /* JOBS */
 
-#if defined(JOBS) || DEBUG
+#if JOBS || DEBUG
 static int
 jobno(const struct job *jp)
 {

diff --git a/util-linux/mount.c b/util-linux/mount.c
index f8ae1df190e981cbea2f6310c48448bd629ad572..0fcd8e561ed35815cd33c42d4f052b0450e82cce 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1693,10 +1693,13 @@ int mount_main(int argc, char **argv)
 
                        // Mount this thing.
 
+                       // NFS mounts want this to be xrealloc-able
+                       mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
                        if (singlemount(mtcur, 1)) {
                                /* Count number of failed mounts */
                                rc++;
                        }
+                       free(mtcur->mnt_opts);
                }
        }
        if (ENABLE_FEATURE_CLEAN_UP) endmntent(fstab);