flock: fix coding style
Sanitize indentation, spacing, brace positions, comment line lenghts and positions etc. This commit does not change a thing in code. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola
parent
1d803460f7
commit
75332f0f2b
|
|
@ -1,6 +1,4 @@
|
|||
/* ----------------------------------------------------------------------- *
|
||||
*
|
||||
* Copyright 2003-2005 H. Peter Anvin - All Rights Reserved
|
||||
/* Copyright 2003-2005 H. Peter Anvin - All Rights Reserved
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person
|
||||
* obtaining a copy of this software and associated documentation
|
||||
|
|
@ -22,313 +20,317 @@
|
|||
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* ----------------------------------------------------------------------- */
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <getopt.h>
|
||||
#include <paths.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <getopt.h>
|
||||
#include <signal.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <paths.h>
|
||||
#include <sysexits.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#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 }
|
||||
{"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)
|
||||
{
|
||||
fputs(_("\nUsage:\n"), stderr);
|
||||
fprintf(stderr,
|
||||
_(" %1$s [-sxun][-w #] fd#\n"
|
||||
" %1$s [-sxon][-w #] file [-c] command...\n"
|
||||
" %1$s [-sxon][-w #] directory [-c] command...\n"), program);
|
||||
fputs(_("\nUsage:\n"), stderr);
|
||||
fprintf(stderr,
|
||||
_(" %1$s [-sxun][-w #] fd#\n"
|
||||
" %1$s [-sxon][-w #] file [-c] command...\n"
|
||||
" %1$s [-sxon][-w #] directory [-c] command...\n"), program);
|
||||
|
||||
fputs(_("\nOptions:\n"), stderr);
|
||||
fputs(_(" -s --shared Get a shared lock\n"
|
||||
" -x --exclusive Get an exclusive lock\n"
|
||||
" -u --unlock Remove a lock\n"
|
||||
" -n --nonblock Fail rather than wait\n"
|
||||
" -w --timeout Wait for a limited amount of time\n"
|
||||
" -o --close Close file descriptor before running command\n"
|
||||
" -c --command Run a single command string through the shell\n"
|
||||
" -h --help Display this text\n"
|
||||
" -V --version Display version\n\n"), stderr);
|
||||
exit(ex);
|
||||
fputs(_("\nOptions:\n"), stderr);
|
||||
fputs(_(" -s --shared Get a shared lock\n"
|
||||
" -x --exclusive Get an exclusive lock\n"
|
||||
" -u --unlock Remove a lock\n"
|
||||
" -n --nonblock Fail rather than wait\n"
|
||||
" -w --timeout Wait for a limited amount of time\n"
|
||||
" -o --close Close file descriptor before running command\n"
|
||||
" -c --command Run a single command string through the shell\n"
|
||||
" -h --help Display this text\n"
|
||||
" -V --version Display version\n\n"), stderr);
|
||||
exit(ex);
|
||||
}
|
||||
|
||||
|
||||
static sig_atomic_t timeout_expired = 0;
|
||||
|
||||
static void timeout_handler(int sig)
|
||||
{
|
||||
(void)sig;
|
||||
|
||||
timeout_expired = 1;
|
||||
(void)sig;
|
||||
timeout_expired = 1;
|
||||
}
|
||||
|
||||
|
||||
static char * strtotimeval(const char *str, struct timeval *tv)
|
||||
static char *strtotimeval(const char *str, struct timeval *tv)
|
||||
{
|
||||
char *s;
|
||||
long fs; /* Fractional seconds */
|
||||
int i;
|
||||
char *s;
|
||||
/* Fractional seconds */
|
||||
long fs;
|
||||
int i;
|
||||
|
||||
tv->tv_sec = strtol(str, &s, 10);
|
||||
fs = 0;
|
||||
|
||||
if ( *s == '.' ) {
|
||||
s++;
|
||||
|
||||
for ( i = 0 ; i < 6 ; i++ ) {
|
||||
if ( !isdigit(*s) )
|
||||
break;
|
||||
|
||||
fs *= 10;
|
||||
fs += *s++ - '0';
|
||||
}
|
||||
|
||||
for ( ; i < 6; i++ )
|
||||
fs *= 10;
|
||||
|
||||
while ( isdigit(*s) )
|
||||
s++;
|
||||
}
|
||||
|
||||
tv->tv_usec = fs;
|
||||
return s;
|
||||
tv->tv_sec = strtol(str, &s, 10);
|
||||
fs = 0;
|
||||
if (*s == '.') {
|
||||
s++;
|
||||
for (i = 0; i < 6; i++) {
|
||||
if (!isdigit(*s))
|
||||
break;
|
||||
fs *= 10;
|
||||
fs += *s++ - '0';
|
||||
}
|
||||
for (; i < 6; i++)
|
||||
fs *= 10;
|
||||
while (isdigit(*s))
|
||||
s++;
|
||||
}
|
||||
tv->tv_usec = fs;
|
||||
return s;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
struct itimerval timeout, old_timer;
|
||||
int have_timeout = 0;
|
||||
int type = LOCK_EX;
|
||||
int block = 0;
|
||||
int open_accmode;
|
||||
int fd = -1;
|
||||
int opt, ix;
|
||||
int do_close = 0;
|
||||
int err;
|
||||
int status;
|
||||
char *eon;
|
||||
char **cmd_argv = NULL, *sh_c_argv[4];
|
||||
const char *filename = NULL;
|
||||
struct sigaction sa, old_sa;
|
||||
struct itimerval timeout, old_timer;
|
||||
int have_timeout = 0;
|
||||
int type = LOCK_EX;
|
||||
int block = 0;
|
||||
int open_accmode;
|
||||
int fd = -1;
|
||||
int opt, ix;
|
||||
int do_close = 0;
|
||||
int err;
|
||||
int status;
|
||||
char *eon;
|
||||
char **cmd_argv = NULL, *sh_c_argv[4];
|
||||
const char *filename = NULL;
|
||||
struct sigaction sa, old_sa;
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
bindtextdomain(PACKAGE, LOCALEDIR);
|
||||
textdomain(PACKAGE);
|
||||
setlocale(LC_ALL, "");
|
||||
bindtextdomain(PACKAGE, LOCALEDIR);
|
||||
textdomain(PACKAGE);
|
||||
|
||||
program = argv[0];
|
||||
program = argv[0];
|
||||
|
||||
if ( argc < 2 )
|
||||
usage(EX_USAGE);
|
||||
if (argc < 2)
|
||||
usage(EX_USAGE);
|
||||
|
||||
memset(&timeout, 0, sizeof timeout);
|
||||
memset(&timeout, 0, sizeof timeout);
|
||||
|
||||
optopt = 0;
|
||||
while ( (opt = getopt_long(argc, argv, "+sexnouw:hV?", long_options, &ix)) != EOF ) {
|
||||
switch(opt) {
|
||||
case 's':
|
||||
type = LOCK_SH;
|
||||
break;
|
||||
case 'e':
|
||||
case 'x':
|
||||
type = LOCK_EX;
|
||||
break;
|
||||
case 'u':
|
||||
type = LOCK_UN;
|
||||
break;
|
||||
case 'o':
|
||||
do_close = 1;
|
||||
break;
|
||||
case 'n':
|
||||
block = LOCK_NB;
|
||||
break;
|
||||
case 'w':
|
||||
have_timeout = 1;
|
||||
eon = strtotimeval(optarg, &timeout.it_value);
|
||||
if ( *eon )
|
||||
usage(EX_USAGE);
|
||||
break;
|
||||
case 'V':
|
||||
printf("flock (%s)\n", PACKAGE_STRING);
|
||||
exit(0);
|
||||
default:
|
||||
/* optopt will be set if this was an unrecognized option, i.e. *not* 'h' or '?' */
|
||||
usage(optopt ? EX_USAGE : 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
optopt = 0;
|
||||
while ((opt =
|
||||
getopt_long(argc, argv, "+sexnouw:hV?", long_options,
|
||||
&ix)) != EOF) {
|
||||
switch (opt) {
|
||||
case 's':
|
||||
type = LOCK_SH;
|
||||
break;
|
||||
case 'e':
|
||||
case 'x':
|
||||
type = LOCK_EX;
|
||||
break;
|
||||
case 'u':
|
||||
type = LOCK_UN;
|
||||
break;
|
||||
case 'o':
|
||||
do_close = 1;
|
||||
break;
|
||||
case 'n':
|
||||
block = LOCK_NB;
|
||||
break;
|
||||
case 'w':
|
||||
have_timeout = 1;
|
||||
eon = strtotimeval(optarg, &timeout.it_value);
|
||||
if (*eon)
|
||||
usage(EX_USAGE);
|
||||
break;
|
||||
case 'V':
|
||||
printf("flock (%s)\n", PACKAGE_STRING);
|
||||
exit(0);
|
||||
default:
|
||||
/* optopt will be set if this was an unrecognized
|
||||
* option, i.e. *not* 'h' or '?
|
||||
*/
|
||||
usage(optopt ? EX_USAGE : 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( argc > optind+1 ) {
|
||||
/* Run command */
|
||||
if (argc > optind + 1) {
|
||||
/* Run command */
|
||||
if (!strcmp(argv[optind + 1], "-c") ||
|
||||
!strcmp(argv[optind + 1], "--command")) {
|
||||
if (argc != optind + 3) {
|
||||
fprintf(stderr,
|
||||
_("%s: %s requires exactly one command argument\n"),
|
||||
program, argv[optind + 1]);
|
||||
exit(EX_USAGE);
|
||||
}
|
||||
cmd_argv = sh_c_argv;
|
||||
cmd_argv[0] = getenv("SHELL");
|
||||
if (!cmd_argv[0] || !*cmd_argv[0])
|
||||
cmd_argv[0] = _PATH_BSHELL;
|
||||
cmd_argv[1] = "-c";
|
||||
cmd_argv[2] = argv[optind + 2];
|
||||
cmd_argv[3] = 0;
|
||||
} else {
|
||||
cmd_argv = &argv[optind + 1];
|
||||
}
|
||||
|
||||
if ( !strcmp(argv[optind+1], "-c") ||
|
||||
!strcmp(argv[optind+1], "--command") ) {
|
||||
filename = argv[optind];
|
||||
open_accmode =
|
||||
((type == LOCK_SH
|
||||
|| access(filename,
|
||||
R_OK | W_OK) < 0) ? O_RDONLY : O_RDWR);
|
||||
fd = open(filename, open_accmode | O_NOCTTY | O_CREAT, 0666);
|
||||
/* Linux doesn't like O_CREAT on a directory, even though it
|
||||
* should be a no-op; POSIX doesn't allow O_RDWR or O_WRONLY
|
||||
*/
|
||||
if (fd < 0 && errno == EISDIR)
|
||||
fd = open(filename, O_RDONLY | O_NOCTTY);
|
||||
|
||||
if ( argc != optind+3 ) {
|
||||
fprintf(stderr, _("%s: %s requires exactly one command argument\n"),
|
||||
program, argv[optind+1]);
|
||||
exit(EX_USAGE);
|
||||
}
|
||||
if (fd < 0) {
|
||||
err = errno;
|
||||
fprintf(stderr, _("%s: cannot open lock file %s: %s\n"),
|
||||
program, argv[optind], strerror(err));
|
||||
exit((err == ENOMEM || err == EMFILE
|
||||
|| err == ENFILE) ? EX_OSERR : (err == EROFS
|
||||
|| err ==
|
||||
ENOSPC) ?
|
||||
EX_CANTCREAT : EX_NOINPUT);
|
||||
}
|
||||
} else if (optind < argc) {
|
||||
/* Use provided file descriptor */
|
||||
fd = (int)strtol(argv[optind], &eon, 10);
|
||||
if (*eon || !argv[optind]) {
|
||||
fprintf(stderr, _("%s: bad number: %s\n"), program,
|
||||
argv[optind]);
|
||||
exit(EX_USAGE);
|
||||
}
|
||||
} else {
|
||||
/* Bad options */
|
||||
fprintf(stderr,
|
||||
_("%s: requires file descriptor, file or directory\n"),
|
||||
program);
|
||||
exit(EX_USAGE);
|
||||
}
|
||||
|
||||
cmd_argv = sh_c_argv;
|
||||
if (have_timeout) {
|
||||
if (timeout.it_value.tv_sec == 0 &&
|
||||
timeout.it_value.tv_usec == 0) {
|
||||
/* -w 0 is equivalent to -n; this has to be
|
||||
* special-cased because setting an itimer to zero
|
||||
* means disabled!
|
||||
*/
|
||||
have_timeout = 0;
|
||||
block = LOCK_NB;
|
||||
} else {
|
||||
memset(&sa, 0, sizeof sa);
|
||||
sa.sa_handler = timeout_handler;
|
||||
sa.sa_flags = SA_RESETHAND;
|
||||
sigaction(SIGALRM, &sa, &old_sa);
|
||||
setitimer(ITIMER_REAL, &timeout, &old_timer);
|
||||
}
|
||||
}
|
||||
|
||||
cmd_argv[0] = getenv("SHELL");
|
||||
if ( !cmd_argv[0] || !*cmd_argv[0] )
|
||||
cmd_argv[0] = _PATH_BSHELL;
|
||||
while (flock(fd, type | block)) {
|
||||
switch ((err = errno)) {
|
||||
case EWOULDBLOCK:
|
||||
/* -n option set and failed to lock */
|
||||
exit(1);
|
||||
case EINTR:
|
||||
/* Signal received */
|
||||
if (timeout_expired)
|
||||
/* -w option set and failed to lock */
|
||||
exit(1);
|
||||
/* otherwise try again */
|
||||
continue;
|
||||
default:
|
||||
/* Other errors */
|
||||
if (filename)
|
||||
fprintf(stderr, "%s: %s: %s\n", program,
|
||||
filename, strerror(err));
|
||||
else
|
||||
fprintf(stderr, "%s: %d: %s\n", program, fd,
|
||||
strerror(err));
|
||||
exit((err == ENOLCK
|
||||
|| err == ENOMEM) ? EX_OSERR : EX_DATAERR);
|
||||
}
|
||||
}
|
||||
|
||||
cmd_argv[1] = "-c";
|
||||
cmd_argv[2] = argv[optind+2];
|
||||
cmd_argv[3] = 0;
|
||||
} else {
|
||||
cmd_argv = &argv[optind+1];
|
||||
}
|
||||
if (have_timeout) {
|
||||
/* Cancel itimer */
|
||||
setitimer(ITIMER_REAL, &old_timer, NULL);
|
||||
/* Cancel signal handler */
|
||||
sigaction(SIGALRM, &old_sa, NULL);
|
||||
}
|
||||
|
||||
filename = argv[optind];
|
||||
open_accmode = ((type == LOCK_SH || access(filename, R_OK|W_OK) < 0) ?
|
||||
O_RDONLY : O_RDWR);
|
||||
fd = open(filename, open_accmode|O_NOCTTY|O_CREAT, 0666);
|
||||
/* Linux doesn't like O_CREAT on a directory, even though it should be a
|
||||
no-op; POSIX doesn't allow O_RDWR or O_WRONLY */
|
||||
if (fd < 0 && errno == EISDIR)
|
||||
fd = open(filename, O_RDONLY|O_NOCTTY);
|
||||
status = 0;
|
||||
|
||||
if ( fd < 0 ) {
|
||||
err = errno;
|
||||
fprintf(stderr, _("%s: cannot open lock file %s: %s\n"),
|
||||
program, argv[optind], strerror(err));
|
||||
exit((err == ENOMEM||err == EMFILE||err == ENFILE) ? EX_OSERR :
|
||||
(err == EROFS||err == ENOSPC) ? EX_CANTCREAT :
|
||||
EX_NOINPUT);
|
||||
}
|
||||
if (cmd_argv) {
|
||||
pid_t w, f;
|
||||
/* Clear any inherited settings */
|
||||
signal(SIGCHLD, SIG_DFL);
|
||||
f = fork();
|
||||
|
||||
} else if (optind < argc) {
|
||||
/* Use provided file descriptor */
|
||||
if (f < 0) {
|
||||
err = errno;
|
||||
fprintf(stderr, _("%s: fork failed: %s\n"), program,
|
||||
strerror(err));
|
||||
exit(EX_OSERR);
|
||||
} else if (f == 0) {
|
||||
if (do_close)
|
||||
close(fd);
|
||||
execvp(cmd_argv[0], cmd_argv);
|
||||
err = errno;
|
||||
/* execvp() failed */
|
||||
fprintf(stderr, "%s: %s: %s\n", program, cmd_argv[0],
|
||||
strerror(err));
|
||||
_exit((err == ENOMEM) ? EX_OSERR : EX_UNAVAILABLE);
|
||||
} else {
|
||||
do {
|
||||
w = waitpid(f, &status, 0);
|
||||
if (w == -1 && errno != EINTR)
|
||||
break;
|
||||
} while (w != f);
|
||||
|
||||
fd = (int)strtol(argv[optind], &eon, 10);
|
||||
if ( *eon || !argv[optind] ) {
|
||||
fprintf(stderr, _("%s: bad number: %s\n"), program, argv[optind]);
|
||||
exit(EX_USAGE);
|
||||
}
|
||||
if (w == -1) {
|
||||
err = errno;
|
||||
status = EXIT_FAILURE;
|
||||
fprintf(stderr, "%s: waitpid failed: %s\n",
|
||||
program, strerror(err));
|
||||
} else if (WIFEXITED(status))
|
||||
status = WEXITSTATUS(status);
|
||||
else if (WIFSIGNALED(status))
|
||||
status = WTERMSIG(status) + 128;
|
||||
else
|
||||
/* WTF? */
|
||||
status = EX_OSERR;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
/* Bad options */
|
||||
|
||||
fprintf(stderr, _("%s: requires file descriptor, file or directory\n"),
|
||||
program);
|
||||
exit(EX_USAGE);
|
||||
}
|
||||
|
||||
|
||||
if ( have_timeout ) {
|
||||
if ( timeout.it_value.tv_sec == 0 &&
|
||||
timeout.it_value.tv_usec == 0 ) {
|
||||
/* -w 0 is equivalent to -n; this has to be special-cased
|
||||
because setting an itimer to zero means disabled! */
|
||||
|
||||
have_timeout = 0;
|
||||
block = LOCK_NB;
|
||||
} else {
|
||||
memset(&sa, 0, sizeof sa);
|
||||
|
||||
sa.sa_handler = timeout_handler;
|
||||
sa.sa_flags = SA_RESETHAND;
|
||||
sigaction(SIGALRM, &sa, &old_sa);
|
||||
|
||||
setitimer(ITIMER_REAL, &timeout, &old_timer);
|
||||
}
|
||||
}
|
||||
|
||||
while ( flock(fd, type|block) ) {
|
||||
switch( (err = errno) ) {
|
||||
case EWOULDBLOCK: /* -n option set and failed to lock */
|
||||
exit(1);
|
||||
case EINTR: /* Signal received */
|
||||
if ( timeout_expired )
|
||||
exit(1); /* -w option set and failed to lock */
|
||||
continue; /* otherwise try again */
|
||||
default: /* Other errors */
|
||||
if ( filename )
|
||||
fprintf(stderr, "%s: %s: %s\n", program, filename, strerror(err));
|
||||
else
|
||||
fprintf(stderr, "%s: %d: %s\n", program, fd, strerror(err));
|
||||
exit((err == ENOLCK||err == ENOMEM) ? EX_OSERR : EX_DATAERR);
|
||||
}
|
||||
}
|
||||
|
||||
if ( have_timeout ) {
|
||||
setitimer(ITIMER_REAL, &old_timer, NULL); /* Cancel itimer */
|
||||
sigaction(SIGALRM, &old_sa, NULL); /* Cancel signal handler */
|
||||
}
|
||||
|
||||
status = 0;
|
||||
|
||||
if ( cmd_argv ) {
|
||||
pid_t w, f;
|
||||
|
||||
/* Clear any inherited settings */
|
||||
signal(SIGCHLD, SIG_DFL);
|
||||
f = fork();
|
||||
|
||||
if ( f < 0 ) {
|
||||
err = errno;
|
||||
fprintf(stderr, _("%s: fork failed: %s\n"), program, strerror(err));
|
||||
exit(EX_OSERR);
|
||||
} else if ( f == 0 ) {
|
||||
if ( do_close )
|
||||
close(fd);
|
||||
execvp(cmd_argv[0], cmd_argv);
|
||||
err = errno;
|
||||
/* execvp() failed */
|
||||
fprintf(stderr, "%s: %s: %s\n", program, cmd_argv[0], strerror(err));
|
||||
_exit((err == ENOMEM) ? EX_OSERR: EX_UNAVAILABLE);
|
||||
} else {
|
||||
do {
|
||||
w = waitpid(f, &status, 0);
|
||||
if (w == -1 && errno != EINTR)
|
||||
break;
|
||||
} while ( w != f );
|
||||
|
||||
if (w == -1) {
|
||||
err = errno;
|
||||
status = EXIT_FAILURE;
|
||||
fprintf(stderr, "%s: waitpid failed: %s\n", program, strerror(err));
|
||||
} else if ( WIFEXITED(status) )
|
||||
status = WEXITSTATUS(status);
|
||||
else if ( WIFSIGNALED(status) )
|
||||
status = WTERMSIG(status) + 128;
|
||||
else
|
||||
status = EX_OSERR; /* WTF? */
|
||||
}
|
||||
}
|
||||
|
||||
return status;
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue