| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: lockd.c,v 1.11 2012/08/13 12:22:21 pgoyette Exp $ */ | | 1 | /* $NetBSD: lockd.c,v 1.12 2012/08/13 12:37:18 wiz Exp $ */ |
2 | | | 2 | |
3 | /* | | 3 | /* |
4 | * Copyright (c) 1995 | | 4 | * Copyright (c) 1995 |
5 | * A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved. | | 5 | * A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved. |
6 | * | | 6 | * |
7 | * Redistribution and use in source and binary forms, with or without | | 7 | * Redistribution and use in source and binary forms, with or without |
8 | * modification, are permitted provided that the following conditions | | 8 | * modification, are permitted provided that the following conditions |
9 | * are met: | | 9 | * are met: |
10 | * 1. Redistributions of source code must retain the above copyright | | 10 | * 1. Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. | | 11 | * notice, this list of conditions and the following disclaimer. |
12 | * 2. Redistributions in binary form must reproduce the above copyright | | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | | 13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | | 14 | * documentation and/or other materials provided with the distribution. |
| @@ -25,27 +25,27 @@ | | | @@ -25,27 +25,27 @@ |
25 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | | 25 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE |
26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | | 26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
27 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | | 27 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
28 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | | 28 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
29 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | | 29 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
30 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | | 30 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
31 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | | 31 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
32 | * SUCH DAMAGE. | | 32 | * SUCH DAMAGE. |
33 | * | | 33 | * |
34 | */ | | 34 | */ |
35 | | | 35 | |
36 | #include <sys/cdefs.h> | | 36 | #include <sys/cdefs.h> |
37 | #ifndef lint | | 37 | #ifndef lint |
38 | __RCSID("$NetBSD: lockd.c,v 1.11 2012/08/13 12:22:21 pgoyette Exp $"); | | 38 | __RCSID("$NetBSD: lockd.c,v 1.12 2012/08/13 12:37:18 wiz Exp $"); |
39 | #endif | | 39 | #endif |
40 | | | 40 | |
41 | /* | | 41 | /* |
42 | * main() function for NFS lock daemon. Most of the code in this | | 42 | * main() function for NFS lock daemon. Most of the code in this |
43 | * file was generated by running rpcgen /usr/include/rpcsvc/nlm_prot.x. | | 43 | * file was generated by running rpcgen /usr/include/rpcsvc/nlm_prot.x. |
44 | * | | 44 | * |
45 | * The actual program logic is in the file lock_proc.c | | 45 | * The actual program logic is in the file lock_proc.c |
46 | */ | | 46 | */ |
47 | | | 47 | |
48 | #include <sys/types.h> | | 48 | #include <sys/types.h> |
49 | #include <sys/socket.h> | | 49 | #include <sys/socket.h> |
50 | | | 50 | |
51 | #include <err.h> | | 51 | #include <err.h> |
| @@ -224,17 +224,17 @@ main(int argc, char **argv) | | | @@ -224,17 +224,17 @@ main(int argc, char **argv) |
224 | return 1; | | 224 | return 1; |
225 | } | | 225 | } |
226 | | | 226 | |
227 | static void | | 227 | static void |
228 | /*ARGSUSED*/ | | 228 | /*ARGSUSED*/ |
229 | sigalarm_handler(int s) | | 229 | sigalarm_handler(int s) |
230 | { | | 230 | { |
231 | grace_expired = 1; | | 231 | grace_expired = 1; |
232 | } | | 232 | } |
233 | | | 233 | |
234 | static void | | 234 | static void |
235 | usage(void) | | 235 | usage(void) |
236 | { | | 236 | { |
237 | (void)fprintf(stderr, "Usage: %s[-d <debuglevel>] [-g <grace period>]", | | 237 | (void)fprintf(stderr, "Usage: %s [-46] [-d debug_level] [-g grace_period]\n", |
238 | getprogname()); | | 238 | getprogname()); |
239 | exit(1); | | 239 | exit(1); |
240 | } | | 240 | } |