summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog9
-rw-r--r--winsup/cygwin/fhandler_disk_file.cc8
2 files changed, 13 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8cc16499284..ef73223a5c1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-29 Corinna Vinschen <corinna@vinschen.de>
+
+ * fhandler_disk_file.cc (fhandler_disk_file::fchmod): Call close_fs
+ instead of close to avoid calling close from wrong class when changing
+ a file system based device node.
+ (fhandler_disk_file::fchown): Ditto.
+ (fhandler_disk_file::facl): Ditto.
+ (fhandler_base::utimes_fs): Ditto.
+
2008-02-28 Corinna Vinschen <corinna@vinschen.de>
* exceptions.cc (_cygtls::handle_exceptions): When being debugged,
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 91d42378938..0dc31226c72 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -620,7 +620,7 @@ fhandler_disk_file::fchmod (mode_t mode)
has_changed (true);
if (oret)
- close ();
+ close_fs ();
return res;
}
@@ -663,7 +663,7 @@ fhandler_disk_file::fchown (__uid32_t uid, __gid32_t gid)
uid, gid, attrib);
}
if (oret)
- close ();
+ close_fs ();
return res;
}
@@ -756,7 +756,7 @@ fhandler_disk_file::facl (int cmd, int nentries, __aclent32_t *aclbufp)
}
if (oret)
- close ();
+ close_fs ();
return res;
}
@@ -1040,7 +1040,7 @@ fhandler_base::utimes_fs (const struct timeval *tvp)
}
if (closeit)
- close ();
+ close_fs ();
return 0;
}