Apply a patch from Evin Robertson -- new pivot_root applet.

[oweals/busybox.git] / usage.c

diff --git a/usage.c b/usage.c
index 9ae2bb3ef6aeb4b68d607455bfb0cc8b95d20e55..13107c6e05c8a06c5455699d90e9de83712963e5 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -241,13 +241,23 @@ const char dos2unix_usage[] =
        ;
 #endif
 
+#if defined BB_DPKG
+const char dpkg_usage[] =
+       "udpkg <-i|-r|--unpack|--configure> my.deb\n"
+       "WORK IN PROGRESS, only usefull for debian-installer\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+#endif
+       ;
+#endif
+
 #if defined BB_DPKG_DEB
 const char dpkg_deb_usage[] =
         "dpkg-deb [-cexX] file directory"
 #ifndef BB_FEATURE_TRIVIAL_HELP
        "\n\nPerform actions on debian packages (.debs)\n\n"
        "Options:\n"
-       "\t-c\tList contents of filesystem tree\n"
+       "\t-c\tList contents of filesystem tree (verbose)\n"
+       "\t-l\tList contents of filesystem tree (.list format)\n"
        "\t-e\tExtract control files to directory\n"    
        "\t-x\tExctract packages filesystem tree to directory\n"
        "\t-X\tVerbose extract"
@@ -377,7 +387,15 @@ const char find_usage[] =
        "\nEXPRESSION may consist of:\n"
        "\t-follow\t\tDereference symbolic links.\n"
        "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN.\n"
-       "\t-print\t\tprint the full file name followed by a newline to stdout."
+#ifdef BB_FEATURE_FIND_TYPE
+       "\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)\n"
+#endif
+#ifdef BB_FEATURE_FIND_PERM
+       "\t-perm PERMS\tPermissions match any of (+NNN); all of (-NNN); or exactly (NNN)\n"
+#endif
+#ifdef BB_FEATURE_FIND_MTIME
+       "\t-mtime TIME\tModified time is greater than (+N); less than (-N); or exactly (N) days\n"
+#endif
 #endif
        ;
 #endif
@@ -532,6 +550,7 @@ const char id_usage[] =
        "Options:\n"
        "\t-g\tprints only the group ID\n"
        "\t-u\tprints only the user ID\n"
+       "\t-n\tprint a name instead of a number (with for -ug)\n"
        "\t-r\tprints the real user ID instead of the effective ID (with -ug)"
 #endif
        ;
@@ -545,7 +564,9 @@ const char insmod_usage[] =
        "Options:\n"
        "\t-f\tForce module to load into the wrong kernel version.\n"
        "\t-k\tMake module autoclean-able.\n"
-       "\t-v\tverbose output\n" "\t-x\tdo not export externs"
+       "\t-v\tverbose output\n" 
+       "\t-L\tLock to prevent simultaneous loads of a module\n"
+       "\t-x\tdo not export externs"
 #endif
        ;
 #endif
@@ -948,9 +969,13 @@ const char mv_usage[] =
 
 #if defined BB_NC
 const char nc_usage[] =
-       "nc [IP] [port]" 
+       "nc [-p PORT] IP PORT\n"
+       "   or: nc -l -p PORT"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-       "\n\nNetcat opens a pipe to IP:port"
+       "\n\nNetcat opens a pipe to IP:PORT\n"
+       "Options:\n"
+       "\t-l\tListen on the socket.\n"
+       "\t-p PORT\tBind the local port to PORT."
 #endif
        ;
 #endif
@@ -987,6 +1012,16 @@ const char ping_usage[] =
 #endif
 #endif
 
+#if defined BB_PIVOT_ROOT
+const char pivot_root_usage[] =
+       "pivot_root new_root put_old"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\n\nMove the current root file system to put_old and make new_root\n"
+       "the new root file system."
+#endif
+       ;
+#endif
+
 #if defined BB_POWEROFF
 const char poweroff_usage[] =
        "poweroff"
@@ -1484,6 +1519,15 @@ const char uuencode_usage[] =
        ;
 #endif
 
+#if defined BB_WATCHDOG
+const char watchdog_usage[] =
+       "watchdog dev\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPeriodically write to watchdog device \"dev\".\n"
+#endif
+       ;
+#endif
+
 #if defined BB_WC
 const char wc_usage[] =
        "wc [OPTION]... [FILE]..."