X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fbbsh.c;h=83132f928f415ec844655b42798220d6c775f115;hb=020465218ccff1195a47a890037db37d0395c9d9;hp=8f0fb0511a8f39887d4c1e346827d89c0e469da1;hpb=51742f4bb0c57a4d5063ece9437a2f34a42e52c8;p=oweals%2Fbusybox.git

diff --git a/shell/bbsh.c b/shell/bbsh.c
index 8f0fb0511..83132f928 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -36,7 +36,7 @@
   echo `echo hello#comment " woot` and more
 */
 
-#include "busybox.h"
+#include "libbb.h"
 
 // A single executable, its arguments, and other information we know about it.
 #define BBSH_FLAG_EXIT    1
@@ -54,7 +54,7 @@ struct command {
 	int flags;		// exit, suspend, && ||
 	int pid;		// pid (or exit code)
 	int argc;
-	char *argv[0];
+	char *argv[];
 };
 
 // A collection of processes piped into/waiting on each other.
@@ -167,8 +167,8 @@ static int run_pipeline(struct pipeline *line)
 		if (!pid) {
 			run_applet_and_exit(cmd->argv[0],cmd->argc,cmd->argv);
 			execvp(cmd->argv[0],cmd->argv);
-			printf("No %s",cmd->argv[0]);
-			exit(1);
+			printf("No %s", cmd->argv[0]);
+			exit(EXIT_FAILURE);
 		} else waitpid(pid, &status, 0);
 	}
 
@@ -198,21 +198,21 @@ static void handle(char *command)
 	}
 }
 
-int bbsh_main(int argc, char **argv);
-int bbsh_main(int argc, char **argv)
+int bbsh_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int bbsh_main(int argc UNUSED_PARAM, char **argv)
 {
 	char *command=NULL;
 	FILE *f;
 
-	getopt32(argc, argv, "c:", &command);
+	getopt32(argv, "c:", &command);
 
-	f = argv[optind] ? xfopen(argv[optind],"r") : NULL;
+	f = argv[optind] ? xfopen_for_read(argv[optind]) : NULL;
 	if (command) handle(command);
 	else {
 		unsigned cmdlen=0;
 		for (;;) {
 			if (!f) putchar('$');
-			if (1 > getline(&command, &cmdlen,f ? : stdin)) break;
+			if (1 > getline(&command, &cmdlen, f ? f : stdin)) break;
 
 			handle(command);
 		}