Merge in the cal applet from Steve Merrifield <steve@labyrinth.net.au>

2 files changed, 11 insertions, 0 deletions

diff --git a/include/applets.h b/include/applets.h
index b543de1bc..ba0a9aaa9 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -71,6 +71,9 @@
 #ifdef CONFIG_BUNZIP2
         APPLET(bzcat, bunzip2_main, _BB_DIR_USR_BIN)
 #endif
+#ifdef CONFIG_CAL
+        APPLET(cal, cal_main, _BB_DIR_USR_BIN)
+#endif
 #ifdef CONFIG_CAT
         APPLET(cat, cat_main, _BB_DIR_BIN)
 #endif
diff --git a/include/usage.h b/include/usage.h
index 14d16561f..3475d99f0 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -63,6 +63,14 @@
 #define bzcat_full_usage \
         "Uncompress to stdout."
 
+#define cal_trivial_usage \
+       "[-jy] [[month] year]"
+#define cal_full_usage \
+       "Display a calendar.\n" \
+       "\nOptions:\n" \
+       "\t-j\tUse julian dates.\n" \
+       "\t-y\tDisplay the entire year."
+
 #define cat_trivial_usage \
         "[FILE]..."
 #define cat_full_usage \