r3997 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2009-11-20 19:04:51 +0000 (Fri, 20 Nov 2009)
New Revision: 3997
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update - remove() with POSIX conforming variant of unlink()
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-20 15:38:22 UTC (rev 3996)
+++ glibc-package/trunk/debian/changelog 2009-11-20 19:04:51 UTC (rev 3997)
@@ -18,7 +18,7 @@
* rules.d/debhelper.mk: don't use --strip-unneeded when stripping .o
objects. Closes: #556951.
* patches/any/submitted-bits-fcntl_h-at.diff: new patch to move AT_*
- constants from <fcntl.h> to <bits/fcntl.h>.
+ constants from <fcntl.h> to <bits/fcntl.h>. Closes: #555303.
* Replace patches/any/submitted-sched_h.2.diff by upstream version
patches/any/cvs-sched_h.diff.
* Use gcc/g++-4.4 on sparc.
@@ -27,8 +27,8 @@
* patches/hppa/local-stack-grows-up.diff: new version.
[ Petr Salinger]
- * kfreebsd/local-sysdeps.diff: update to revision 2855 (from glibc-bsd).
- Closes: #555303.
+ * kfreebsd/local-sysdeps.diff: update to revision 2859 (from glibc-bsd).
+ Closes: #557248.
-- Aurelien Jarno <aurel32@debian.org> Fri, 20 Nov 2009 01:18:11 +0100
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-11-20 15:38:22 UTC (rev 3996)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-11-20 19:04:51 UTC (rev 3997)
@@ -4698,7 +4698,7 @@
+ (__extension__ \
+ ({ size_t __cpu = (cpu); \
+ __cpu < 8 * (setsize) \
-+ ? ((((const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
++ ? ((((__const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
+ & __CPUMASK (__cpu))) != 0 \
+ : 0; }))
+
@@ -4711,8 +4711,8 @@
+# else
+# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
+ (__extension__ \
-+ ({ __cpu_mask *__arr1 = (cpusetp1)->__bits; \
-+ __cpu_mask *__arr2 = (cpusetp2)->__bits; \
++ ({ __const __cpu_mask *__arr1 = (cpusetp1)->__bits; \
++ __const __cpu_mask *__arr2 = (cpusetp2)->__bits; \
+ size_t __imax = (setsize) / sizeof (__cpu_mask); \
+ size_t __i; \
+ for (__i = 0; __i < __imax; ++__i) \
@@ -4724,8 +4724,8 @@
+# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
+ (__extension__ \
+ ({ cpu_set_t *__dest = (destset); \
-+ __cpu_mask *__arr1 = (srcset1)->__bits; \
-+ __cpu_mask *__arr2 = (srcset2)->__bits; \
++ __const __cpu_mask *__arr1 = (srcset1)->__bits; \
++ __const __cpu_mask *__arr2 = (srcset2)->__bits; \
+ size_t __imax = (setsize) / sizeof (__cpu_mask); \
+ size_t __i; \
+ for (__i = 0; __i < __imax; ++__i) \
@@ -19476,6 +19476,49 @@
+
+LIBC_CANCEL_HANDLED (); /* in __libc_recvfrom */
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/remove.c
+@@ -0,0 +1,40 @@
++/* ANSI C `remove' function to delete a file or directory. POSIX.1 version.
++ Copyright (C) 1995,96,97,2002,2003 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
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <errno.h>
++#include <stdio.h>
++#include <unistd.h>
++
++int
++remove (file)
++ const char *file;
++{
++ /* First try to unlink since this is more frequently the necessary action. */
++ if (__unlink (file) != 0
++ /* If it is indeed a directory... */
++ /* Linux returns EISDIR, POSIX mandates EPERM */
++ && (((errno != EISDIR) && (errno != EPERM))
++ /* ...try to remove it. */
++ || __rmdir (file) != 0))
++ /* Cannot remove the object for whatever reason. */
++ return -1;
++
++ return 0;
++}
++libc_hidden_def (remove)
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/renameat.c
@@ -0,0 +1,175 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
Reply to: