X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Ffile_utils.cc;h=6cf43f3fd2bfd3324895151c4b8bc4a274246b4d;hb=a0558694dfdb2a89d54e22d30916ea0118b39301;hp=1f72ce240895d25c03dd839f7794c727829426bd;hpb=2397429e99d4b79ae874392665db2627674daaa0;p=ardour.git diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index 1f72ce2408..6cf43f3fd2 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -440,29 +440,31 @@ remove_directory_internal (const string& dir, size_t* size, vector* path get_paths (tmp_paths, dir, just_remove_files, true); for (vector::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