Deleted Added
full compact
rm_r.c (243897) rm_r.c (285433)
1/*-
2 * Copyright (C) 1996
3 * David L. Nugent. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 12 unchanged lines hidden (view full) ---

21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#ifndef lint
28static const char rcsid[] =
1/*-
2 * Copyright (C) 1996
3 * David L. Nugent. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 12 unchanged lines hidden (view full) ---

21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#ifndef lint
28static const char rcsid[] =
29 "$FreeBSD: head/usr.sbin/pw/rm_r.c 243897 2012-12-05 13:56:52Z eadler $";
29 "$FreeBSD: head/usr.sbin/pw/rm_r.c 285433 2015-07-12 21:43:57Z bapt $";
30#endif /* not lint */
31
32#include <stdio.h>
33#include <stdlib.h>
34#include <string.h>
35#include <sys/types.h>
36#include <sys/stat.h>
37#include <sys/param.h>
38#include <unistd.h>
39#include <dirent.h>
30#endif /* not lint */
31
32#include <stdio.h>
33#include <stdlib.h>
34#include <string.h>
35#include <sys/types.h>
36#include <sys/stat.h>
37#include <sys/param.h>
38#include <unistd.h>
39#include <dirent.h>
40#include <fcntl.h>
40
41#include "pwupd.h"
42
43void
41
42#include "pwupd.h"
43
44void
44rm_r(char const * dir, uid_t uid)
45rm_r(int rootfd, const char *path, uid_t uid)
45{
46{
46 DIR *d = opendir(dir);
47 int dirfd;
48 DIR *d;
49 struct dirent *e;
50 struct stat st;
47
51
48 if (d != NULL) {
49 struct dirent *e;
50 struct stat st;
51 char file[MAXPATHLEN];
52 if (*path == '/')
53 path++;
52
54
53 while ((e = readdir(d)) != NULL) {
54 if (strcmp(e->d_name, ".") != 0 && strcmp(e->d_name, "..") != 0) {
55 snprintf(file, sizeof(file), "%s/%s", dir, e->d_name);
56 if (lstat(file, &st) == 0) { /* Need symlinks, not
57 * linked file */
58 if (S_ISDIR(st.st_mode)) /* Directory - recurse */
59 rm_r(file, uid);
60 else {
61 if (S_ISLNK(st.st_mode) || st.st_uid == uid)
62 remove(file);
63 }
64 }
65 }
66 }
67 closedir(d);
68 if (lstat(dir, &st) == 0) {
69 if (S_ISLNK(st.st_mode))
70 remove(dir);
71 else if (st.st_uid == uid)
72 rmdir(dir);
73 }
55 dirfd = openat(rootfd, path, O_DIRECTORY);
56
57 d = fdopendir(dirfd);
58 while ((e = readdir(d)) != NULL) {
59 if (strcmp(e->d_name, ".") == 0 || strcmp(e->d_name, "..") == 0)
60 continue;
61
62 if (fstatat(dirfd, e->d_name, &st, AT_SYMLINK_NOFOLLOW) != 0)
63 continue;
64 if (S_ISDIR(st.st_mode))
65 rm_r(dirfd, e->d_name, uid);
66 else if (S_ISLNK(st.st_mode) || st.st_uid == uid)
67 unlinkat(dirfd, e->d_name, 0);
74 }
68 }
69 closedir(d);
70 if (fstatat(rootfd, path, &st, AT_SYMLINK_NOFOLLOW) != 0)
71 return;
72 unlinkat(rootfd, path, S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0);
75}
73}