Merge branch 'busybox' into merge

1 files changed, 3 insertions, 6 deletions

diff --git a/debianutils/which.c b/debianutils/which.c
index fd3f53d3e..5d564e01d 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -35,10 +35,8 @@
 int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int which_main(int argc UNUSED_PARAM, char **argv)
 {
-        char *env_path;
+        const char *env_path;
         int status = 0;
-        /* This sizeof(): bb_default_root_path is shorter than BB_PATH_ROOT_PATH */
-        char buf[sizeof(BB_PATH_ROOT_PATH)];
 #if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_STANDALONE
         /* 'Which' in argv[0] indicates we were run from a standalone shell */
         int sh_standalone = argv[0][0] == 'W';
@@ -46,8 +44,7 @@ int which_main(int argc UNUSED_PARAM, char **argv)
 
         env_path = getenv("PATH");
         if (!env_path)
-                /* env_path must be writable, and must not alloc, so... */
-                env_path = strcpy(buf, bb_default_root_path);
+                env_path = bb_default_root_path;
 
         getopt32(argv, "^" "a" "\0" "-1"/*at least one arg*/);
         argv += optind;
@@ -94,7 +91,7 @@ int which_main(int argc UNUSED_PARAM, char **argv)
                         }
 #endif
                 } else {
-                        char *path;
+                        const char *path;
                         char *p;
 
 #if ENABLE_PLATFORM_MINGW32