Merge branch 'busybox' into merge

3 files changed, 14 insertions, 13 deletions

diff --git a/libbb/capability.c b/libbb/capability.c
index 6587dcbf7..d0ae78b91 100644
--- a/libbb/capability.c
+++ b/libbb/capability.c
@@ -67,7 +67,7 @@ unsigned FAST_FUNC cap_name_to_number(const char *cap)
                 goto found;
         }
         for (i = 0; i < ARRAY_SIZE(capabilities); i++) {
-                if (strcasecmp(capabilities[i], cap) != 0)
+                if (strcasecmp(capabilities[i], cap) == 0)
                         goto found;
         }
         bb_error_msg_and_die("unknown capability '%s'", cap);
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 0b4e326d8..0ec9baa5f 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2462,13 +2462,14 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 timeout = st->timeout;
         }
 #if MAX_HISTORY > 0
+        if (state->flags & DO_HISTORY) {
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
-        if (state->hist_file)
-                if (state->cnt_history == 0)
-                        load_history(state);
+                if (state->hist_file)
+                        if (state->cnt_history == 0)
+                                load_history(state);
 # endif
-        if (state->flags & DO_HISTORY)
                 state->cur_history = state->cnt_history;
+        }
 #endif
 
         /* prepare before init handlers */
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 569a6fc34..2d497d754 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -297,14 +297,14 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
                 dup2(fd, 0);
                 dup2(fd, 1);
                 dup2(fd, 2);
-                if (flags & DAEMON_DOUBLE_FORK) {
-                        /* On Linux, session leader can acquire ctty
-                         * unknowingly, by opening a tty.
-                         * Prevent this: stop being a session leader.
-                         */
-                        if (fork_or_rexec(argv))
-                                _exit(EXIT_SUCCESS); /* parent */
-                }
+//              if (flags & DAEMON_DOUBLE_FORK) {
+//                      /* On Linux, session leader can acquire ctty
+//                       * unknowingly, by opening a tty.
+//                       * Prevent this: stop being a session leader.
+//                       */
+//                      if (fork_or_rexec(argv))
+//                              _exit(EXIT_SUCCESS); /* parent */
+//              }
         }
         while (fd > 2) {
                 close(fd--);