[Qemu-devel] [PATCH] Clean-up /tmp directory after -smb use

[Mark Jonckheere]

When using the -smb option with samba-3.0.28 qemu fails to completely
remove the /tmp/qemu-smb.$pid directory at exit. Newer smbd versions
also create subdirectories at this place.

This patch removes recursively all files and subdirectories.

diff -ur qemu/vl.c qemu-patched/vl.c
--- qemu/vl.c   2008-01-08 20:32:16.000000000 +0100
+++ qemu-patched/vl.c   2008-01-09 18:01:33.000000000 +0100
@@ -3772,27 +3772,35 @@
 
 char smb_dir[1024];
 
-static void smb_exit(void)
+static void erase_dir(char *dir_name)
 {
     DIR *d;
     struct dirent *de;
     char filename[1024];
 
     /* erase all the files in the directory */
-    d = opendir(smb_dir);
-    for(;;) {
-        de = readdir(d);
-        if (!de)
-            break;
-        if (strcmp(de->d_name, ".") != 0 &&
-            strcmp(de->d_name, "..") != 0) {
-            snprintf(filename, sizeof(filename), "%s/%s",
-                     smb_dir, de->d_name);
-            unlink(filename);
+    if ((d = opendir(dir_name)) != 0) {
+        for(;;) {
+            de = readdir(d);
+            if (!de)
+                break;
+            if (strcmp(de->d_name, ".") != 0 &&
+                strcmp(de->d_name, "..") != 0) {
+                snprintf(filename, sizeof(filename), "%s/%s",
+                         smb_dir, de->d_name);
+                if (unlink(filename) != 0)  /* is it a directory? */
+                    erase_dir(filename);
+            }
         }
+        closedir(d);
+        rmdir(dir_name);
     }
-    closedir(d);
-    rmdir(smb_dir);
+}
+
+/* automatic user mode samba server configuration */
+static void smb_exit(void)
+{
+    erase_dir(smb_dir);
 }
 
--