Merge branch 'origin/master' (early part)

26 files changed, 133 insertions, 105 deletions

diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index 338dc20f9..f56908420 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2007 Denys Vlasenko <vda.linux@googlemail.com>
  *
- * Licensed under GPLv2, see file License in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>
diff --git a/applets/applets.c b/applets/applets.c
index 6a3996272..5a7b88e88 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2007 Denys Vlasenko <vda.linux@googlemail.com>
  *
- * Licensed under GPLv2, see file License in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 #include "busybox.h"
 
diff --git a/coreutils/cat.c b/coreutils/cat.c
index ab682588f..454c46b68 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2, see file License in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/tac.c b/coreutils/tac.c
index d70e23ad4..b8db8eaba 100644
--- a/coreutils/tac.c
+++ b/coreutils/tac.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2007  Natanael Copa  <natanael.copa@gmail.com>
  * Copyright (C) 2007  Tito Ragusa    <farmatito@tiscali.it>
  *
- * Licensed under GPLv2, see file License in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  *
  */
 
diff --git a/docs/new-applet-HOWTO.txt b/docs/new-applet-HOWTO.txt
index 7fbd62ed1..a2c5a49fe 100644
--- a/docs/new-applet-HOWTO.txt
+++ b/docs/new-applet-HOWTO.txt
@@ -36,7 +36,7 @@ For a new applet mu, here is the code that would go in mu.c:
  *
  * Copyright (C) [YEAR] by [YOUR NAME] <YOUR EMAIL>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 #include "libbb.h"
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index f58fe9286..cf52f51b6 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -26,7 +26,7 @@
  * Journal recovery routines for the generic filesystem journaling code;
  * part of the ext2fs journaling system.
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include "e2fsck.h"     /*Put all of our defines here to clean things up*/
diff --git a/editors/patch.c b/editors/patch.c
index 7f3234e66..eb16bca12 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -82,6 +82,9 @@ void TOY_llist_free(void *list, void (*freeit)(void *data))
                 if (list==pop) break;
         }
 }
+//Override bbox's names
+#define llist_pop TOY_llist_pop
+#define llist_free TOY_llist_free
 
 // Add an entry to the end off a doubly linked list
 static
