Module Name: src
Committed By: tron
Date: Thu Feb 7 13:57:40 UTC 2013
Modified Files:
src/usr.bin/flock: flock.c
Log Message:
Don't crash if "flock" is used to lock a file descriptor e.g. via
"flock --nb 8".
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/flock/flock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/flock/flock.c
diff -u src/usr.bin/flock/flock.c:1.6 src/usr.bin/flock/flock.c:1.7
--- src/usr.bin/flock/flock.c:1.6 Fri Nov 2 17:03:16 2012
+++ src/usr.bin/flock/flock.c Thu Feb 7 13:57:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: flock.c,v 1.6 2012/11/02 17:03:16 christos Exp $ */
+/* $NetBSD: flock.c,v 1.7 2013/02/07 13:57:40 tron Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: flock.c,v 1.6 2012/11/02 17:03:16 christos Exp $");
+__RCSID("$NetBSD: flock.c,v 1.7 2013/02/07 13:57:40 tron Exp $");
#include <stdio.h>
#include <string.h>
@@ -212,9 +212,12 @@ main(int argc, char *argv[])
if (cls)
usage("Close is valid only for descriptors");
fd = strtol(argv[0], NULL, 0); // XXX: error checking
- if (debug)
+ if (debug) {
fprintf(stderr, "descriptor %s lock %s\n",
argv[0], lock2name(lock));
+ }
+ break;
+
default:
if ((lock & LOCK_NB) == LOCK_UN)
usage("Unlock is only valid for descriptors");
