From d6d7189c26aa1c3f1bb8ac622e5daf43b8485c30 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 12 Jul 2015 21:43:57 +0000
Subject: pw -R <rootdir> userdel can now cleanup installation

Rewrite rm_r to use *at function, allowing to remove home directories along with
users. only crontabs and at(1) installation are not removed

Relnotes:	yes
---
 pw/rm_r.c | 52 +++++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

(limited to 'pw/rm_r.c')

diff --git a/pw/rm_r.c b/pw/rm_r.c
index 797ca9d..65a63e6 100644
--- a/pw/rm_r.c
+++ b/pw/rm_r.c
@@ -37,39 +37,37 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <fcntl.h>
 
 #include "pwupd.h"
 
 void
-rm_r(char const * dir, uid_t uid)
+rm_r(int rootfd, const char *path, uid_t uid)
 {
-	DIR            *d = opendir(dir);
+	int dirfd;
+	DIR *d;
+	struct dirent  *e;
+	struct stat     st;
 
-	if (d != NULL) {
-		struct dirent  *e;
-		struct stat     st;
-		char            file[MAXPATHLEN];
+	if (*path == '/')
+		path++;
 
-		while ((e = readdir(d)) != NULL) {
-			if (strcmp(e->d_name, ".") != 0 && strcmp(e->d_name, "..") != 0) {
-				snprintf(file, sizeof(file), "%s/%s", dir, e->d_name);
-				if (lstat(file, &st) == 0) {	/* Need symlinks, not
-								 * linked file */
-					if (S_ISDIR(st.st_mode))	/* Directory - recurse */
-						rm_r(file, uid);
-					else {
-						if (S_ISLNK(st.st_mode) || st.st_uid == uid)
-							remove(file);
-					}
-				}
-			}
-		}
-		closedir(d);
-		if (lstat(dir, &st) == 0) {
-			if (S_ISLNK(st.st_mode))
-				remove(dir);
-			else if (st.st_uid == uid)
-				rmdir(dir);
-		}
+	dirfd = openat(rootfd, path, O_DIRECTORY);
+
+	d = fdopendir(dirfd);
+	while ((e = readdir(d)) != NULL) {
+		if (strcmp(e->d_name, ".") == 0 || strcmp(e->d_name, "..") == 0)
+			continue;
+
+		if (fstatat(dirfd, e->d_name, &st, AT_SYMLINK_NOFOLLOW) != 0)
+			continue;
+		if (S_ISDIR(st.st_mode))
+			rm_r(dirfd, e->d_name, uid);
+		else if (S_ISLNK(st.st_mode) || st.st_uid == uid)
+			unlinkat(dirfd, e->d_name, 0);
 	}
+	closedir(d);
+	if (fstatat(rootfd, path, &st, AT_SYMLINK_NOFOLLOW) != 0)
+		return;
+	unlinkat(rootfd, path, S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0);
 }
-- 
cgit v1.2.3