Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

Conflicts:
	libbb/vfork_daemon_rexec.c
	networking/wget.c
	procps/ps.c

3 files changed, 10 insertions, 7 deletions

diff --git a/editors/diff.c b/editors/diff.c
index cc7ba472e..ca4a4eae7 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -794,7 +794,9 @@ static int FAST_FUNC skip_dir(const char *filename,
                         free(othername);
                         if (r != 0 || !S_ISDIR(osb.st_mode)) {
                                 /* other dir doesn't have similarly named
-                                 * directory, don't recurse */
+                                 * directory, don't recurse; return 1 upon
+                                 * exit, just like diffutils' diff */
+                                exit_status |= 1;
                                 return SKIP;
                         }
                 }
@@ -846,9 +848,10 @@ static void diffdir(char *p[2], const char *s_start)
                         break;
                 pos = !dp[0] ? 1 : (!dp[1] ? -1 : strcmp(dp[0], dp[1]));
                 k = pos > 0;
-                if (pos && !(option_mask32 & FLAG(N)))
+                if (pos && !(option_mask32 & FLAG(N))) {
                         printf("Only in %s: %s\n", p[k], dp[k]);
-                else {
+                        exit_status |= 1;
+                } else {
                         char *fullpath[2], *path[2]; /* if -N */
 
                         for (i = 0; i < 2; i++) {
diff --git a/editors/ed.c b/editors/ed.c
index 859668406..b1b6a8d27 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -129,7 +129,7 @@ static void doCommands(void)
                  * 0  on ctrl-C,
                  * >0 length of input string, including terminating '\n'
                  */
-                len = read_line_input(": ", buf, sizeof(buf), NULL);
+                len = read_line_input(NULL, ": ", buf, sizeof(buf), /*timeout*/ -1);
                 if (len <= 0)
                         return;
                 endbuf = &buf[len - 1];
@@ -227,7 +227,7 @@ static void doCommands(void)
                         }
                         if (!dirty)
                                 return;
-                        len = read_line_input("Really quit? ", buf, 16, NULL);
+                        len = read_line_input(NULL, "Really quit? ", buf, 16, /*timeout*/ -1);
                         /* read error/EOF - no way to continue */
                         if (len < 0)
                                 return;
@@ -541,7 +541,7 @@ static void addLines(int num)
                  * 0  on ctrl-C,
                  * >0 length of input string, including terminating '\n'
                  */
-                len = read_line_input("", buf, sizeof(buf), NULL);
+                len = read_line_input(NULL, "", buf, sizeof(buf), /*timeout*/ -1);
                 if (len <= 0) {
                         /* Previously, ctrl-C was exiting to shell.
                          * Now we exit to ed prompt. Is in important? */
diff --git a/editors/sed.c b/editors/sed.c
index b91acfb7f..d3555243f 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -124,7 +124,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 struct BUG_G_too_big {
-        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
 };
 #define INIT_G() do { \
         G.sed_cmd_tail = &G.sed_cmd_head; \