JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler.h (fhandler_base::close_fs): Reintroduce (as inline function)

Browse Source 
for clearness.
	* fhandler_disk_file.cc (fhandler_base::fstat_fs): Revert previous
	change.
	(fhandler_base::open_fs): Ditto.
	* fhandler_socket.cc (fhandler_socket::close): Ditto.
This commit is contained in:
Corinna Vinschen 2007-08-13 19:15:47 +00:00
parent a9a6f94229
commit deafd19cea
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2007-08-13 Corinna Vinschen <corinna@vinschen.de>
* fhandler.h (fhandler_base::close_fs): Reintroduce (as inline function)
for clearness.
* fhandler_disk_file.cc (fhandler_base::fstat_fs): Revert previous
change.
(fhandler_base::open_fs): Ditto.
* fhandler_socket.cc (fhandler_socket::close): Ditto.
2007-08-13 Corinna Vinschen <corinna@vinschen.de> 2007-08-13 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in (DLL_OFILES): Remove delqueue.o. * Makefile.in (DLL_OFILES): Remove delqueue.o.

1
winsup/cygwin/fhandler.h
View File

@ -264,6 +264,7 @@ class fhandler_base
virtual int open (int, mode_t = 0); virtual int open (int, mode_t = 0);
int open_fs (int, mode_t = 0); int open_fs (int, mode_t = 0);
virtual int close (); virtual int close ();
int close_fs () { return fhandler_base::close (); }
virtual int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2))); virtual int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
int __stdcall fstat_fs (struct __stat64 *buf) __attribute__ ((regparm (2))); int __stdcall fstat_fs (struct __stat64 *buf) __attribute__ ((regparm (2)));
int __stdcall fstat_helper (struct __stat64 *buf, int __stdcall fstat_helper (struct __stat64 *buf,

4
winsup/cygwin/fhandler_disk_file.cc
View File

@ -437,7 +437,7 @@ fhandler_base::fstat_fs (struct __stat64 *buf)
res = fstat_by_handle (buf); res = fstat_by_handle (buf);
bool no_handle = nohandle (); bool no_handle = nohandle ();
nohandle (false); nohandle (false);
close (); close_fs ();
nohandle (no_handle); nohandle (no_handle);
set_io_handle (NULL); set_io_handle (NULL);
} }
@ -1257,7 +1257,7 @@ fhandler_base::open_fs (int flags, mode_t mode)
if (pc.has_buggy_open () && !pc.exists ()) if (pc.has_buggy_open () && !pc.exists ())
{ {
debug_printf ("Buggy open detected."); debug_printf ("Buggy open detected.");
close (); close_fs ();
set_errno (ENOENT); set_errno (ENOENT);
return 0; return 0;
} }

3
winsup/cygwin/fhandler_socket.cc
View File

@ -1391,9 +1391,6 @@ fhandler_socket::close ()
{ {
int res = 0; int res = 0;
if (get_device () == FH_UNIX)
return fhandler_base::close ();
/* HACK to allow a graceful shutdown even if shutdown() hasn't been /* HACK to allow a graceful shutdown even if shutdown() hasn't been
called by the application. Note that this isn't the ultimate called by the application. Note that this isn't the ultimate
solution but it helps in many cases. */ solution but it helps in many cases. */