Let btpd remove torrent data by itself instead of calling rm.

btpd · Jan 10, 2009 · 4457c12 · 4457c12
1 parent b5d78b0
commit 4457c12
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/btpd/tlib.c b/btpd/tlib.c
@@ -62,11 +62,22 @@ int
 tlib_del(struct tlib *tl)
 {
     char relpath[RELPATH_SIZE];
-    char cmd[PATH_MAX];
+    char path[PATH_MAX];
+    DIR *dir;
+    struct dirent *de;
     assert(tl->tp == NULL);
-    snprintf(cmd, PATH_MAX, "rm -r torrents/%s",
+    snprintf(path, PATH_MAX, "torrents/%s", bin2hex(tl->hash, relpath, 20));
-        bin2hex(tl->hash, relpath, 20));
+    if ((dir = opendir(path)) != NULL) {
-    system(cmd);
+        while ((de = readdir(dir)) != NULL) {
+            if (strcmp(".", de->d_name) == 0 || strcmp("..", de->d_name) == 0)
+                continue;
+            snprintf(path, PATH_MAX, "torrents/%s/%s", relpath, de->d_name);
+            remove(path);
+        }
+        closedir(dir);
+    }
+    snprintf(path, PATH_MAX, "torrents/%s", relpath);
+    remove(path);
     tlib_kill(tl);
     return 0;
 }