| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: t_paths.c,v 1.15 2015/05/07 01:35:35 pgoyette Exp $ */ | | 1 | /* $NetBSD: t_paths.c,v 1.16 2015/05/07 06:23:23 pgoyette Exp $ */ |
2 | | | 2 | |
3 | /*- | | 3 | /*- |
4 | * Copyright (c) 2011 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 2011 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 Jukka Ruohonen. | | 8 | * by Jukka Ruohonen. |
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. |
| @@ -19,27 +19,27 @@ | | | @@ -19,27 +19,27 @@ |
19 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | | 19 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS |
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
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 | #include <sys/cdefs.h> | | 31 | #include <sys/cdefs.h> |
32 | __RCSID("$NetBSD: t_paths.c,v 1.15 2015/05/07 01:35:35 pgoyette Exp $"); | | 32 | __RCSID("$NetBSD: t_paths.c,v 1.16 2015/05/07 06:23:23 pgoyette Exp $"); |
33 | | | 33 | |
34 | #include <sys/param.h> | | 34 | #include <sys/param.h> |
35 | #include <sys/stat.h> | | 35 | #include <sys/stat.h> |
36 | | | 36 | |
37 | #include <errno.h> | | 37 | #include <errno.h> |
38 | #include <fcntl.h> | | 38 | #include <fcntl.h> |
39 | #include <paths.h> | | 39 | #include <paths.h> |
40 | #include <stdio.h> | | 40 | #include <stdio.h> |
41 | #include <string.h> | | 41 | #include <string.h> |
42 | #include <unistd.h> | | 42 | #include <unistd.h> |
43 | | | 43 | |
44 | #include <atf-c.h> | | 44 | #include <atf-c.h> |
45 | | | 45 | |
| @@ -150,27 +150,27 @@ ATF_TC_BODY(paths, tc) | | | @@ -150,27 +150,27 @@ ATF_TC_BODY(paths, tc) |
150 | | | 150 | |
151 | atf_tc_fail("Required path %s does " | | 151 | atf_tc_fail("Required path %s does " |
152 | "not exist", paths[i].path); | | 152 | "not exist", paths[i].path); |
153 | } | | 153 | } |
154 | break; | | 154 | break; |
155 | | | 155 | |
156 | case EPERM: /* FALLTHROUGH */ | | 156 | case EPERM: /* FALLTHROUGH */ |
157 | case EACCES: /* FALLTHROUGH */ | | 157 | case EACCES: /* FALLTHROUGH */ |
158 | | | 158 | |
159 | if ((paths[i].flags & PATH_ROOT) == 0) { | | 159 | if ((paths[i].flags & PATH_ROOT) == 0) { |
160 | | | 160 | |
161 | atf_tc_fail("UID %u failed to open %s, " | | 161 | atf_tc_fail("UID %u failed to open %s, " |
162 | "error %d", (uint32_t)uid, | | 162 | "error %d", (uint32_t)uid, |
163 | paths[i].path, error); | | 163 | paths[i].path, errno); |
164 | } | | 164 | } |
165 | | | 165 | |
166 | case EBUSY: /* FALLTHROUGH */ | | 166 | case EBUSY: /* FALLTHROUGH */ |
167 | case ENXIO: /* FALLTHROUGH */ | | 167 | case ENXIO: /* FALLTHROUGH */ |
168 | case ENOENT: /* FALLTHROUGH */ | | 168 | case ENOENT: /* FALLTHROUGH */ |
169 | | | 169 | |
170 | default: | | 170 | default: |
171 | continue; | | 171 | continue; |
172 | } | | 172 | } |
173 | } | | 173 | } |
174 | | | 174 | |
175 | (void)memset(&st, 0, sizeof(struct stat)); | | 175 | (void)memset(&st, 0, sizeof(struct stat)); |
176 | | | 176 | |