diff options
| author | Ben Wijen <ben@wijen.net> | 2021-01-22 16:47:12 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2021-01-25 19:57:46 +0100 |
| commit | f4cac1217e76b30afb55e680a909fa8a62b6088e (patch) | |
| tree | fef3b1a2c786cee36f1935053af3fea606f9fa50 | |
| parent | 460eb128cb514c32a8c8b4be17eeb8ce3b888d6b (diff) | |
| download | cygnal-f4cac1217e76b30afb55e680a909fa8a62b6088e.tar.gz cygnal-f4cac1217e76b30afb55e680a909fa8a62b6088e.tar.bz2 cygnal-f4cac1217e76b30afb55e680a909fa8a62b6088e.zip | |
syscalls.cc: Deduplicate remove
The remove code is already in the _remove_r function.
So, just call the _remove_r function.
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index b3a110aaa..4cc8d07f5 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1161,24 +1161,15 @@ _remove_r (struct _reent *, const char *ourname) return -1; } - return win32_name.isdir () ? rmdir (ourname) : unlink (ourname); + int res = win32_name.isdir () ? rmdir (ourname) : unlink (ourname); + syscall_printf ("%R = remove(%s)", res, ourname); + return res; } extern "C" int remove (const char *ourname) { - path_conv win32_name (ourname, PC_SYM_NOFOLLOW); - - if (win32_name.error) - { - set_errno (win32_name.error); - syscall_printf ("-1 = remove (%s)", ourname); - return -1; - } - - int res = win32_name.isdir () ? rmdir (ourname) : unlink (ourname); - syscall_printf ("%R = remove(%s)", res, ourname); - return res; + return _remove_r (_REENT, ourname); } extern "C" pid_t |