Make uncompress a seperate applet so it doesnt pull in all the gunzip code

2 files changed, 10 insertions, 4 deletions

diff --git a/include/applets.h b/include/applets.h
index 836ed9956..1660b11c5 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -515,10 +515,8 @@
 #ifdef CONFIG_UNAME
         APPLET(uname, uname_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_GUNZIP    
-# ifdef CONFIG_FEATURE_UNCOMPRESS
-        APPLET_ODDNAME("uncompress", gunzip_main, _BB_DIR_BIN, _BB_SUID_NEVER, gunzip)
-# endif
+#ifdef CONFIG_UNCOMPRESS
+        APPLET(uncompress, uncompress_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_UNIQ
         APPLET(uniq, uniq_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
diff --git a/include/usage.h b/include/usage.h
index fb126a007..8ea8c5a92 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -2032,6 +2032,14 @@
         "$ uname -a\n" \
         "Linux debian 2.2.15pre13 #5 Tue Mar 14 16:03:50 MST 2000 i686 unknown\n" 
 
+#define uncompress_trivial_usage \
+        "[-c] [-f] [ name ... ]"
+#define uncompress_full_usage \
+        "Uncompress .Z file[s]\n" \
+        "Options:\n" \
+        "\t-c\textract to stdout\n" \
+        "\t-f\tforce overwrite an existing file\n"
+        
 #define uniq_trivial_usage \
         "[OPTION]... [INPUT [OUTPUT]]"
 #define uniq_full_usage \