X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=lash.c;h=077cb1182a102bf05d53d832b026a7457a10fbde;hb=5165fbed639916e0fde15a827241b21981be7934;hp=cc0d78687fdd301c4bc06ced330a9211ea2646c8;hpb=dd19c6990496023fe23fefef8f1798740f7d39c6;p=oweals%2Fbusybox.git

diff --git a/lash.c b/lash.c
index cc0d78687..077cb1182 100644
--- a/lash.c
+++ b/lash.c
@@ -49,7 +49,6 @@
 //#define DEBUG_SHELL
 
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -62,12 +61,12 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <getopt.h>
+#include "busybox.h"
 #include "cmdedit.h"
 
 static const int MAX_LINE = 256;	/* size of input buffer for cwd data */
 static const int MAX_READ = 128;	/* size of input buffer for `read' builtin */
 #define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n"
-extern size_t NUM_APPLETS;
 
 
 enum redir_type { REDIRECT_INPUT, REDIRECT_OVERWRITE,
@@ -855,10 +854,9 @@ static int get_command(FILE * source, char *command)
 		** atexit() handlers and other unwanted stuff to our
 		** child processes (rob@sysgo.de)
 		*/
-		cmdedit_init();
 		cmdedit_read_input(prompt_str, command);
-		free(prompt_str);
 		cmdedit_terminate();
+		free(prompt_str);
 		return 0;
 #else
 		fputs(prompt_str, stdout);
@@ -918,44 +916,57 @@ static void expand_argument(struct child_prog *prog, int *argcPtr,
 		flags = 0;
 		i = 0;
 	}
-	/* do shell variable substitution */
-	if(*prog->argv[argc_l - 1] == '$') {
-		if ((var = getenv(prog->argv[argc_l - 1] + 1))) {
-			prog->argv[argc_l - 1] = var;
-		} 
 #ifdef BB_FEATURE_SH_ENVIRONMENT
-		else {
-			switch(*(prog->argv[argc_l - 1] + 1)) {
+	/* do shell variable substitution */
+	src = prog->argv[argc_l - 1];
+	while((dst = strchr(src,'$')) != NULL){
+		if (!(var = getenv(dst + 1))) {
+			switch(*(dst+1)) {
 				case '?':
-					prog->argv[argc_l - 1] = itoa(last_return_code);
+					var = itoa(last_return_code);
 					break;
 				case '$':
-					prog->argv[argc_l - 1] = itoa(getpid());
+					var = itoa(getpid());
 					break;
 				case '#':
-					prog->argv[argc_l - 1] = itoa(argc-1);
+					var = itoa(argc-1);
 					break;
 				case '!':
 					if (last_bg_pid==-1)
-						*(prog->argv[argc_l - 1])='\0';
+						*(var)='\0';
 					else
-						prog->argv[argc_l - 1] = itoa(last_bg_pid);
+						var = itoa(last_bg_pid);
 					break;
 				case '0':case '1':case '2':case '3':case '4':
 				case '5':case '6':case '7':case '8':case '9':
 					{
-						int index=*(prog->argv[argc_l - 1] + 1)-48;
+						int index=*(dst + 1)-48;
 						if (index >= argc) {
-							*(prog->argv[argc_l - 1])='\0';
+							var='\0';
 						} else {
-							prog->argv[argc_l - 1] = argv[index];
+							var = argv[index];
 						}
 					}
 					break;
 			}
 		}
-#endif
+		if (var) {
+			int offset = dst-src;
+#warning I have a memory leak which needs to be plugged somehow
+			src = (char*)xmalloc(strlen(src)-strlen(dst)+strlen(var)+1);
+			strncpy(src, prog->argv[argc_l -1], offset); 
+			safe_strncpy(src+offset, var, strlen(var)+1); 
+			/* If there are any remaining $ variables in the src string, put them back */
+			if ((dst = strchr(prog->argv[argc_l -1]+offset+1,'$')) != NULL) {
+				offset=strlen(src);
+				safe_strncpy(src+strlen(src), dst, strlen(dst)+1);
+			}
+			prog->argv[argc_l -1] = src;
+		} else {
+			memset(dst, 0, strlen(src)-strlen(dst)); 
+		}
 	}
+#endif
 
 	if (strpbrk(prog->argv[argc_l - 1],"*[]?")!= NULL){
 		rc = glob(prog->argv[argc_l - 1], flags, NULL, &prog->glob_result);
@@ -1371,7 +1382,7 @@ static int pseudo_exec(struct child_prog *child)
 {
 	struct built_in_command *x;
 #ifdef BB_FEATURE_SH_STANDALONE_SHELL
-	struct BB_applet search_applet, *applet;
+	char *name;
 #endif
 
 	/* Check if the command matches any of the non-forking builtins.
@@ -1404,7 +1415,7 @@ static int pseudo_exec(struct child_prog *child)
 	 * /bin/foo invocation will fork and exec /bin/foo, even if
 	 * /bin/foo is a symlink to busybox.
 	 */
-	search_applet.name = child->argv[0];
+	name = child->argv[0];
 
 #ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
 	/* If you enable BB_FEATURE_SH_APPLETS_ALWAYS_WIN, then
@@ -1412,19 +1423,15 @@ static int pseudo_exec(struct child_prog *child)
 	 * /bin/cat exists on the filesystem and is _not_ busybox.
 	 * Some systems want this, others do not.  Choose wisely.  :-)
 	 */
-	search_applet.name = get_last_path_component(search_applet.name);
+	name = get_last_path_component(name);
 #endif
 
-	/* Do a binary search to find the applet entry given the name. */
-	applet = bsearch(&search_applet, applets, NUM_APPLETS,
-			sizeof(struct BB_applet), applet_name_compare);
-	if (applet != NULL) {
-		int argc_l;
-		char** argv=child->argv;
-		for(argc_l=0;*argv!=NULL; argv++, argc_l++);
-		applet_name=applet->name;
-		optind = 1;
-		exit((*(applet->main)) (argc_l, child->argv));
+	{
+	    char** argv=child->argv;
+	    int argc_l;
+	    for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+	    optind = 1;
+	    run_applet_by_name(name, argc_l, child->argv);
 	}
 #endif
 
@@ -1752,7 +1759,7 @@ int shell_main(int argc_l, char **argv_l)
 				interactive = TRUE;
 				break;
 			default:
-				usage(shell_usage);
+				show_usage();
 		}
 	}
 	/* A shell is interactive if the `-i' flag was given, or if all of