diff options
| author | Karel Zak | 2013-03-13 12:13:55 +0100 |
|---|---|---|
| committer | Karel Zak | 2013-03-13 12:13:55 +0100 |
| commit | 907624ebb0afdeb6ef6ca4b57dfbe713e6011fac (patch) | |
| tree | 59121dd32c9e49b02d57c4348144b2b68949666f /sys-utils/flock.c | |
| parent | include: add timer.h (diff) | |
| download | kernel-qcow2-util-linux-907624ebb0afdeb6ef6ca4b57dfbe713e6011fac.tar.gz kernel-qcow2-util-linux-907624ebb0afdeb6ef6ca4b57dfbe713e6011fac.tar.xz kernel-qcow2-util-linux-907624ebb0afdeb6ef6ca4b57dfbe713e6011fac.zip | |
flock: use include/timer.h
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/flock.c')
| -rw-r--r-- | sys-utils/flock.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/sys-utils/flock.c b/sys-utils/flock.c index 0ae8f3bf9..07f3484f6 100644 --- a/sys-utils/flock.c +++ b/sys-utils/flock.c @@ -43,6 +43,7 @@ #include "nls.h" #include "strutils.h" #include "closestream.h" +#include "timer.h" static void __attribute__((__noreturn__)) usage(int ex) { @@ -75,22 +76,6 @@ static void timeout_handler(int sig __attribute__((__unused__))) timeout_expired = 1; } -static void setup_timer(struct itimerval *timer, struct itimerval *old_timer, - struct sigaction *sa, struct sigaction *old_sa) -{ - memset(sa, 0, sizeof *sa); - sa->sa_handler = timeout_handler; - sa->sa_flags = SA_RESETHAND; - sigaction(SIGALRM, sa, old_sa); - setitimer(ITIMER_REAL, timer, old_timer); -} - -static void cancel_timer(struct itimerval *old_timer, struct sigaction *old_sa) -{ - setitimer(ITIMER_REAL, old_timer, NULL); - sigaction(SIGALRM, old_sa, NULL); -} - static int open_file(const char *filename, int *flags) { @@ -138,7 +123,7 @@ int main(int argc, char *argv[]) int conflict_exit_code = 1; char **cmd_argv = NULL, *sh_c_argv[4]; const char *filename = NULL; - struct sigaction sa, old_sa; + struct sigaction old_sa; static const struct option long_options[] = { {"shared", no_argument, NULL, 's'}, @@ -249,7 +234,7 @@ int main(int argc, char *argv[]) have_timeout = 0; block = LOCK_NB; } else - setup_timer(&timeout, &old_timer, &sa, &old_sa); + setup_timer(&timeout, &old_timer, &old_sa, timeout_handler); } while (flock(fd, type | block)) { |