aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-11-01 22:23:58 -0500
committerRob Landley <rob@landley.net>2006-11-01 22:23:58 -0500
commit9b3fc7d5e0fe4850c7faa67257231366bf9053e2 (patch)
tree4785a67f15d5b39562fee69b155575d21afcb967
parent1f24e8080858e62794ba4d2869a3ae1e383e47e7 (diff)
downloadtoybox-9b3fc7d5e0fe4850c7faa67257231366bf9053e2.tar.gz
Add a hello world applet, partly as an example and partly for testing purposes.
-rw-r--r--main.c1
-rw-r--r--toys.h12
-rw-r--r--toys/hello.c12
3 files changed, 15 insertions, 10 deletions
diff --git a/main.c b/main.c
index c4b38cd4..de349ec6 100644
--- a/main.c
+++ b/main.c
@@ -17,6 +17,7 @@ struct toy_list toy_list[] = {
{"cd", cd_main, TOYFLAG_NOFORK},
{"df", df_main, TOYFLAG_USR|TOYFLAG_SBIN},
{"exit", exit_main, TOYFLAG_NOFORK},
+ {"hello", hello_main, TOYFLAG_NOFORK|TOYFLAG_USR},
{"sh", toysh_main, TOYFLAG_BIN},
{"toysh", toysh_main, TOYFLAG_BIN}
};
diff --git a/toys.h b/toys.h
index 71d70197..810af89c 100644
--- a/toys.h
+++ b/toys.h
@@ -28,6 +28,7 @@
int cd_main(void);
int df_main(void);
int exit_main(void);
+int hello_main(void);
int toybox_main(void);
int toysh_main(void);
@@ -76,13 +77,4 @@ union toy_union {
// Pending the addition of menuconfig...
-#define CFG_TOYS_FREE 0
-
-#define CFG_TOYSH_TTY 0 // Terminal control
-#define CFG_TOYSH_JOBCTL 0 // &, fg, bg, jobs. ctrl-z with tty.
-#define CFG_TOYSH_FLOWCTL 0 // if, while, for, functions { }
-#define CFG_TOYSH_ENVVARS 0 // Environment variables
-#define CFG_TOYSH_LOCVARS 0 // Local, synthetic, fancy prompts, set, $?
-#define CFG_TOYSH_PIPES 0 // Pipes and redirects: | > < >> << && || & () ;
-
-#define CFG_DF_PEDANTIC 1 // Support -P and -k in df
+#include "gen_config.h"
diff --git a/toys/hello.c b/toys/hello.c
new file mode 100644
index 00000000..1f587723
--- /dev/null
+++ b/toys/hello.c
@@ -0,0 +1,12 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * hello.c - A hello world program.
+ */
+
+#include "toys.h"
+
+int hello_main(void)
+{
+ printf("Hello world\n");
+ return 0;
+}