[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 81b5a3f271d237a17f9cea63717580d642ddf62e
Author: Clint Adams <schizo at debian.org>
Date:   Mon Oct 8 00:26:06 2007 +0000

    Apply patch from Jan Kluka to avoid possibility of faked dropping into an endless loop with nonexistent save file.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-132

diff --git a/debian/changelog b/debian/changelog
index d7a588d..b2d614e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fakeroot (1.8.1) unstable; urgency=low
+
+  * Apply patch from Jan Kluka to avoid possibility of faked dropping
+    into an endless loop with nonexistent save file.
+
+ -- Clint Adams <schizo at debian.org>  Sun, 07 Oct 2007 20:24:04 -0400
+
 fakeroot (1.8) unstable; urgency=medium
 
   * Apply patch from Jan Kluka to fix up database saving.
diff --git a/faked.c b/faked.c
index c289c8f..33763f9 100644
--- a/faked.c
+++ b/faked.c
@@ -468,7 +468,12 @@ int save_database(const uint32_t remote)
     int r,fd=0;
     struct stat s;
     r=stat(save_file,&s);
-    if (r<0 && errno != ENOENT) return EOF;
+    if (r<0) {
+       if (errno == ENOENT)
+	  break;
+       else
+	  return EOF;
+    }
     if (!(s.st_mode&S_IFIFO)) break;
     fd=open(save_file,O_WRONLY|O_NONBLOCK);
     if (fd<0) {

-- 
fakeroot