AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 06:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle POSIX-compliant errno value of unlink in remove.

Browse Source
This commit is contained in:
Ulrich Drepper 2010-04-04 02:08:37 -07:00
parent 952df0afdc
commit cb652f30b0
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2010-04-04 Ulrich Drepper <drepper@redhat.com>
[BZ #11276]
* sysdeps/posix/remove.c (IS_NO_DIRECTORY_ERROR): Define.
(remove): Use IS_NO_DIRECTORY_ERROR to check for file being no
directory.
* sysdeps/unix/sysv/linux/remove.c: New file.
* conform/data/sys/stat.h-data: Fix testing of S_IS* macros.
[BZ #11279]

10
sysdeps/posix/remove.c
View File

@ -1,5 +1,5 @@
/* ANSI C `remove' function to delete a file or directory. POSIX.1 version.
Copyright (C) 1995,96,97,2002,2003 Free Software Foundation, Inc.
Copyright (C) 1995,96,97,2002,2003,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -21,6 +21,12 @@
#include <stdio.h>
#include <unistd.h>
#ifndef IS_NO_DIRECTORY_ERROR
# define IS_NO_DIRECTORY_ERROR errno != EPERM
#endif
int
remove (file)
const char *file;
@ -28,7 +34,7 @@ remove (file)
/* First try to unlink since this is more frequently the necessary action. */
if (__unlink (file) != 0
/* If it is indeed a directory... */
&& (errno != EISDIR
&& (IS_NO_DIRECTORY_ERROR
/* ...try to remove it. */
|| __rmdir (file) != 0))
/* Cannot remove the object for whatever reason. */

2
sysdeps/unix/sysv/linux/remove.c Normal file
View File

@ -0,0 +1,2 @@
#define IS_NO_DIRECTORY_ERROR errno != EISDIR
#include <sysdeps/posix/remove.c>