changeset 1:59d58fab67c6

Next snapshot. Tries to grab something out of lib in order to build, I have an empty "blah.c" in there to make it happy but I'm not checking that in.
author landley@driftwood
date Thu, 28 Sep 2006 17:18:51 -0400
parents e651a31d5416
children 67b517913e56
files Makefile main.c toys.h toys/df.c toys/main.c
diffstat 5 files changed, 148 insertions(+), 95 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile	Thu Sep 28 17:18:51 2006 -0400
@@ -0,0 +1,5 @@
+all:
+	gcc -Os -s $(CFLAGS) -I . main.c toys/*.c lib/*.c -o toybox
+
+clean:
+	rm toybox
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.c	Thu Sep 28 17:18:51 2006 -0400
@@ -0,0 +1,88 @@
+/* vi: set ts=4 :*/
+/* Toybox infrastructure.
+ *
+ * Copyright 2006 Rob Landley <rob@landley.net>
+ *
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ */
+
+#include "toys.h"
+
+// The monster fun applet list.
+
+struct toy_list toy_list[] = {
+	{"toybox", toybox_main},
+	{"df", df_main},
+	{"toysh", toysh_main}
+};
+
+// 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)
+{
+	int top, bottom, middle;
+
+	// If the name starts with "toybox", accept that as a match.  Otherwise
+	// skip the first entry, which is out of order.
+
+	if (!strncmp(name,"toybox",6)) return toy_list;
+	bottom=1;
+
+	// Binary search to find this applet.
+
+	top=(sizeof(toy_list)/sizeof(struct toy_list))-1;
+	for(;;) {
+		int result;
+		
+		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;
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	char *name;
+
+	// Record command line arguments.
+	toys.argc = argc;
+	toys.argv = argv;
+
+	// Figure out which applet got called.
+	name = rindex(argv[0],'/');
+	if (!name) name = argv[0];
+	else name++;
+	toys.which = find_toy_by_name(name);
+
+	if (!toys.which) {
+		dprintf(2,"No behavior for %s\n",name);
+		return 1;
+	}
+	return toys.which->toy_main();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toys.h	Thu Sep 28 17:18:51 2006 -0400
@@ -0,0 +1,48 @@
+/* vi: set ts=4 :*/
+/* Toybox infrastructure.
+ *
+ * Copyright 2006 Rob Landley <rob@landley.net>
+ *
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ */
+
+#include <stdio.h>
+#include <strings.h>
+
+/*
+name
+main()
+struct
+usage (short long example info)
+path (/usr/sbin)
+*/
+
+int toybox_main(void);
+int toysh_main(void);
+int df_main(void);
+
+extern struct toy_list {
+	char *name;
+	int (*toy_main)(void);
+} toy_list[];
+struct toy_list *find_toy_by_name(char *name);
+
+// Global context for this applet.
+
+extern struct toy_context {
+	struct toy_list *which;
+	int argc;
+	char **argv;
+	char buf[4096];
+} toys;
+
+struct toybox_data {;};
+struct toysh_data {;};
+struct df_data {;};
+
+union toy_union {
+	struct toybox_data toybox;
+	struct toysh_data toysh;
+	struct df_data df;
+} toy;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toys/df.c	Thu Sep 28 17:18:51 2006 -0400
@@ -0,0 +1,7 @@
+/* vi: set ts=4 : */
+#include "toys.h"
+
+int df_main(void)
+{
+	printf("toys.which->name=%s\n",toys.which->name);
+}
--- a/toys/main.c	Wed Sep 27 00:45:05 2006 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/* vi: set ts=4 :*/
-/* Toybox infrastructure.
- *
- * Copyright 2006 Rob Landley <rob@landley.net>
- *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
- */
-
-#include <stdio.h>
-#include <strings.h>
-
-/*
-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");
-}
-
-// The monster fun applet list.
-
-struct toy_list {
-	char *name;
-	int (*toy_main)(void);
-} toy_list[] = {
-	{"toybox", toybox_main},
-	{"toysh", toysh_main}
-};
-
-// Global context for this applet.
-
-struct toy_context {
-	struct toy_list *which;
-	int argc;
-	char **argv;
-	char buf[4096];
-//	toy_union toydata;
-} toys;
-
-struct toy_list *find_toy_by_name(char *name)
-{
-	int top, bottom, middle;
-
-	// If the name starts with "toybox", accept that as a match.  Otherwise
-	// skip the first entry, which is out of order.
-
-	if (!strncmp(name,"toybox",6)) return toy_list;
-	bottom=1;
-
-	// Binary search to find this applet.
-
-	top=(sizeof(toy_list)/sizeof(struct toy_list))-1;
-	for(;;) {
-		int result;
-		
-		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;
-	}
-}
-
-int main(int argc, char *argv[])
-{
-	char *name;
-
-	// Record command line arguments.
-	toys.argc = argc;
-	toys.argv = argv;
-
-	// Figure out which applet got called.
-	name = rindex(argv[0],'/');
-	if (!name) name = argv[0];
-	else name++;
-	toys.which = find_toy_by_name(name);
-
-	if (!toys.which) {
-		dprintf(2,"No behavior for %s\n",name);
-		return 1;
-	}
-	return toys.which->toy_main();
-}