Rob Sullivan sent in some cleanups, which I beat on slightly.

git-svn-id: svn://busybox.net/trunk/busybox@11946 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 16 insertions, 62 deletions

diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index e988400eb..7bfe54fc1 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -4,7 +4,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <time.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -76,40 +75,20 @@ int makedevs_main(int argc, char **argv)
 
 #elif defined CONFIG_FEATURE_MAKEDEVS_TABLE
 
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
+/* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */
 
 extern int makedevs_main(int argc, char **argv)
 {
-        int opt;
         FILE *table = stdin;
         char *rootdir = NULL;
         char *line = NULL;
         int linenum = 0;
         int ret = EXIT_SUCCESS;
 
-        while ((opt = getopt(argc, argv, "d:")) != -1) {
-                switch(opt) {
-                        case 'd':
-                                table = bb_xfopen((line=optarg), "r");
-                                break;
-                        default:
-                                bb_show_usage();
-                }
-        }
+        unsigned long flags;
+        flags = bb_getopt_ulflags(argc, argv, "d:", &line);
+        if (line)
+                table = bb_xfopen(line, "r");
 
         if (optind >= argc || (rootdir=argv[optind])==NULL) {
                 bb_error_msg_and_die("root directory not specified");
@@ -159,16 +138,9 @@ extern int makedevs_main(int argc, char **argv)
                 if (name[0] == '#') {
                         continue;
                 }
-                if (group) {
-                        gid = get_ug_id(group, bb_xgetgrnam);
-                } else {
-                        gid = getgid();
-                }
-                if (user) {
-                        uid = get_ug_id(user, bb_xgetpwnam);
-                } else {
-                        uid = getuid();
-                }
+                
+                gid = group ? get_ug_id(group, bb_xgetgrnam) : getgid();
+                uid = user ? get_ug_id(user, bb_xgetpwnam) : getuid();
                 full_name = concat_path_file(rootdir, name);
 
                 if (type == 'd') {
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 276fadebd..4b00e50c6 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 #include <stdio.h>
@@ -40,19 +27,14 @@ static void watchdog_shutdown(int unused)
         exit(0);
 }
 
-extern int watchdog_main(int argc, char **argv)
+int watchdog_main(int argc, char **argv)
 {
-        int opt;
-
-        while ((opt = getopt(argc, argv, "t:")) > 0) {
-                switch (opt) {
-                        case 't':
-                                timer_duration = bb_xgetlarg(optarg, 10, 0, INT_MAX);
-                                break;
-                        default:
-                                bb_show_usage();
-                }
-        }
+        
+        char *t_arg;
+        unsigned long flags;
+        flags = bb_getopt_ulflags(argc, argv, "t:", &t_arg);
+        if (flags & 1)
+                timer_duration = bb_xgetlarg(t_arg, 10, 0, INT_MAX);
 
         /* We're only interested in the watchdog device .. */
         if (optind < argc - 1 || argc == 1)