This one should be able to deal with the USAGE macros a little

[oweals/busybox.git] / utility.c

diff --git a/utility.c b/utility.c
index 368dfc5feb59ef1a007df8d95cb5a2c81efd32ed..e3535966f367cbcdec3c3fa525506ccf5b0b2d38 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -25,6 +25,21 @@
  *
  */
 
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <time.h>
+#include <utime.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <sys/ioctl.h>
+#include <sys/utsname.h>               /* for uname(2) */
+
 #include "busybox.h"
 #if defined (BB_CHMOD_CHOWN_CHGRP) \
  || defined (BB_CP_MV)            \
@@ -41,20 +56,6 @@
 #define BB_DECLARE_EXTERN
 #include "messages.c"
 
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <time.h>
-#include <utime.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>               /* for uname(2) */
-
 #include "pwd_grp/pwd.h"
 #include "pwd_grp/grp.h"
 
@@ -76,12 +77,28 @@ const char mtab_file[] = "/proc/mounts";
 #  endif
 #endif
 
-extern void usage(const char *usage)
+static struct BB_applet *applet_using;
+
+extern void show_usage(void)
 {
-       fprintf(stderr, "%s\n\nUsage: %s\n\n", full_version, usage);
+       const char *format_string;
+       const char *usage_string = usage_messages;
+       int i;
+
+       for (i = applet_using - applets; i > 0; ) {
+               if (!*usage_string++) {
+                       --i;
+               }
+       }
+       format_string = "%s\n\nUsage: %s %s\n\n";
+       if(*usage_string == 0)
+               format_string = "%s\n\nNo help available.\n\n";
+       fprintf(stderr, format_string,
+                       full_version, applet_using->name, usage_string);
        exit(EXIT_FAILURE);
 }
 
+
 static void verror_msg(const char *s, va_list p)
 {
        fflush(stdout);
@@ -184,7 +201,7 @@ extern _syscall5(int, mount, const char *, special_file, const char *, dir,
                const char *, fstype, unsigned long int, rwflag, const void *, data);
 #endif
 
-#if defined BB_INSMOD || defined BB_LSMOD
+#if defined BB_FEATURE_NEW_MODULE_INTERFACE && ( defined BB_INSMOD || defined BB_LSMOD )
 #ifndef __NR_query_module
 static const int __NR_query_module = 167;
 #endif
@@ -1343,8 +1360,9 @@ extern void *xcalloc(size_t nmemb, size_t size)
 }
 #endif
 
-#if defined BB_NFSMOUNT || defined BB_LS || defined BB_SH || defined BB_WGET || \
-       defined BB_DPKG_DEB || defined BB_TAR
+#if defined BB_NFSMOUNT || defined BB_LS || defined BB_SH || \
+       defined BB_WGET || defined BB_DPKG_DEB || defined BB_TAR || \
+       defined BB_LN
 # ifndef DMALLOC
 extern char * xstrdup (const char *s) {
        char *t;
@@ -1369,15 +1387,14 @@ extern char * xstrndup (const char *s, int n) {
        if (s == NULL)
                error_msg_and_die("xstrndup bug");
 
-       t = xmalloc(n+1);
-       strncpy(t,s,n);
-       t[n] = 0;
-
-       return t;
+       t = xmalloc(++n);
+       
+       return safe_strncpy(t,s,n);
 }
 #endif
 
-#if defined BB_IFCONFIG || defined BB_ROUTE
+#if defined BB_IFCONFIG || defined BB_ROUTE || defined BB_NFSMOUNT || \
+    defined BB_FEATURE_MOUNT_LOOP
 /* Like strncpy but make sure the resulting string is always 0 terminated. */  
 extern char * safe_strncpy(char *dst, const char *src, size_t size)
 {   
@@ -1438,8 +1455,7 @@ extern int set_loop(const char *device, const char *file, int offset,
        *loopro = (mode == O_RDONLY);
 
        memset(&loopinfo, 0, sizeof(loopinfo));
-       strncpy(loopinfo.lo_name, file, LO_NAME_SIZE);
-       loopinfo.lo_name[LO_NAME_SIZE - 1] = 0;
+       safe_strncpy(loopinfo.lo_name, file, LO_NAME_SIZE);
 
        loopinfo.lo_offset = offset;
 
@@ -1676,7 +1692,7 @@ FILE *wfopen(const char *path, const char *mode)
 #if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE \
  || defined BB_SED || defined BB_SH || defined BB_TAR || defined BB_UNIQ \
  || defined BB_WC || defined BB_CMP || defined BB_SORT || defined BB_WGET \
- || defined BB_MOUNT
+ || defined BB_MOUNT || defined BB_ROUTE
 FILE *xfopen(const char *path, const char *mode)
 {
        FILE *fp;
@@ -1702,7 +1718,18 @@ struct BB_applet *find_applet_by_name(const char *name)
                        applet_name_compare);
 }
 
-#if defined BB_DD || defined BB_TAIL
+void run_applet_by_name(const char *name, int argc, char **argv)
+{
+       /* Do a binary search to find the applet entry given the name. */
+       if ((applet_using = find_applet_by_name(name)) != NULL) {
+               applet_name = applet_using->name;
+               if (argv[1] && strcmp(argv[1], "--help") == 0)
+                       show_usage();
+               exit((*(applet_using->main)) (argc, argv));
+       }
+}
+
+#if defined BB_DD || defined BB_TAIL || defined BB_STTY
 unsigned long parse_number(const char *numstr,
                const struct suffix_mult *suffixes)
 {
@@ -1715,15 +1742,21 @@ unsigned long parse_number(const char *numstr,
        if (numstr == end)
                error_msg_and_die("invalid number `%s'", numstr);
        while (end[0] != '\0') {
-               for (sm = suffixes; sm->suffix != NULL; sm++) {
-                       len = strlen(sm->suffix);
-                       if (strncmp(sm->suffix, end, len) == 0) {
-                               ret *= sm->mult;
-                               end += len;
-                               break;
-                       }
+               sm = suffixes;
+               while ( sm != 0 ) {
+                       if(sm->suffix) {
+                               len = strlen(sm->suffix);
+                               if (strncmp(sm->suffix, end, len) == 0) {
+                                       ret *= sm->mult;
+                                       end += len;
+                                       break;
+                               }
+                       sm++;
+                       
+                       } else
+                               sm = 0;
                }
-               if (sm->suffix == NULL)
+               if (sm == 0)
                        error_msg_and_die("invalid number `%s'", numstr);
        }
        return ret;