10 files changed, 52 insertions, 104 deletions

diff --git a/libbb/Kbuild b/libbb/Kbuild
index b3560bd0b..1ef67a8b7 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -13,11 +13,17 @@ lib-y += change_identity.o
 lib-y += create_icmp6_socket.o
 lib-y += create_icmp_socket.o
 lib-y += device_open.o
+lib-y += get_console.o
 lib-y += inet_common.o
+lib-y += inode_hash.o
 lib-y += kernel_version.o
 lib-y += login.o
 lib-y += makedev.o
 lib-y += match_fstype.o
+lib-y += obscure.o
+lib-y += procps.o
+lib-y += restricted_shell.o
+lib-y += run_shell.o
 lib-y += setup_environment.o
 lib-y += speed_table.o
 lib-y += vfork_daemon_rexec.o
@@ -46,7 +52,6 @@ lib-y += fgets_str.o
 lib-y += find_pid_by_name.o
 lib-y += find_root_device.o
 lib-y += full_write.o
-lib-y += get_console.o
 lib-y += get_last_path_component.o
 lib-y += get_line_from_file.o
 lib-y += getopt32.o
@@ -54,7 +59,6 @@ lib-y += herror_msg.o
 lib-y += herror_msg_and_die.o
 lib-y += human_readable.o
 lib-y += info_msg.o
-lib-y += inode_hash.o
 lib-y += isdirectory.o
 lib-y += last_char_is.o
 lib-y += lineedit.o
@@ -64,7 +68,6 @@ lib-y += md5.o
 lib-y += messages.o
 lib-y += mode_string.o
 lib-y += mtab_file.o
-lib-y += obscure.o
 lib-y += parse_mode.o
 lib-y += perror_msg.o
 lib-y += perror_msg_and_die.o
@@ -72,12 +75,9 @@ lib-y += perror_nomsg.o
 lib-y += perror_nomsg_and_die.o
 lib-y += pidfile.o
 lib-y += process_escape_sequence.o
-lib-y += procps.o
 lib-y += read.o
 lib-y += recursive_action.o
 lib-y += remove_file.o
-lib-y += restricted_shell.o
-lib-y += run_shell.o
 lib-y += safe_strncpy.o
 lib-y += safe_write.o
 lib-y += sha1.o
@@ -140,6 +140,5 @@ lib-$(CONFIG_MINGW32) += strbuf_file.o
 lib-$(CONFIG_MINGW32) += strlcpy.o
 lib-$(CONFIG_MINGW32) += termios.o
 lib-$(CONFIG_MINGW32) += trace.o
-lib-$(CONFIG_MINGW32) += usage.o
 lib-$(CONFIG_MINGW32) += winansi.o
 lib-$(CONFIG_MINGW32) += write_or_die.o
diff --git a/libbb/git.c b/libbb/git.c
index 3ca8a9424..668f8c118 100644
--- a/libbb/git.c
+++ b/libbb/git.c
@@ -1,13 +1,42 @@
 #include "libbb.h"
 #include "git.h"
 
+#define die bb_error_msg_and_die
+
+/*
+ * xwrite() is the same a write(), but it automatically restarts write()
+ * operations with a recoverable error (EAGAIN and EINTR). xwrite() DOES NOT
+ * GUARANTEE that "len" bytes is written even if the operation is successful.
+ */
+ssize_t _xwrite(int fd, const void *buf, size_t len)
+{
+        ssize_t nr;
+        while (1) {
+                nr = write(fd, buf, len);
+                if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
+                        continue;
+                return nr;
+        }
+}
+
+ssize_t _xread(int fd, void *buf, size_t len)
+{
+        ssize_t nr;
+        while (1) {
+                nr = read(fd, buf, len);
+                if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
+                        continue;
+                return nr;
+        }
+}
+
 ssize_t write_in_full(int fd, const void *buf, size_t count)
 {
         const char *p = buf;
         ssize_t total = 0;
 
         while (count > 0) {
-                ssize_t written = xwrite(fd, p, count);
+                ssize_t written = _xwrite(fd, p, count);
                 if (written < 0)
                         return -1;
                 if (!written) {
diff --git a/libbb/git.h b/libbb/git.h
index 3274af34d..07ef93bf4 100644
--- a/libbb/git.h
+++ b/libbb/git.h
@@ -1,4 +1,7 @@
 ssize_t write_in_full(int fd, const void *buf, size_t count);
+void *xcalloc(size_t nmemb, size_t size);
+ssize_t _xwrite(int fd, const void *buf, size_t len);
+ssize_t _xread(int fd, void *buf, size_t len);
 
 #define alloc_nr(x) (((x)+16)*3/2)
 
@@ -19,3 +22,5 @@ static inline int is_absolute_path(const char *path)
 }
 
 #define NORETURN ATTRIBUTE_NORETURN
+#define die bb_error_msg_and_die
+#define error(...) fprintf(stderr, __VA_ARGS__)
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index e56dd20b0..a4b0ff045 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -170,7 +170,7 @@ static void input_backward(unsigned num)
         if (cmdedit_x >= num) {
                 cmdedit_x -= num;
                 if (num <= 4) {
-                        printf("\b\b\b\b" + (4-num));
+                        printf("%s", "\b\b\b\b" + (4-num)); /* "%s" to stop mingw warning */
                         return;
                 }
                 printf("\033[%uD", num);
diff --git a/libbb/mingw.c b/libbb/mingw.c
index aa1417acf..ab582215b 100644
--- a/libbb/mingw.c
+++ b/libbb/mingw.c
@@ -2,6 +2,7 @@
 #include "win32.h"
 #include "strbuf.h"
 #include "run-command.h"
+#include "git.h"
 
 unsigned int _CRT_fmode = _O_BINARY;
 
@@ -131,13 +132,15 @@ int mingw_open (const char *filename, int oflags, ...)
 {
         va_list args;
         unsigned mode;
+        int fd;
+
         va_start(args, oflags);
         mode = va_arg(args, int);
         va_end(args);
 
         if (!strcmp(filename, "/dev/null"))
                 filename = "nul";
-        int fd = open(filename, oflags, mode);
+        fd = open(filename, oflags, mode);
         if (fd < 0 && (oflags & O_CREAT) && errno == EACCES) {
                 DWORD attrs = GetFileAttributes(filename);
                 if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY))
diff --git a/libbb/regex.c b/libbb/regex.c
index 87b33e466..2cca16934 100644
--- a/libbb/regex.c
+++ b/libbb/regex.c
@@ -24,7 +24,9 @@
   #pragma alloca
 #endif
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 /* We need this for `regex.h', and perhaps for the Emacs include files.  */
 #include <sys/types.h>
diff --git a/libbb/strbuf.c b/libbb/strbuf.c
index d98b0fd41..98659d448 100644
--- a/libbb/strbuf.c
+++ b/libbb/strbuf.c
@@ -2,15 +2,6 @@
 #include "strbuf.h"
 #include "git.h"
 
-int prefixcmp(const char *str, const char *prefix)
-{
-        for (; ; str++, prefix++)
-                if (!*prefix)
-                        return 0;
-                else if (*str != *prefix)
-                        return (unsigned char)*prefix - (unsigned char)*str;
-}
-
 /*
  * Used as the default ->buf value, so that people can always assume
  * buf is non NULL and ->buf is NUL terminated even for a freshly
@@ -275,7 +266,7 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
         for (;;) {
                 ssize_t cnt;
 
-                cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
+                cnt = _xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
                 if (cnt < 0) {
                         if (oldalloc == 0)
                                 strbuf_release(sb);
diff --git a/libbb/strbuf_file.c b/libbb/strbuf_file.c
index fb2ba7966..cdacf5344 100644
--- a/libbb/strbuf_file.c
+++ b/libbb/strbuf_file.c
@@ -31,14 +31,14 @@ int sfprintf(struct strbuf_file *sf, const char *fmt, ...)
         len = vsnprintf(sb.buf + sb.len, sb.alloc - sb.len, fmt, ap);
         va_end(ap);
         if (len < 0)
-                die("your vsnprintf is broken");
+                bb_error_msg_and_die("your vsnprintf is broken");
         if (len > strbuf_avail(&sb)) {
                 strbuf_grow(&sb, len);
                 va_start(ap, fmt);
                 len = vsnprintf(sb.buf + sb.len, sb.alloc - sb.len, fmt, ap);
                 va_end(ap);
                 if (len > strbuf_avail(&sb)) {
-                        die("this should not happen, your snprintf is broken");
+                        bb_error_msg_and_die("this should not happen, your snprintf is broken");
                 }
         }
         strbuf_setlen(&sb, sb.len + len);
diff --git a/libbb/termios.c b/libbb/termios.c
index 1291bf785..04eee7ced 100644
--- a/libbb/termios.c
+++ b/libbb/termios.c
@@ -260,7 +260,7 @@ int wincon_read(int fd, char *buf, int size)
         static int initialized = 0;
 
         if (fd != 0)
-                die("wincon_read is for stdin only");
+                bb_error_msg_and_die("wincon_read is for stdin only");
         if (cin == INVALID_HANDLE_VALUE || is_cygwin_tty(fd))
                 return safe_read(fd, buf, size);
         if (!initialized) {
diff --git a/libbb/usage.c b/libbb/usage.c
deleted file mode 100644
index 86bf68e21..000000000
--- a/libbb/usage.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * GIT - The information manager from hell
- *
- * Copyright (C) Linus Torvalds, 2005
- */
-#include "libbb.h"
-#include "git.h"
-
-static void report(const char *prefix, const char *err, va_list params)
-{
-        char msg[1024];
-        vsnprintf(msg, sizeof(msg), err, params);
-        fprintf(stderr, "%s%s\n", prefix, msg);
-}
-
-static NORETURN void usage_builtin(const char *err)
-{
-        fprintf(stderr, "usage: %s\n", err);
-        exit(129);
-}
-
-static NORETURN void die_builtin(const char *err, va_list params)
-{
-        report("fatal: ", err, params);
-        exit(128);
-}
-
-static void error_builtin(const char *err, va_list params)
-{
-        report("error: ", err, params);
-}
-
-static void warn_builtin(const char *warn, va_list params)
-{
-        report("warning: ", warn, params);
-}
-
-/* If we are in a dlopen()ed .so write to a global variable would segfault
- * (ugh), so keep things static. */
-static void (*usage_routine)(const char *err) NORETURN = usage_builtin;
-static void (*die_routine)(const char *err, va_list params) NORETURN = die_builtin;
-static void (*error_routine)(const char *err, va_list params) = error_builtin;
-static void (*warn_routine)(const char *err, va_list params) = warn_builtin;
-
-void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN)
-{
-        die_routine = routine;
-}
-
-void usage(const char *err)
-{
-        usage_routine(err);
-}
-
-void die(const char *err, ...)
-{
-        va_list params;
-
-        va_start(params, err);
-        die_routine(err, params);
-        va_end(params);
-}
-
-int error(const char *err, ...)
-{
-        va_list params;
-
-        va_start(params, err);
-        error_routine(err, params);
-        va_end(params);
-        return -1;
-}
-
-void warning(const char *warn, ...)
-{
-        va_list params;
-
-        va_start(params, warn);
-        warn_routine(warn, params);
-        va_end(params);
-}