]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
flock: move long_options struct to function scope
authorSami Kerola <kerolasa@iki.fi>
Wed, 21 Sep 2011 18:55:50 +0000 (20:55 +0200)
committerSami Kerola <kerolasa@iki.fi>
Thu, 29 Sep 2011 20:22:33 +0000 (22:22 +0200)
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
sys-utils/flock.c

index 96d4e5a3d79e1bf3883671abeadbf886bdde17a4..356c8ec784836308255fecfc2121d3f93582703d 100644 (file)
 
 #include "nls.h"
 
-static const struct option long_options[] = {
-       {"shared", 0, NULL, 's'},
-       {"exclusive", 0, NULL, 'x'},
-       {"unlock", 0, NULL, 'u'},
-       {"nonblocking", 0, NULL, 'n'},
-       {"nb", 0, NULL, 'n'},
-       {"timeout", 1, NULL, 'w'},
-       {"wait", 1, NULL, 'w'},
-       {"close", 0, NULL, 'o'},
-       {"help", 0, NULL, 'h'},
-       {"version", 0, NULL, 'V'},
-       {0, 0, 0, 0}
-};
-
 const char *program;
 
 static void usage(int ex)
@@ -129,6 +115,20 @@ int main(int argc, char *argv[])
        const char *filename = NULL;
        struct sigaction sa, old_sa;
 
+       static const struct option long_options[] = {
+               {"shared", no_argument, NULL, 's'},
+               {"exclusive", no_argument, NULL, 'x'},
+               {"unlock", no_argument, NULL, 'u'},
+               {"nonblocking", no_argument, NULL, 'n'},
+               {"nb", no_argument, NULL, 'n'},
+               {"timeout", required_argument, NULL, 'w'},
+               {"wait", required_argument, NULL, 'w'},
+               {"close", no_argument, NULL, 'o'},
+               {"help", no_argument, NULL, 'h'},
+               {"version", no_argument, NULL, 'V'},
+               {NULL, 0, NULL, 0}
+       };
+
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);