Changeset 10877

Timestamp:

11/12/08 23:15:07 (5 years ago)

Author:

BrainSlayer

Message:

busybox update

Location:

src/router/busybox

Files:

• Makefile (modified) (1 diff)
• coreutils/basename.c (modified) (1 diff)
• libbb/lineedit.c (modified) (1 diff)
• libbb/setup_environment.c (modified) (1 diff)

src/router/busybox/Makefile

@@ -1 +1 @@
 VERSION = 1
 PATCHLEVEL = 12
-SUBLEVEL = 1
+SUBLEVEL = 2
 EXTRAVERSION =
 NAME = Unnamed

src/router/busybox/coreutils/basename.c

@@ -49 +49 @@
         /* puts(s) will do, but we can do without stdio this way: */
         s[m++] = '\n';
-        return full_write(STDOUT_FILENO, s, m) == (ssize_t)m;
+        return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
 }

src/router/busybox/libbb/lineedit.c

@@ -1416 +1416 @@
                 load_history(state->hist_file);
 #endif
-        state->cur_history = state->cnt_history;
+        if (state->flags & DO_HISTORY)
+                state->cur_history = state->cnt_history;
 
         /* prepare before init handlers */

src/router/busybox/libbb/setup_environment.c

@@ -33 +33 @@
 void FAST_FUNC setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw)
 {
+        /* Change the current working directory to be the home directory
+         * of the user */
+        if (chdir(pw->pw_dir)) {
+                xchdir("/");
+                bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
+        }
+
         if (clear_env) {
                 const char *term;
-
-                /* Change the current working directory to be the home directory
-                 * of the user */
-                if (chdir(pw->pw_dir)) {
-                        xchdir("/");
-                        bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
-                }
 
                 /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.