diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2001-07-18 15:00:05 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2001-07-18 15:00:05 +0400 |
| commit | 5564cd7a89d199abf6736fbf32095d30a3094c36 (patch) | |
| tree | db3a0fcd06a8122baf17e2bc148078062664e8fa | |
| parent | 78e720e152e793205e77ebe641c882bd984f111a (diff) | |
* syscalls.cc (_unlink): Explicitely check for non-existant file.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 95971881e..3818c1746 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +Wed 18 Jul 2001 11:56:00 Corinna Vinschen <corinna@vinschen.de> + + * syscalls.cc (_unlink): Explicitely check for non-existant file. + Tue 17 Jul 2001 10:19:00 Corinna Vinschen <corinna@vinschen.de> * delqueue.h: Remove obsolete file. diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 2e3f4262a..c8b9cb406 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -83,7 +83,14 @@ _unlink (const char *ourname) DWORD atts; atts = win32_name.file_attributes (); - if (atts != 0xffffffff && atts & FILE_ATTRIBUTE_DIRECTORY) + if (atts == 0xffffffff) + { + syscall_printf ("unlinking a nonexistant file"); + set_errno (ENOENT); + goto done; + } + + if (atts & FILE_ATTRIBUTE_DIRECTORY) { syscall_printf ("unlinking a directory"); set_errno (EPERM); @@ -98,7 +105,7 @@ _unlink (const char *ourname) } /* Check for shortcut as symlink condition. */ - if (atts != 0xffffffff && atts & FILE_ATTRIBUTE_READONLY) + if (atts & FILE_ATTRIBUTE_READONLY) { int len = strlen (win32_name); if (len > 4 && strcasematch (win32_name + len - 4, ".lnk")) |