@@ -227,7 +230,8 @@ struct globals {
         long prefix;
 
         struct double_list *current_hunk;
-        long oldline, oldlen, newline, newlen, linenum;
+        long oldline, oldlen, newline, newlen;
+        long linenum;
         int context, state, filein, fileout, filepatch, hunknum;
         char *tempname;
 
@@ -241,14 +245,16 @@ struct globals {
 
 
 //bbox had: "p:i:RN"
-#define FLAG_STR "Rup:i:x"
+#define FLAG_STR "Rup:i:Nx"
 /* FLAG_REVERSE must be == 1! Code uses this fact. */
 #define FLAG_REVERSE (1 << 0)
 #define FLAG_u       (1 << 1)
 #define FLAG_PATHLEN (1 << 2)
 #define FLAG_INPUT   (1 << 3)
+// -N: not supported yet
+#define FLAG_IGNORE  (1 << 4)
 //non-standard:
-#define FLAG_DEBUG   (1 << 4)
+#define FLAG_DEBUG   (1 << 5)
 
 // Dispose of a line of input, either by writing it out or discarding it.
 
@@ -291,7 +297,7 @@ static void fail_hunk(void)
         // this file and advance to next file.
 
         TT.state = 2;
-        TOY_llist_free(TT.current_hunk, do_line);
+        llist_free(TT.current_hunk, do_line);
         TT.current_hunk = NULL;
         delete_tempfile(TT.filein, TT.fileout, &TT.tempname);
         TT.state = 0;
@@ -377,7 +383,7 @@ static int apply_one_hunk(void)
                                         fdprintf(2, "NOT: %s\n", plist->data);
 
                                 TT.state = 3;
-                                check = TOY_llist_pop(&buf);
+                                check = llist_pop(&buf);
                                 check->prev->next = buf;
                                 buf->prev = check->prev;
                                 do_line(check);
@@ -404,13 +410,13 @@ static int apply_one_hunk(void)
 out:
         // We have a match.  Emit changed data.
         TT.state = "-+"[reverse];
-        TOY_llist_free(TT.current_hunk, do_line);
+        llist_free(TT.current_hunk, do_line);
         TT.current_hunk = NULL;
         TT.state = 1;
 done:
         if (buf) {
                 buf->prev->next = NULL;
-                TOY_llist_free(buf, do_line);
+                llist_free(buf, do_line);
         }
 
         return TT.state;
@@ -505,14 +511,19 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                         // way the patch man page says, so you have to read the first hunk
                         // and _guess_.
 
-                // Start a new hunk?
+                // Start a new hunk?  Usually @@ -oldline,oldlen +newline,newlen @@
+                // but a missing ,value means the value is 1.
                 } else if (state == 1 && !strncmp("@@ -", patchline, 4)) {
                         int i;
+                        char *s = patchline+4;
 
-                        i = sscanf(patchline+4, "%ld,%ld +%ld,%ld", &TT.oldline,
-                                                &TT.oldlen, &TT.newline, &TT.newlen);
-                        if (i != 4)
-                                bb_error_msg_and_die("corrupt hunk %d at %ld", TT.hunknum, TT.linenum);
+                        // Read oldline[,oldlen] +newline[,newlen]
+
+                        TT.oldlen = TT.newlen = 1;
+                        TT.oldline = strtol(s, &s, 10);
+                        if (*s == ',') TT.oldlen=strtol(s+1, &s, 10);
+                        TT.newline = strtol(s+2, &s, 10);
+                        if (*s == ',') TT.newlen = strtol(s+1, &s, 10);
 
                         TT.context = 0;
                         state = 2;
@@ -520,7 +531,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                         // If this is the first hunk, open the file.
                         if (TT.filein == -1) {
                                 int oldsum, newsum, del = 0;
-                                char *s, *name;
+                                char *name;
 
                                 oldsum = TT.oldline + TT.oldlen;
                                 newsum = TT.newline + TT.newlen;
diff --git a/include/libbb.h b/include/libbb.h
index 3a7a8f33f..fcff7b51e 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1495,6 +1495,8 @@ procps_status_t* procps_scan(procps_status_t* sp, int flags) FAST_FUNC;
 void read_cmdline(char *buf, int size, unsigned pid, const char *comm) FAST_FUNC;
 pid_t *find_pid_by_name(const char* procName) FAST_FUNC;
 pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC;
+int starts_with_cpu(const char *str) FAST_FUNC;
+unsigned get_cpu_count(void) FAST_FUNC;
 
 
 extern const char bb_uuenc_tbl_base64[];
diff --git a/include/xregex.h b/include/xregex.h
index 61658ed85..44a2297e6 100644
--- a/include/xregex.h
+++ b/include/xregex.h
@@ -6,7 +6,7 @@
  * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
  * Permission has been granted to redistribute this code under the GPL.
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 #ifndef BB_REGEX_H
 #define BB_REGEX_H 1
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index a4f77414b..a6a163f3e 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -158,6 +158,9 @@ lib-$(CONFIG_MOUNT) += find_mount_point.o
 lib-$(CONFIG_HWCLOCK) += rtc.o
 lib-$(CONFIG_RTCWAKE) += rtc.o
 
+lib-$(CONFIG_IOSTAT) += get_cpu_count.o
+lib-$(CONFIG_MPSTAT) += get_cpu_count.o
+
 # 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.
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index cae7da48a..b470f30f9 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -9,7 +9,7 @@
  * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
  * Permission has been granted to redistribute this code under the GPL.
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* We are trying to not use printf, this benefits the case when selected
diff --git a/libbb/get_cpu_count.c b/libbb/get_cpu_count.c
new file mode 100644
index 000000000..edb7e6d37
--- /dev/null
+++ b/libbb/get_cpu_count.c
@@ -0,0 +1,47 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Factored out of mpstat/iostat.
+ *
+ * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ */
+#include "libbb.h"
+
+/* Does str start with "cpu"? */
+int FAST_FUNC starts_with_cpu(const char *str)
+{
+        return ((str[0] - 'c') | (str[1] - 'p') | (str[2] - 'u')) == 0;
+}
+
+/*
+ * Get number of processors. Uses /proc/stat.
+ * Return value 0 means one CPU and non SMP kernel.
+ * Otherwise N means N processor(s) and SMP kernel.
+ */
+unsigned FAST_FUNC get_cpu_count(void)
+{
+        FILE *fp;
+        char line[256];
+        int proc_nr = -1;
+
+        fp = xfopen_for_read("/proc/stat");
+        while (fgets(line, sizeof(line), fp)) {
+                if (!starts_with_cpu(line)) {
+                        if (proc_nr >= 0)
+                                break; /* we are past "cpuN..." lines */
+                        continue;
+                }
+                if (line[3] != ' ') { /* "cpuN" */
+                        int num_proc;
+                        if (sscanf(line + 3, "%u", &num_proc) == 1
+                         && num_proc > proc_nr
+                        ) {
+                                proc_nr = num_proc;
+                        }
+                }
+        }
+
+        fclose(fp);
+        return proc_nr + 1;
+}
diff --git a/libbb/strrstr.c b/libbb/strrstr.c
index a803dd983..d201f5172 100644
--- a/libbb/strrstr.c
+++ b/libbb/strrstr.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2008 Bernhard Reutner-Fischer
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #ifdef __DO_STRRSTR_TEST
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index c12a10b25..a6f323ba2 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -8,7 +8,7 @@
  *
  * busyboxed 20 March 2001, Larry Doolittle <ldoolitt@recycle.lbl.gov>
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include "libbb.h"
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index a173d8efd..02b13e9c8 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -7,7 +7,7 @@
  * Based on Russell Stuart's conspy.c
  *   http://ace-host.stuart.id.au/russell/files/conspy.c
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 //applet:IF_CONSPY(APPLET(conspy, _BB_DIR_BIN, _BB_SUID_DROP))
diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index f3b21a2fc..e7b75f12f 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -7,7 +7,7 @@
  *
  * Copyright (C) 2006  Michael Opdenacker <michael@free-electrons.com>
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include "libbb.h"
diff --git a/procps/iostat.c b/procps/iostat.c
index 76c5353cc..05c758b6c 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com>
  *
- * Licensed under GPLv2, see file License in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 //applet:IF_IOSTAT(APPLET(iostat, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -114,26 +114,6 @@ static void print_header(void)
                         buf, uts.machine, G.total_cpus);
 }
 
-static int get_number_of_cpus(void)
-{
-#ifdef _SC_NPROCESSORS_CONF
-        return sysconf(_SC_NPROCESSORS_CONF);
-#else
-        char buf[128];
-        int n = 0;
-        FILE *fp;
-
-        fp = xfopen_for_read("/proc/cpuinfo");
-
-        while (fgets(buf, sizeof(buf), fp))
-                if (strncmp(buf, "processor\t:", 11) == 0)
-                        n++;
-
-        fclose(fp);
-        return n;
-#endif
-}
-
 static void get_localtime(struct tm *ptm)
 {
         time_t timer;
@@ -148,12 +128,6 @@ static void print_timestamp(void)
         printf("%s\n", buf);
 }
 
-/* Does str start with "cpu"? */
-static int starts_with_cpu(const char *str)
-{
-        return ((str[0] - 'c') | (str[1] - 'p') | (str[2] - 'u')) == 0;
-}
-
 /* Fetch CPU statistics from /proc/stat */
 static void get_cpu_statistics(struct stats_cpu *sc)
 {
@@ -509,7 +483,9 @@ int iostat_main(int argc, char **argv)
         G.clk_tck = get_user_hz();
 
         /* Determine number of CPUs */
-        G.total_cpus = get_number_of_cpus();
+        G.total_cpus = get_cpu_count();
+        if (G.total_cpus == 0)
+                G.total_cpus = 1;
 
         /* Parse and process arguments */
         /* -k and -m are mutually exclusive */
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 85cbb45db..bf0f593f7 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com>
  *
- * Licensed under GPLv2, see file License in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 //applet:IF_MPSTAT(APPLET(mpstat, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -119,12 +119,6 @@ enum {
 };
 
 
-/* Does str start with "cpu"? */
-static int starts_with_cpu(const char *str)
-{
-        return !((str[0] - 'c') | (str[1] - 'p') | (str[2] - 'u'));
-}
-
 /* Is option on? */
 static ALWAYS_INLINE int display_opt(int opt)
 {
@@ -816,38 +810,6 @@ static void print_header(struct tm *t)
 }
 
 /*
- * Get number of processors in /proc/stat
- * Return value '0' means one CPU and non SMP kernel.
- * Otherwise N means N processor(s) and SMP kernel.
- */
-static int get_cpu_nr(void)
-{
-        FILE *fp;
-        char line[256];
-        int proc_nr = -1;
-
-        fp = xfopen_for_read(PROCFS_STAT);
-        while (fgets(line, sizeof(line), fp)) {
-                if (!starts_with_cpu(line)) {
-                        if (proc_nr >= 0)
-                                break; /* we are past "cpuN..." lines */
-                        continue;
-                }
-                if (line[3] != ' ') { /* "cpuN" */
-                        int num_proc;
-                        if (sscanf(line + 3, "%u", &num_proc) == 1
-                         && num_proc > proc_nr
-                        ) {
-                                proc_nr = num_proc;
-                        }
-                }
-        }
-
-        fclose(fp);
-        return proc_nr + 1;
-}
-
-/*
  * Get number of interrupts available per processor
  */
 static int get_irqcpu_nr(const char *f, int max_irqs)
@@ -910,7 +872,7 @@ int mpstat_main(int UNUSED_PARAM argc, char **argv)
         G.interval = -1;
 
         /* Get number of processors */
-        G.cpu_nr = get_cpu_nr();
+        G.cpu_nr = get_cpu_count();
 
         /* Get number of clock ticks per sec */
         G.hz = get_hz();
diff --git a/testsuite/patch.tests b/testsuite/patch.tests
index 6ee795dba..f55b53f61 100755
--- a/testsuite/patch.tests
+++ b/testsuite/patch.tests
@@ -4,7 +4,7 @@
 
 . ./testing.sh
 
-# testing "test name" "options" "expected result" "file input" "stdin"
+# testing "test name" "command(s)" "expected result" "file input" "stdin"
 
 testing "patch with old_file == new_file" \
         'patch 2>&1; echo $?; cat input' \
@@ -100,13 +100,15 @@ def
  123
 " \
 
-# Currently fails (erroneously appends second "456" line):
-false && testing "patch detects already applied hunk" \
+testing "patch detects already applied hunk at the EOF" \
         'patch 2>&1; echo $?; cat input' \
 "\
+Possibly reversed hunk 1 at 3
+Hunk 1 FAILED 1/1.
+ abc
+ 123
++456
 patching file input
-patch: hunk #1 FAILED at 2
-patch: 1 out of 1 hunk FAILED
 1
 abc
 123
@@ -126,6 +128,31 @@ abc
 +456
 " \
 
+# testing "test name" "command(s)" "expected result" "file input" "stdin"
+
+testing "patch -N ignores already applied hunk" \
+        'patch -N 2>&1; echo $?; cat input' \
+"\
+patching file input
+0
+abc
+def
+123
+" \
+"\
+abc
+def
+123
+" \
+"\
+--- input
++++ input
+@@ -1,2 +1,3 @@
+ abc
++def
+ 123
+" \
+
 rm input.orig 2>/dev/null
 
 exit $FAILCOUNT
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 7b89e6fdc..3db91113d 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1989
  *      The Regents of the University of California.  All rights reserved.
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include "libbb.h"
diff --git a/util-linux/more.c b/util-linux/more.c
index 9216b6137..00a427a6f 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -11,7 +11,7 @@
  *
  * Termios corrects by Vladimir Oleynik <dzo@simtreas.ru>
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include "libbb.h"
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index f257d5438..f5df2f794 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -5,7 +5,7 @@
  *
  * by Sterling Huxley <sterling@europa.com>
  *
- * Licensed under GPL v2 or later, see file License for details.
+ * Licensed under GPL v2 or later, see file LICENSE for details.
 */
 
 #include "libbb.h"
diff --git a/util-linux/rev.c b/util-linux/rev.c
index fa3a453ae..8d5ac2f2d 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com>
  *
- * Licensed under GPLv2, see file License in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 //applet:IF_REV(APPLET(rev, _BB_DIR_BIN, _BB_SUID_DROP))
diff --git a/util-linux/script.c b/util-linux/script.c
index c23117cf3..ba90b065d 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -8,7 +8,7 @@
  * Copyright (c) 1980
  *      The Regents of the University of California.  All rights reserved.
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 #include "libbb.h"
 
diff --git a/util-linux/scriptreplay.c b/util-linux/scriptreplay.c
index d7e193303..c87e44dfb 100644
--- a/util-linux/scriptreplay.c
+++ b/util-linux/scriptreplay.c
@@ -4,7 +4,7 @@
  *
  * pascal.bellard@ads-lu.com
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  */
 #include "libbb.h"
diff --git a/util-linux/setarch.c b/util-linux/setarch.c
index 8213382e4..776caf909 100644
--- a/util-linux/setarch.c
+++ b/util-linux/setarch.c
@@ -4,7 +4,7 @@
  *
  * Copyright 2002 Andi Kleen, SuSE Labs.
  *
- * Licensed under GPL v2 or later, see file License for details.
+ * Licensed under GPL v2 or later, see file LICENSE for details.
 */
 
 #include <sys/personality.h>