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

* delqueue.cc (delqueue_list::queue_file): Add some debugging.

Browse Source 
* path.h (class path_conv): Add a char * operator for the most common case.
* syscalls.cc (_unlink): Rewrite to use FILE_FLAG_DELETE_ON_CLOSE when possible
(i.e., on NT).
This commit is contained in:
Christopher Faylor 2000-03-18 06:26:14 +00:00
parent 03261851a1
commit 87b82db4e7
4 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
Sat Mar 18 01:24:25 2000 Christopher Faylor <cgf@cygnus.com>
* delqueue.cc (delqueue_list::queue_file): Add some debugging.
* path.h (class path_conv): Add a char * operator for the most common
case.
* syscalls.cc (_unlink): Rewrite to use FILE_FLAG_DELETE_ON_CLOSE when
possible (i.e., on NT).
Fri Mar 17 18:16:00 2000 Corinna Vinschen <corinna@vinschen.de> Fri Mar 17 18:16:00 2000 Corinna Vinschen <corinna@vinschen.de>
Patch suggested by Eric Fifer <EFifer@sanwaint.com> Patch suggested by Eric Fifer <EFifer@sanwaint.com>

1
winsup/cygwin/delqueue.cc
View File

@ -54,6 +54,7 @@ delqueue_list::queue_file (const char *dosname)
strcpy(name[i], temp); strcpy(name[i], temp);
inuse[i] = 1; inuse[i] = 1;
empty = 0; empty = 0;
debug_printf ("adding '%s' to queue %d", temp, i);
return; return;
} }

1
winsup/cygwin/path.h
View File

@ -66,6 +66,7 @@ class path_conv
path_conv (const char * const, symlink_follow follow_mode = SYMLINK_FOLLOW, path_conv (const char * const, symlink_follow follow_mode = SYMLINK_FOLLOW,
int use_full_path = 0, const suffix_info *suffixes = NULL); int use_full_path = 0, const suffix_info *suffixes = NULL);
inline char *get_win32 () { return path; } inline char *get_win32 () { return path; }
operator char *() {return path; }
BOOL is_device () {return devn != FH_BAD;} BOOL is_device () {return devn != FH_BAD;}
DWORD get_devn () {return devn == FH_BAD ? (DWORD) FH_DISK : devn;} DWORD get_devn () {return devn == FH_BAD ? (DWORD) FH_DISK : devn;}
short get_unitn () {return devn == FH_BAD ? 0 : unit;} short get_unitn () {return devn == FH_BAD ? 0 : unit;}

57
winsup/cygwin/syscalls.cc
View File

@ -67,17 +67,39 @@ _unlink (const char *ourname)
} }
/* Windows won't check the directory mode, so we do that ourselves. */ /* Windows won't check the directory mode, so we do that ourselves. */
if (! writable_directory (win32_name.get_win32 ())) if (!writable_directory (win32_name))
{ {
syscall_printf ("non-writable directory"); syscall_printf ("non-writable directory");
goto done; goto done;
} }
if (DeleteFileA (win32_name.get_win32 ())) for (int i = 0; i < 2; i++)
res = 0;
else
{ {
if (DeleteFile (win32_name))
{
syscall_printf ("DeleteFile succeeded");
res = 0;
break;
}
/* FIXME: There's a race here. */
HANDLE h = CreateFile (win32_name, GENERIC_READ,
FILE_SHARE_READ,
&sec_none_nih, OPEN_EXISTING,
FILE_FLAG_DELETE_ON_CLOSE, 0);
if (h != INVALID_HANDLE_VALUE)
{
CloseHandle (h);
syscall_printf ("CreateFile/CloseHandle succeeded");
res = 0;
break;
}
if (i > 0)
goto err;
res = GetLastError (); res = GetLastError ();
syscall_printf ("couldn't delete file, %E");
/* if access denied, chmod to be writable in case it is not /* if access denied, chmod to be writable in case it is not
and try again */ and try again */
@ -85,29 +107,26 @@ _unlink (const char *ourname)
and only try again if permissions are not sufficient */ and only try again if permissions are not sufficient */
if (res == ERROR_ACCESS_DENIED) if (res == ERROR_ACCESS_DENIED)
{ {
/* chmod ourname to be writable here */ /* chmod file to be writable here */
res = chmod (ourname, 0777); if (chmod (win32_name, 0777) == 0)
continue;
if (DeleteFileA (win32_name.get_win32 ())) else
{ goto err;
res = 0;
goto done;
}
res = GetLastError ();
} }
/* If we get ERROR_SHARING_VIOLATION, the file may still be open - /* If we get ERROR_SHARING_VIOLATION, the file may still be open -
Windows NT doesn't support deleting a file while it's open. */ Windows NT doesn't support deleting a file while it's open. */
if (res == ERROR_SHARING_VIOLATION) if (res == ERROR_SHARING_VIOLATION)
{ {
cygwin_shared->delqueue.queue_file (win32_name.get_win32 ()); cygwin_shared->delqueue.queue_file (win32_name);
res = 0; res = 0;
break;
} }
else
{ err:
__seterrno (); __seterrno ();
res = -1; res = -1;
} break;
} }
done: done: