ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flock: move long_options struct to function scope 

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-09-21 20:55:50 +02:00
parent 75332f0f2b
commit d89bfedff5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys-utils/flock.c
View File

@ -41,20 +41,6 @@
#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);