[BusyBox] [PATCH] Dependency in shell code removed

Patrick Huesmann tricknology at gmx.de
Wed Sep 8 09:26:33 UTC 2004


Hi,

Busybox refused to link when CONFIG_FEATURE_COMMAND_EDITING is defined *and*
CONFIG_FEATURE_COMMAND_TAB_COMPLETION is undefined.

Reason:
A declaration for a variable that's used in the cmdline editing code is
wrapped in a #ifdef that's only enabled when tab completion is enabled.

I simply moved that declaration to the top of the file (outside the #ifdef)

Regards,
Patrick

--- busybox-1.00-rc3/shell/cmdedit.c    2004-04-14 19:51:31.000000000 +0200
+++ busybox-1.00-rc3-ph/shell/cmdedit.c 2004-09-08 11:13:37.000000000 +0200
@@ -45,6 +45,11 @@

 #include "../shell/cmdedit.h"

+#ifdef CONFIG_ASH
+const char *cmdedit_path_lookup;
+#else
+#define cmdedit_path_lookup getenv("PATH")
+#endif

 #ifdef CONFIG_LOCALE_SUPPORT
 #define Isprint(c) isprint((c))
@@ -608,12 +613,6 @@
        FIND_FILE_ONLY = 2,
 };

-#ifdef CONFIG_ASH
-const char *cmdedit_path_lookup;
-#else
-#define cmdedit_path_lookup getenv("PATH")
-#endif
-
 static int path_parse(char ***p, int flags)
 {
        int npth;

-- 
Supergünstige DSL-Tarife + WLAN-Router für 0,- EUR*
Jetzt zu GMX wechseln und sparen http://www.gmx.net/de/go/dsl




More information about the busybox mailing list