Libc-391.2.5.tar.gz

diff --git a/darwin/copyfile.c b/darwin/copyfile.c
index bb28d554daebf7ae310ece97bbc1d93a9e61d8e0..4934f2bb16f7f808905da6bb614b1f7593aedfcd 100644 (file)
--- a/darwin/copyfile.c
+++ b/darwin/copyfile.c
@@ -143,6 +143,9 @@ int copyfile(const char *src, const char *dst, copyfile_state_t state, copyfile_
            }
        } else if (COPYFILE_UNPACK & flags)
        {
+           if (!(COPYFILE_STAT & flags || COPYFILE_ACL & flags))
+               fix_perms = !copyfile_fix_perms(s, &original_fsec, 1);
+
            if (copyfile_unpack(s) < 0)
                ret = -1;
        } else

diff --git a/gen/scalable_malloc.c b/gen/scalable_malloc.c
index b47e48e1cf34c96b15e07ba42024a35f5129b2a6..386aab480646d62a839ba433ef2fad61f95cf56d 100644 (file)
--- a/gen/scalable_malloc.c
+++ b/gen/scalable_malloc.c
@@ -603,7 +603,7 @@ allocate_pages(szone_t *szone, size_t size, unsigned char align, unsigned debug_
     boolean_t          add_guard_pages = debug_flags & SCALABLE_MALLOC_ADD_GUARD_PAGES;
     size_t             allocation_size = round_page(size);
     size_t             delta;
-    
+
     if (align) add_guard_pages = 0; // too cumbersome to deal with that
     if (!allocation_size) allocation_size = 1 << vm_page_shift;
     if (add_guard_pages) allocation_size += 2 * (1 << vm_page_shift);
@@ -3075,7 +3075,10 @@ szone_malloc_should_clear(szone_t *szone, size_t size, boolean_t cleared_request
     } else {
        // large or huge
        num_pages = round_page(size) >> vm_page_shift;
-       ptr = large_and_huge_malloc(szone, num_pages);
+       if (num_pages == 0)     /* Overflowed */
+               ptr = 0;
+       else
+               ptr = large_and_huge_malloc(szone, num_pages);
     }
 #if DEBUG_MALLOC
     if (LOG(szone, ptr))

diff --git a/i386/sys/Makefile.inc b/i386/sys/Makefile.inc
index c0dcbf4fe8b4f54468263e862616f1fb5b8655f7..9535aa140de255d790edef5281c1275b44875cdb 100644 (file)
--- a/i386/sys/Makefile.inc
+++ b/i386/sys/Makefile.inc
@@ -161,7 +161,6 @@ MDSRCS+=  ATPgetreq.s \
        sem_post.s \
        sem_trywait.s \
        sem_wait.s \
-       semconfig.s \
        semget.s \
        semop.s \
        semsys.s \

diff --git a/i386/sys/SYS.h b/i386/sys/SYS.h
index 1212eb0a49c5f92492a90bb3428e5b4ade893787..83ac264ede9fa3642121043390c1cbcd3ce09e51 100644 (file)
--- a/i386/sys/SYS.h
+++ b/i386/sys/SYS.h
@@ -90,7 +90,7 @@ LEAF(_##pseudo, 0)                                    ;\
 #define SYS_semctl      254
 #define SYS_semget      255
 #define SYS_semop       256
-#define SYS_semconfig   257
+/*#define SYS_semconfig   257*/
 #define SYS_msgctl      258
 #define SYS_msgget      259
 #define SYS_msgsnd      260

diff --git a/i386/sys/semconfig.s b/i386/sys/semconfig.s
deleted file mode 100644 (file)
index c1dbeba..0000000
--- a/i386/sys/semconfig.s
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved
- */
-#include "SYS.h"
-
-UNIX_SYSCALL(semconfig, 3)
-       ret

diff --git a/ppc/sys/Makefile.inc b/ppc/sys/Makefile.inc
index c4216971a1b2c6f2ea4ef6809c7024756d7bf1ec..36b80fb368d412c439a613a61a35f7a5dca2ac04 100644 (file)
--- a/ppc/sys/Makefile.inc
+++ b/ppc/sys/Makefile.inc
@@ -165,7 +165,6 @@ MDSRCS+=  ATPgetreq.s \
        sem_post.s \
        sem_trywait.s \
        sem_wait.s \
-       semconfig.s \
        semget.s \
        semop.s \
        semsys.s \

diff --git a/ppc/sys/semconfig.s b/ppc/sys/semconfig.s
deleted file mode 100644 (file)
index 3ea04d7..0000000
--- a/ppc/sys/semconfig.s
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#include "SYS.h"
-
-SYSCALL(semconfig, 3)
-

diff --git a/ppc64/sys/Makefile.inc b/ppc64/sys/Makefile.inc
index 458942313d0d23d48b268f2dd20750b66428e889..edd7fe77da02490c073c98b9194f2d3c68dbab86 100644 (file)
--- a/ppc64/sys/Makefile.inc
+++ b/ppc64/sys/Makefile.inc
@@ -168,7 +168,6 @@ MDSRCS+=  ATPgetreq.s \
        sem_post.s \
        sem_trywait.s \
        sem_wait.s \
-       semconfig.s \
        semctl.s \
        semget.s \
        semop.s \