merge post-1.3.0 fixes

libbb/Kbuild

@@ -113,5 +113,6 @@ lib-$(CONFIG_EJECT) += find_mount_point.o
 
 lib-$(CONFIG_AWK) += xregcomp.o
 lib-$(CONFIG_SED) += xregcomp.o
-lib-$(CONFIG_LESS) += xregcomp.o
+lib-$(CONFIG_GREP) += xregcomp.o
+lib-$(CONFIG_MDEV) += xregcomp.o
 lib-$(CONFIG_DEVFSD) += xregcomp.o

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)

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);
 }

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);
 }