Changeset 22 for trunk/samba/source/utils/smbcontrol.c

Timestamp:

Mar 25, 2007, 5:18:51 PM (19 years ago)

Author:

Yuri Dario

Message:

Source code upgrade to 3.0.25pre2.

File:

• trunk/samba/source/utils/smbcontrol.c (modified) (4 diffs)

trunk/samba/source/utils/smbcontrol.c

@@ -1146 +1146 @@
         int opt;
 
-        static struct poptOption wbinfo_options[] = {
+        static struct poptOption long_options[] = {
+                POPT_AUTOHELP
                 { "timeout", 't', POPT_ARG_INT, &timeout, 't', 
                   "Set timeout value in seconds", "TIMEOUT" },
 
-                { "configfile", 's', POPT_ARG_STRING, NULL, 's', 
-                  "Use alternative configuration file", "CONFIGFILE" },
-
-                POPT_TABLEEND
-        };
-
-        struct poptOption options[] = {
-                { NULL, 0, POPT_ARG_INCLUDE_TABLE, wbinfo_options, 0, 
-                  "Options" },
-
-                POPT_AUTOHELP
-                POPT_COMMON_VERSION
+                POPT_COMMON_SAMBA
                 POPT_TABLEEND
         };
@@ -1172 +1162 @@
 
         pc = poptGetContext(
-                "smbcontrol", argc, (const char **)argv, options, 0);
+                "smbcontrol", argc, (const char **)argv, options, 0);
 
         poptSetOtherOptionHelp(pc, "[OPTION...] <destination> <message-type> "
@@ -1183 +1173 @@
                 switch(opt) {
                 case 't':       /* --timeout */
-                        argc -= 2;
-                        break;
-                case 's':       /* --configfile */
-                        pstrcpy(dyn_CONFIGFILE, poptGetOptArg(pc));
-                        argc -= 2;
                         break;
                 default:
@@ -1201 +1186 @@
 
         argv = (const char **)poptGetArgs(pc);
-        argc--;                 /* Don't forget about argv[0] */
+        argc = 0;
+        while (argv[argc] != NULL) {
+                argc++;
+        }
 
         if (argc == 1)