Sometimes temporary directories were not being deleted

sailfishos · Feb 19, 2014 · 4f18d52 · 4f18d52
1 parent 0c20bc8
commit 4f18d52
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/mms-lib/include/mms_message.h b/mms-lib/include/mms_message.h
@@ -35,6 +35,7 @@ struct _mms_message {
     MMS_PRIORITY priority;                  /* Message priority */
     char* cls;                              /* Message class */
     gboolean read_report_req;               /* Request for read report */
+    char* msg_dir;                          /* Delete when done if empty */
     char* parts_dir;                        /* Where parts are stored */
     GSList* parts;                          /* Message parts */
     int flags;                              /* Message flags: */

diff --git a/mms-lib/src/mms_file_util.c b/mms-lib/src/mms_file_util.c
@@ -28,8 +28,10 @@ mms_remove_file_and_dir(
     const char* file)
 {
     char* dir = g_path_get_dirname(file);
-    remove(file);
-    remove(dir);
+    unlink(file);
+    if (rmdir(dir) == 0) {
+        MMS_VERBOSE("Deleted %s", dir);
+    }
     g_free(dir);
 }
 

diff --git a/mms-lib/src/mms_message.c b/mms-lib/src/mms_message.c
@@ -52,9 +52,21 @@ mms_message_finalize(
     g_slist_foreach(msg->parts, mms_message_part_free, msg);
     g_slist_free(msg->parts);
     if (msg->parts_dir) {
-        if (!(msg->flags & MMS_MESSAGE_FLAG_KEEP_FILES)) remove(msg->parts_dir);
+        if (!(msg->flags & MMS_MESSAGE_FLAG_KEEP_FILES)) {
+            if (rmdir(msg->parts_dir) == 0) {
+                MMS_VERBOSE("Deleted %s", msg->parts_dir);
+            }
+        }
         g_free(msg->parts_dir);
     }
+    if (msg->msg_dir) {
+        if (!(msg->flags & MMS_MESSAGE_FLAG_KEEP_FILES)) {
+            if (rmdir(msg->msg_dir) == 0) {
+                MMS_VERBOSE("Deleted %s", msg->msg_dir);
+            }
+        }
+        g_free(msg->msg_dir);
+    }
 }
 
 MMSMessage*

diff --git a/mms-lib/src/mms_task.c b/mms-lib/src/mms_task.c
@@ -118,8 +118,17 @@ mms_task_finalize(
     MMS_VERBOSE_("%p", task);
     MMS_ASSERT(!task->delegate);
     MMS_ASSERT(!task->wakeup_id);
+    if (task->id) {
+        if (!task->config->keep_temp_files) {
+            char* dir = mms_task_dir(task);
+            if (rmdir(dir) == 0) {
+                MMS_VERBOSE("Deleted %s", dir);
+            }
+            g_free(dir);
+        }
+        g_free(task->id);
+    }
     g_free(task->name);
-    g_free(task->id);
     g_free(task->imsi);
     mms_handler_unref(task->handler);
     G_OBJECT_CLASS(mms_task_parent_class)->finalize(object);

diff --git a/mms-lib/src/mms_task_decode.c b/mms-lib/src/mms_task_decode.c
@@ -124,6 +124,7 @@ mms_task_decode_process_retrieve_conf(
     }
 
     msg->id = g_strdup(task->id);
+    msg->msg_dir = g_strdup(dir);
     msg->message_id = g_strdup(rc->msgid);
     msg->from = mms_strip_address_type(g_strdup(rc->from));
     msg->to = mms_split_address_list(rc->to);