This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
RFA: Add unlink-if-ordinary to 4.0's libiberty
- From: Nick Clifton <nickc at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: nickc at redhat dot com
- Date: Wed, 13 Apr 2005 14:07:13 +0100
- Subject: RFA: Add unlink-if-ordinary to 4.0's libiberty
Hi Guys,
I am seeking approval to apply the attached patch. It is not a
regression fix however, so it may well be denied.
The patch imports the unlink-if-ordinary() function into libiberty
from the mainline GCC sources.
The motivation for this patch is that the about-to-be-released 2.16
binutils branch uses this function (in bfd/cache.c) and it would be
nice if the 2.16 binutils and 4.0 gcc sources were compatible with
each other. This is the only patch necessary for that
compatibility.
May I apply the patch ?
Cheers
Nick
<gcc-4_0-branch>/libiberty/ChangeLog
2005-04-13 Nick Clifton <nickc@redhat.com>
* Import from mainline:
* functions.texi: Document the unlink-if-ordinary function.
2005-03-28 Mark Kettenis <kettenis@gnu.org>
* unlink-if-ordinary.c: Include <sys/types.h>.
2005-03-01 Jan Beulich <jbeulich@novell.com>
* Makefile.in (CFILES): Add unlink-if-ordinary.c
(REQUIRED_OFILES): Add unlink-if-ordinary.o.
Add dependencies and rule for unlink-if-ordinary.o.
* unlink-if-ordinary.c: New.
Index: libiberty/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libiberty/Makefile.in,v
retrieving revision 1.105
diff -c -3 -p -r1.105 Makefile.in
*** libiberty/Makefile.in 27 Dec 2004 21:00:11 -0000 1.105
--- libiberty/Makefile.in 13 Apr 2005 13:07:16 -0000
*************** CFILES = alloca.c argv.c asprintf.c atex
*** 151,156 ****
--- 151,157 ----
strerror.c strncasecmp.c strncmp.c strrchr.c strsignal.c \
strstr.c strtod.c strtol.c strtoul.c \
ternary.c tmpnam.c \
+ unlink-if-ordinary.c \
vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \
waitpid.c \
xatexit.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c
*************** REQUIRED_OFILES = ./regex.o ./cplus-dem.
*** 171,176 ****
--- 172,178 ----
./safe-ctype.o ./sort.o ./spaces.o ./splay-tree.o ./strerror.o \
./strsignal.o \
./ternary.o \
+ ./unlink-if-ordinary.o \
./xatexit.o ./xexit.o ./xmalloc.o ./xmemdup.o ./xstrdup.o \
./xstrerror.o
*************** $(CONFIGURED_OFILES): stamp-picdir
*** 973,978 ****
--- 975,987 ----
else true; fi
$(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION)
+ ./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c config.h \
+ $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/unlink-if-ordinary.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/unlink-if-ordinary.c $(OUTPUT_OPTION)
+
./vasprintf.o: $(srcdir)/vasprintf.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/libiberty.h
if [ x"$(PICFLAG)" != x ]; then \
Index: libiberty/functions.texi
===================================================================
RCS file: /cvs/gcc/gcc/libiberty/functions.texi,v
retrieving revision 1.17
diff -c -3 -p -r1.17 functions.texi
*** libiberty/functions.texi 11 Jan 2005 20:22:38 -0000 1.17
--- libiberty/functions.texi 13 Apr 2005 13:07:16 -0000
*************** not be used in new projects. Use @code{
*** 1008,1013 ****
--- 1008,1023 ----
@end deftypefn
+ @c unlink-if-ordinary.c:27
+ @deftypefn Supplemental int unlink_if_ordinary (const char*)
+
+ Unlinks the named file, unless it is special (e.g. a device file).
+ Returns 0 when the file was unlinked, a negative value (and errno set) when
+ there was an error deleting the file, and a positive value if no attempt
+ was made to unlink the file because it is special.
+
+ @end deftypefn
+
@c vasprintf.c:51
@deftypefn Extension int vasprintf (char **@var{resptr}, const char *@var{format}, va_list @var{args})
*** /dev/null 2004-06-24 19:04:38.000000000 +0100
--- libiberty/unlink-if-ordinary.c 2005-04-13 13:58:14.000000000 +0100
***************
*** 0 ****
--- 1,72 ----
+ /* unlink-if-ordinary.c - remove link to a file unless it is special
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+
+ This file is part of the libiberty library. This library is free
+ software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU CC; see the file COPYING. If not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ As a special exception, if you link this library with files
+ compiled with a GNU compiler to produce an executable, this does not cause
+ the resulting executable to be covered by the GNU General Public License.
+ This exception does not however invalidate any other reasons why
+ the executable file might be covered by the GNU General Public License. */
+
+ /*
+
+ @deftypefn Supplemental int unlink_if_ordinary (const char*)
+
+ Unlinks the named file, unless it is special (e.g. a device file).
+ Returns 0 when the file was unlinked, a negative value (and errno set) when
+ there was an error deleting the file, and a positive value if no attempt
+ was made to unlink the file because it is special.
+
+ @end deftypefn
+
+ */
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+
+ #include <sys/types.h>
+
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ #if HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+
+ #include "libiberty.h"
+
+ #ifndef S_ISLNK
+ #ifdef S_IFLNK
+ #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+ #else
+ #define S_ISLNK(m) 0
+ #define lstat stat
+ #endif
+ #endif
+
+ int
+ unlink_if_ordinary (const char *name)
+ {
+ struct stat st;
+
+ if (lstat (name, &st) == 0
+ && (S_ISREG (st.st_mode) || S_ISLNK (st.st_mode)))
+ return unlink (name);
+
+ return 1;
+ }