From 5564cd7a89d199abf6736fbf32095d30a3094c36 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 18 Jul 2001 11:00:05 +0000 Subject: * syscalls.cc (_unlink): Explicitely check for non-existant file. --- winsup/cygwin/ChangeLog | 4 ++++ 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 + + * syscalls.cc (_unlink): Explicitely check for non-existant file. + Tue 17 Jul 2001 10:19:00 Corinna Vinschen * 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")) -- cgit v1.2.3