X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Ffile_utils.cc;h=26f80f971981965e61ca8f29c3ac4747993504c4;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=a83d116d027505f37bc110a682ac3f842285d3de;hpb=009a06a7734272560d4d61350d98a2d279832ddf;p=ardour.git

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index a83d116d02..26f80f9719 100644
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #ifdef COMPILER_MINGW
 #include <io.h> // For W_OK
@@ -57,7 +57,7 @@
 #include "pbd/scoped_file_descriptor.h"
 #include "pbd/stl_delete.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
@@ -440,29 +440,31 @@ remove_directory_internal (const string& dir, size_t* size, vector<string>* path
 	get_paths (tmp_paths, dir, just_remove_files, true);
 
 	for (vector<string>::const_iterator i = tmp_paths.begin();
-	     i != tmp_paths.end(); ++i) {
+			i != tmp_paths.end(); ++i) {
 
-                if (g_stat (i->c_str(), &statbuf)) {
+		if (g_stat (i->c_str(), &statbuf)) {
 			continue;
 		}
 
-                if (::g_remove (i->c_str())) {
-                        error << string_compose (_("cannot remove path %1 (%2)"), *i, strerror (errno))
-                              << endmsg;
-                        ret = 1;
-                }
+		if (::g_remove (i->c_str())) {
+			error << string_compose (_("cannot remove path %1 (%2)"), *i, strerror (errno))
+				<< endmsg;
+			ret = 1;
+			continue;
+		}
 
-                if (paths) {
-                        paths->push_back (Glib::path_get_basename(*i));
-                }
+		if (paths) {
+			paths->push_back (Glib::path_get_basename(*i));
+		}
 
-                if (size) {
-                        *size += statbuf.st_size;
-                }
+		// statbuf.st_size is off_t
+		if (size && statbuf.st_size > 0) {
+			*size += statbuf.st_size;
+		}
 
 	}
 
-        return ret;
+	return ret;
 }
 
 int
@@ -476,6 +478,7 @@ void
 remove_directory (const std::string& dir)
 {
 	remove_directory_internal (dir, 0, 0, false);
+	g_rmdir (dir.c_str());
 }
 
 string
@@ -500,7 +503,7 @@ toggle_file_existence (string const & path)
 {
 	if (Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
 		return g_unlink (path.c_str());
-	} 
+	}
 
 	PBD::ScopedFileDescriptor fd = g_open (path.c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666);
 	return !((int) fd >= 0);