Tue Feb 16 21:26:44 2010 UTC ()
Pull up following revision(s) (requested by snj in ticket #1308):
	tools/compat/getmode.c: revision 1.8
include unistd.h where getmode is traditionally declared


(bouyer)
diff -r1.7 -r1.7.8.1 src/tools/compat/getmode.c
cvs diff -r1.7 -r1.7.8.1 src/tools/compat/getmode.c (expand / switch to unified diff)

--- src/tools/compat/getmode.c 2008/04/28 20:24:12 1.7
+++ src/tools/compat/getmode.c 2010/02/16 21:26:44 1.7.8.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: getmode.c,v 1.7 2008/04/28 20:24:12 martin Exp $ */ 1/* $NetBSD: getmode.c,v 1.7.8.1 2010/02/16 21:26:44 bouyer Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 2001 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Todd Vierling. 8 * by Todd Vierling.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -21,26 +21,27 @@ @@ -21,26 +21,27 @@
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include "nbtool_config.h" 32#include "nbtool_config.h"
33#include <stdlib.h> 33#include <stdlib.h>
 34#include <unistd.h>
34 35
35void * 36void *
36setmode(const char *str) 37setmode(const char *str)
37{ 38{
38 mode_t *mp = malloc(sizeof(mode_t)); 39 mode_t *mp = malloc(sizeof(mode_t));
39 40
40 *mp = strtoul(str, NULL, 8); 41 *mp = strtoul(str, NULL, 8);
41 42
42 return mp; 43 return mp;
43} 44}
44 45
45mode_t 46mode_t
46getmode(const void *mp, mode_t mode) 47getmode(const void *mp, mode_t mode)