Move init of a bunch of globals into main so we are at least

[oweals/busybox.git] / shell / lash.c

diff --git a/shell/lash.c b/shell/lash.c
index 892237b085d9de999e73e148bf9c39435b0b02f5..89a8fe6a50e21fdf43f65a1cce10e9ea4cb68a13 100644 (file)
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -64,6 +64,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <getopt.h>
+#include "busybox.h"
+#include "cmdedit.h"
 
 #ifdef BB_LOCALE_SUPPORT
 #include <locale.h>
@@ -79,8 +81,6 @@
 #include <glob.h>
 #define expand_t       glob_t
 #endif 
-#include "busybox.h"
-#include "cmdedit.h"
 
 
 static const int MAX_READ = 128;       /* size of input buffer for `read' builtin */
@@ -216,7 +216,7 @@ unsigned int shell_context;  /* Used in cmdedit.c to reset the
 
 
 /* Globals that are static to this file */
-static char *cwd;
+static const char *cwd;
 static char *local_pending_command = NULL;
 static struct jobset job_list = { NULL, NULL };
 static int argc;
@@ -296,8 +296,9 @@ static int builtin_cd(struct child_prog *child)
                printf("cd: %s: %m\n", newdir);
                return EXIT_FAILURE;
        }
-       cwd = xgetcwd(cwd);
-
+       cwd = xgetcwd((char *)cwd);
+       if (!cwd)
+               cwd = unknown;
        return EXIT_SUCCESS;
 }
 
@@ -412,6 +413,9 @@ static int builtin_jobs(struct child_prog *child)
 /* built-in 'pwd' handler */
 static int builtin_pwd(struct child_prog *dummy)
 {
+       cwd = xgetcwd((char *)cwd);
+       if (!cwd)
+               cwd = unknown;
        printf( "%s\n", cwd);
        return EXIT_SUCCESS;
 }
@@ -1827,7 +1831,6 @@ void free_memory(void)
 {
        if (cwd) {
                free(cwd);
-               cwd = NULL;
        }
        if (local_pending_command)
                free(local_pending_command);
@@ -1919,6 +1922,8 @@ int shell_main(int argc_l, char **argv_l)
 
        /* initialize the cwd -- this is never freed...*/
        cwd = xgetcwd(0);
+       if (!cwd)
+               cwd = unknown;
 
 #ifdef BB_FEATURE_CLEAN_UP
        atexit(free_memory);