Soothe Georg's minor irritation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8588 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 0ac54d349a864b9e8ea879f99633e55bfc25172f..7f5ce3ba9ac89a81fa62cff53fd3c52f4fcc45c0 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-01  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * filetools.C (DeleteAllFilesInDir): delete directories with
+       rmdir(), unlink() does not work
+
 2004-03-27  Angus Leeming  <leeming@lyx.org>
 
        * forkedcontr.C (child_handler): squash warning about a

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 5388a376f0f47868c1e3d98410febac957d4e170..4a62faf65d0ae98e39daf36f00edd4bec0055d1b 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -436,9 +436,11 @@ int DeleteAllFilesInDir(string const & path)
 
                bool deleted = true;
                FileInfo fi(unlinkpath);
-               if (fi.isOK() && fi.isDir())
+               if (fi.isOK() && fi.isDir()) {
                        deleted = (DeleteAllFilesInDir(unlinkpath) == 0);
-               deleted &= (unlink(unlinkpath) == 0);
+                       deleted &= (rmdir(unlinkpath) == 0);
+               } else
+                       deleted &= (unlink(unlinkpath) == 0);
                if (!deleted)
                        return_value = -1;
        }