[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r1674 -
From:       codesite-noreply () google ! com
Date:       2008-08-25 18:03:12
Message-ID: 000e0cd22cd8c412a404554c99e2 () google ! com
[Download RAW message or body]

Author: cristian.debian
Date: Mon Aug 25 11:02:49 2008
New Revision: 1674

Modified:
    branches/cristian/fusioniso/fusioniso/src/fs.c

Log:
backport r1673 from trunk (lionel.tricon):

Fixed a small issue with RMDIR (bad return value since fstat is called
after rmdir, thus errno is badly filled)



Modified: branches/cristian/fusioniso/fusioniso/src/fs.c
==============================================================================
--- branches/cristian/fusioniso/fusioniso/src/fs.c	(original)
+++ branches/cristian/fusioniso/fusioniso/src/fs.c	Mon Aug 25 11:02:49 2008
@@ -1238,7 +1238,7 @@
      char ppath[FS_MAXPATH];
      char *newpath=ppath;
      struct stat v_stbuf;
-    int retval;
+    int retval, errno2;
      FSDEBUG("path=%s",path);
      isofs_inode *inode = fs_lookup(path);
      if (inode)
@@ -1252,6 +1252,7 @@
          case 0:
              FSDEBUG("#1 rmdir(%s)",newpath);
              retval = rmdir(newpath);
+	    errno2 = errno;
              // If the file exist on disk,
              // we keep the file name in a list
              if (lstat(path,&v_stbuf) == 0)
@@ -1260,7 +1261,8 @@
                  g_hash_table_insert(removed_lookup_table, g_strdup(path),  
removed_value);
                  return 0;
              }
-            return retval;
+            if (retval == 0) return 0;
+	    return -errno2;
          case -1:
              // If the file exist on disk,
              // we keep the file name in a list
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]