Infrastructure, first drop of toy shell, and a bit of work on df.

1 files changed, 74 insertions, 46 deletions

diff --git a/main.c b/main.c
index 396a354c..90d80c78 100644
--- a/main.c
+++ b/main.c
@@ -11,37 +11,22 @@
 // The monster fun applet list.
 
 struct toy_list toy_list[] = {
-	{"toybox", toybox_main},
-	{"df", df_main},
-	{"toysh", toysh_main}
+	// This one is out of order on purpose.
+	{"toybox", toybox_main, 0},
+	// The rest of these are alphabetical, for binary search.
+	{"cd", cd_main, TOYFLAG_NOFORK},
+	{"df", df_main, TOYFLAG_USR|TOYFLAG_SBIN},
+	{"exit", exit_main, TOYFLAG_NOFORK},
+	{"toysh", toysh_main, TOYFLAG_BIN}
 };
 
+#define TOY_LIST_LEN (sizeof(toy_list)/sizeof(struct toy_list))
+
 // global context for this applet.
 
 struct toy_context toys;
 
-
-
-/*
-name
-main()
-struct
-usage (short long example info)
-path (/usr/sbin)
-*/
-
-int toybox_main(void)
-{
-	printf("toybox\n");
-	return 0;
-}
-
-int toysh_main(void)
-{
-	printf("toysh\n");
-}
-
-struct toy_list *find_toy_by_name(char *name)
+struct toy_list *toy_find(char *name)
 {
 	int top, bottom, middle;
 
@@ -49,40 +34,83 @@ struct toy_list *find_toy_by_name(char *name)
 	// skip the first entry, which is out of order.
 
 	if (!strncmp(name,"toybox",6)) return toy_list;
-	bottom=1;
+	bottom = 1;
 
 	// Binary search to find this applet.
 
-	top=(sizeof(toy_list)/sizeof(struct toy_list))-1;
-	for(;;) {
+	top = TOY_LIST_LEN-1;
+	for (;;) {
 		int result;
 		
-		middle=(top+bottom)/2;
-		if(middle<bottom || middle>top) return NULL;
+		middle = (top+bottom)/2;
+		if (middle<bottom || middle>top) return NULL;
 		result = strcmp(name,toy_list[middle].name);
-		if(!result) return toy_list+middle;
-		if(result<0) top=--middle;
-		else bottom=++middle;
+		if (!result) return toy_list+middle;
+		if (result<0) top=--middle;
+		else bottom = ++middle;
 	}
 }
 
-int main(int argc, char *argv[])
+// Run a toy.
+void toy_exec(char *argv[])
 {
-	char *name;
+	struct toy_list *which;
+	
+	which = toy_find(argv[0]);
+	if (!which) return;
+
+	// Free old toys contents here?
 
-	// Record command line arguments.
-	toys.argc = argc;
+	toys.which = which;
 	toys.argv = argv;
+	for (toys.argc = 0; argv[toys.argc]; toys.argc++);
+	toys.exitval = 1;
+	
+	exit(toys.which->toy_main());
+}
 
-	// Figure out which applet got called.
-	name = rindex(argv[0],'/');
-	if (!name) name = argv[0];
-	else name++;
-	toys.which = find_toy_by_name(name);
+int toybox_main(void)
+{
+	static char *toy_paths[]={"usr/","bin/","sbin/",0};
+	int i, len = 0;
+
+	if (toys.argv[1]) {
+		if (toys.argv[1][0]!='-') {
+			toy_exec(toys.argv+1);
+			error_exit("No behavior for %s\n",toys.argv[1]);
+		}
+	}
 
-	if (!toys.which) {
-		dprintf(2,"No behavior for %s\n",name);
-		return 1;
+	// Output list of applets.
+	for (i=1; i<TOY_LIST_LEN; i++) {
+		int fl = toy_list[i].flags;
+		if (fl & TOYMASK_LOCATION) {
+			if (toys.argv[1]) {
+				int j;
+				for (j=0; toy_paths[j]; j++)
+					if (fl & (1<<j)) len += printf("%s", toy_paths[j]);
+			}
+			len += printf("%s ",toy_list[i].name);
+			if (len>65) {
+				putchar('\n');
+				len=0;
+			}
+		}
 	}
-	return toys.which->toy_main();
+	putchar('\n');
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	char *name;
+
+	// Figure out which applet to call.
+	name = rindex(argv[0], '/');
+	if (!name) name=argv[0];
+	else name++;
+	argv[0] = name;
+
+	toys.argv = argv-1;
+	return toybox_main();
 }