Libc-1082.20.4.tar.gz

diff --git a/Libc.xcodeproj/project.pbxproj b/Libc.xcodeproj/project.pbxproj
index 1c963b076e8e7a590b88f7eca0ed1774f9342561..09565fa02c80ccf22c5b86c6795ec92f89a7be2f 100644 (file)
--- a/Libc.xcodeproj/project.pbxproj
+++ b/Libc.xcodeproj/project.pbxproj
@@ -235,7 +235,6 @@
                C9257F33138E1C8200B3107C /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; settings = {COMPILER_FLAGS = "-include gen/__dirent.h"; }; };
                C9257F34138E1C8200B3107C /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; };
                C9257F35138E1C8200B3107C /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; };
-               C9257F36138E1C8200B3107C /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; };
                C9257F37138E1C8200B3107C /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C9257F38138E1C8200B3107C /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C9257F39138E1C8200B3107C /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; settings = {COMPILER_FLAGS = "-include gen/__dirent.h"; }; };
@@ -638,7 +637,6 @@
                C94210C013900C8A004BA536 /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS___OPENDIR2 -DLIBC_ALIAS_OPENDIR -include gen/__dirent.h"; }; };
                C94210C113900C8A004BA536 /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PAUSE"; }; };
                C94210C213900C8A004BA536 /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_POPEN"; }; };
-               C94210C313900C8A004BA536 /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; settings = {COMPILER_FLAGS = "-DLIBC_ALIAS_PSELECT $(FreeBSD_CFLAGS)"; }; };
                C94210C413900C8A004BA536 /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C94210C513900C8A004BA536 /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C94210C613900C8A004BA536 /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -include gen/__dirent.h"; }; };
@@ -1177,7 +1175,6 @@
                C95B7F6B138F3C55004311DA /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; };
                C95B7F6C138F3C55004311DA /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PAUSE"; }; };
                C95B7F6D138F3C55004311DA /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_POPEN"; }; };
-               C95B7F6E138F3C55004311DA /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PSELECT"; }; };
                C95B7F6F138F3C55004311DA /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C95B7F70138F3C55004311DA /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C95B7F71138F3C55004311DA /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; };
@@ -1701,7 +1698,6 @@
                C95B8216138F52B0004311DA /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; };
                C95B8217138F52B0004311DA /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PAUSE"; }; };
                C95B8218138F52B0004311DA /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_POPEN"; }; };
-               C95B8219138F52B0004311DA /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PSELECT -U__DARWIN_NON_CANCELABLE -D__DARWIN_NON_CANCELABLE=0"; }; };
                C95B821A138F52B0004311DA /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C95B821B138F52B0004311DA /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C95B821C138F52B0004311DA /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; };
@@ -2225,7 +2221,6 @@
                C95B84BC138F53DB004311DA /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; };
                C95B84BD138F53DB004311DA /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PAUSE"; }; };
                C95B84BE138F53DB004311DA /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_POPEN"; }; };
-               C95B84BF138F53DB004311DA /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; settings = {COMPILER_FLAGS = "-DLIBC_ALIAS_PSELECT $(FreeBSD_CFLAGS) -U__DARWIN_NON_CANCELABLE -D__DARWIN_NON_CANCELABLE=0"; }; };
                C95B84C0138F53DB004311DA /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C95B84C1138F53DB004311DA /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C95B84C2138F53DB004311DA /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; };
@@ -2750,7 +2745,6 @@
                C9765F40138EC61900741512 /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; };
                C9765F41138EC61900741512 /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PAUSE -U__DARWIN_NON_CANCELABLE -D__DARWIN_NON_CANCELABLE=0"; }; };
                C9765F42138EC61900741512 /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; };
-               C9765F43138EC61900741512 /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PSELECT -U__DARWIN_NON_CANCELABLE -D__DARWIN_NON_CANCELABLE=0"; }; };
                C9765F44138EC61900741512 /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C9765F45138EC61900741512 /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C9765F46138EC61900741512 /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; };
@@ -3288,7 +3282,6 @@
                C97A701D1517AF53005E1998 /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS___OPENDIR2 -DLIBC_ALIAS_OPENDIR -include gen/__dirent.h"; }; };
                C97A701E1517AF53005E1998 /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PAUSE"; }; };
                C97A701F1517AF53005E1998 /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_POPEN"; }; };
-               C97A70201517AF53005E1998 /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; settings = {COMPILER_FLAGS = "-DLIBC_ALIAS_PSELECT $(FreeBSD_CFLAGS)"; }; };
                C97A70211517AF53005E1998 /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C97A70221517AF53005E1998 /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C97A70231517AF53005E1998 /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -include gen/__dirent.h"; }; };
@@ -3938,7 +3931,6 @@
                C9EB305B138F6D880075BB52 /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS___OPENDIR2 -DLIBC_ALIAS_OPENDIR -include gen/__dirent.h"; }; };
                C9EB305C138F6D880075BB52 /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PAUSE"; }; };
                C9EB305D138F6D880075BB52 /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_POPEN"; }; };
-               C9EB305E138F6D880075BB52 /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; settings = {COMPILER_FLAGS = "-DLIBC_ALIAS_PSELECT $(FreeBSD_CFLAGS)"; }; };
                C9EB305F138F6D880075BB52 /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C9EB3060138F6D880075BB52 /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C9EB3061138F6D880075BB52 /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -include gen/__dirent.h"; }; };
@@ -4462,7 +4454,6 @@
                C9EB3302138F75580075BB52 /* opendir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53750138D9E990028D27C /* opendir.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS___OPENDIR2 -DLIBC_ALIAS_OPENDIR -include gen/__dirent.h"; }; };
                C9EB3303138F75580075BB52 /* pause.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53753138D9E990028D27C /* pause.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_PAUSE"; }; };
                C9EB3304138F75580075BB52 /* popen.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53757138D9E990028D27C /* popen.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -DLIBC_ALIAS_POPEN"; }; };
-               C9EB3305138F75580075BB52 /* pselect.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375B138D9E990028D27C /* pselect.c */; settings = {COMPILER_FLAGS = "-DLIBC_ALIAS_PSELECT $(FreeBSD_CFLAGS)"; }; };
                C9EB3306138F75580075BB52 /* psignal.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B5375F138D9E990028D27C /* psignal.c */; };
                C9EB3307138F75580075BB52 /* raise.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53761138D9E990028D27C /* raise.c */; };
                C9EB3308138F75580075BB52 /* readdir.c in Sources */ = {isa = PBXBuildFile; fileRef = C9B53766138D9E990028D27C /* readdir.c */; settings = {COMPILER_FLAGS = "$(FreeBSD_CFLAGS) -include gen/__dirent.h"; }; };
@@ -5434,8 +5425,6 @@
                C9B53753138D9E990028D27C /* pause.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pause.c; sourceTree = "<group>"; };
                C9B53755138D9E990028D27C /* popen.3 */ = {isa = PBXFileReference; lastKnownFileType = text; path = popen.3; sourceTree = "<group>"; };
                C9B53757138D9E990028D27C /* popen.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = popen.c; sourceTree = "<group>"; };
-               C9B53759138D9E990028D27C /* pselect.3 */ = {isa = PBXFileReference; lastKnownFileType = text; path = pselect.3; sourceTree = "<group>"; };
-               C9B5375B138D9E990028D27C /* pselect.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pselect.c; sourceTree = "<group>"; };
                C9B5375D138D9E990028D27C /* psignal.3 */ = {isa = PBXFileReference; lastKnownFileType = text; path = psignal.3; sourceTree = "<group>"; };
                C9B5375F138D9E990028D27C /* psignal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = psignal.c; sourceTree = "<group>"; };
                C9B53760138D9E990028D27C /* raise.3 */ = {isa = PBXFileReference; lastKnownFileType = text; path = raise.3; sourceTree = "<group>"; };
@@ -7088,8 +7077,6 @@
                                C9B53753138D9E990028D27C /* pause.c */,
                                C9B53755138D9E990028D27C /* popen.3 */,
                                C9B53757138D9E990028D27C /* popen.c */,
-                               C9B53759138D9E990028D27C /* pselect.3 */,
-                               C9B5375B138D9E990028D27C /* pselect.c */,
                                C9B5375D138D9E990028D27C /* psignal.3 */,
                                C9B5375F138D9E990028D27C /* psignal.c */,
                                C9B53760138D9E990028D27C /* raise.3 */,
@@ -9345,7 +9332,6 @@
                                C9257F33138E1C8200B3107C /* opendir.c in Sources */,
                                C9257F34138E1C8200B3107C /* pause.c in Sources */,
                                C9257F35138E1C8200B3107C /* popen.c in Sources */,
-                               C9257F36138E1C8200B3107C /* pselect.c in Sources */,
                                C9257F37138E1C8200B3107C /* psignal.c in Sources */,
                                C9257F38138E1C8200B3107C /* raise.c in Sources */,
                                C9257F39138E1C8200B3107C /* readdir.c in Sources */,
@@ -9853,7 +9839,6 @@
                                C94210C013900C8A004BA536 /* opendir.c in Sources */,
                                C94210C113900C8A004BA536 /* pause.c in Sources */,
                                C94210C213900C8A004BA536 /* popen.c in Sources */,
-                               C94210C313900C8A004BA536 /* pselect.c in Sources */,
                                C94210C413900C8A004BA536 /* psignal.c in Sources */,
                                C94210C513900C8A004BA536 /* raise.c in Sources */,
                                C94210C613900C8A004BA536 /* readdir.c in Sources */,
@@ -10408,7 +10393,6 @@
                                C95B7F6B138F3C55004311DA /* opendir.c in Sources */,
                                C95B7F6C138F3C55004311DA /* pause.c in Sources */,
                                C95B7F6D138F3C55004311DA /* popen.c in Sources */,
-                               C95B7F6E138F3C55004311DA /* pselect.c in Sources */,
                                C95B7F6F138F3C55004311DA /* psignal.c in Sources */,
                                C95B7F70138F3C55004311DA /* raise.c in Sources */,
                                C95B7F71138F3C55004311DA /* readdir.c in Sources */,
@@ -10946,7 +10930,6 @@
                                C95B8216138F52B0004311DA /* opendir.c in Sources */,
                                C95B8217138F52B0004311DA /* pause.c in Sources */,
                                C95B8218138F52B0004311DA /* popen.c in Sources */,
-                               C95B8219138F52B0004311DA /* pselect.c in Sources */,
                                C95B821A138F52B0004311DA /* psignal.c in Sources */,
                                C95B821B138F52B0004311DA /* raise.c in Sources */,
                                C95B821C138F52B0004311DA /* readdir.c in Sources */,
@@ -11484,7 +11467,6 @@
                                C95B84BC138F53DB004311DA /* opendir.c in Sources */,
                                C95B84BD138F53DB004311DA /* pause.c in Sources */,
                                C95B84BE138F53DB004311DA /* popen.c in Sources */,
-                               C95B84BF138F53DB004311DA /* pselect.c in Sources */,
                                C95B84C0138F53DB004311DA /* psignal.c in Sources */,
                                C95B84C1138F53DB004311DA /* raise.c in Sources */,
                                C95B84C2138F53DB004311DA /* readdir.c in Sources */,
@@ -12036,7 +12018,6 @@
                                C97A701D1517AF53005E1998 /* opendir.c in Sources */,
                                C97A701E1517AF53005E1998 /* pause.c in Sources */,
                                C97A701F1517AF53005E1998 /* popen.c in Sources */,
-                               C97A70201517AF53005E1998 /* pselect.c in Sources */,
                                C97A70211517AF53005E1998 /* psignal.c in Sources */,
                                C97A70221517AF53005E1998 /* raise.c in Sources */,
                                C97A70231517AF53005E1998 /* readdir.c in Sources */,
@@ -12756,7 +12737,6 @@
                                C9765F40138EC61900741512 /* opendir.c in Sources */,
                                C9765F41138EC61900741512 /* pause.c in Sources */,
                                C9765F42138EC61900741512 /* popen.c in Sources */,
-                               C9765F43138EC61900741512 /* pselect.c in Sources */,
                                C9765F44138EC61900741512 /* psignal.c in Sources */,
                                C9765F45138EC61900741512 /* raise.c in Sources */,
                                C9765F46138EC61900741512 /* readdir.c in Sources */,
@@ -13294,7 +13274,6 @@
                                C9EB305B138F6D880075BB52 /* opendir.c in Sources */,
                                C9EB305C138F6D880075BB52 /* pause.c in Sources */,
                                C9EB305D138F6D880075BB52 /* popen.c in Sources */,
-                               C9EB305E138F6D880075BB52 /* pselect.c in Sources */,
                                C9EB305F138F6D880075BB52 /* psignal.c in Sources */,
                                C9EB3060138F6D880075BB52 /* raise.c in Sources */,
                                C9EB3061138F6D880075BB52 /* readdir.c in Sources */,
@@ -13833,7 +13812,6 @@
                                C9EB3302138F75580075BB52 /* opendir.c in Sources */,
                                C9EB3303138F75580075BB52 /* pause.c in Sources */,
                                C9EB3304138F75580075BB52 /* popen.c in Sources */,
-                               C9EB3305138F75580075BB52 /* pselect.c in Sources */,
                                C9EB3306138F75580075BB52 /* psignal.c in Sources */,
                                C9EB3307138F75580075BB52 /* raise.c in Sources */,
                                C9EB3308138F75580075BB52 /* readdir.c in Sources */,

diff --git a/fbsdcompat/_fbsd_compat_.h b/fbsdcompat/_fbsd_compat_.h
index a5f79c693ed0f814cae1811cb4e469ad4fba05a7..f134d5cfdb22d2eecf8d8bc1d2f330f18738ced3 100644 (file)
--- a/fbsdcompat/_fbsd_compat_.h
+++ b/fbsdcompat/_fbsd_compat_.h
@@ -122,6 +122,7 @@
 #define                _recvfrom                       recvfrom
 #define                _recvmsg                        recvmsg
 #define                _select                         select
+#define                _pselect                        pselect
 #define                _sendmsg                        sendmsg
 #define                _sendto                         sendto
 #define                _setsockopt                     setsockopt
@@ -159,7 +160,6 @@
 #define                __makecontext                   makecontext
 #define                __makecontext                   makecontext
 #define                __pause                         pause
-#define                __pselect                       pselect
 #define                __raise                         raise
 #define                __signalcontext                 signalcontext
 #define                __sleep                         sleep

diff --git a/gen/FreeBSD/pselect.3 b/gen/FreeBSD/pselect.3
deleted file mode 100644 (file)
index 615a399..0000000
--- a/gen/FreeBSD/pselect.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\"
-.\" Copyright 2002 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/pselect.3,v 1.4 2002/12/18 10:13:54 ru Exp $
-.\"
-.Dd June 16, 2002
-.Dt PSELECT 3
-.Os
-.Sh NAME
-.Nm pselect
-.Nd synchronous I/O multiplexing a la POSIX.1g
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fo pselect
-.Fa "int nfds"
-.Fa "fd_set *restrict readfds"
-.Fa "fd_set *restrict writefds"
-.Fa "fd_set *restrict errorfds"
-.Fa "const struct timespec *restrict timeout"
-.Fa "const sigset_t *restrict sigmask"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn pselect
-function was introduced by
-.St -p1003.1g-2000
-as a slightly stronger version of
-.Xr select 2 .
-The
-.Fa nfds , readfds , writefds ,
-and
-.Fa errorfds
-arguments are all identical to the analogous arguments of
-.Fn select .
-The
-.Fa timeout
-argument in
-.Fn pselect
-points to a
-.Vt "const struct timespec" ,
-rather than the (modifiable)
-.Vt "struct timeval"
-used by
-.Fn select ;
-as in
-.Fn select ,
-a null pointer may be passed to indicate that
-.Fn pselect
-should wait indefinitely.
-Finally,
-.Fa sigmask
-specifies a signal mask which is set while waiting for input.
-When
-.Fn pselect
-returns, the original signal mask is restored.
-.Pp
-See
-.Xr select 2
-for a more detailed discussion of the semantics of this interface, and
-for macros used to manipulate the
-.Vt "fd_set"
-data type.
-.Sh IMPLEMENTATION NOTES
-The
-.Fn pselect
-function is implemented in the C library as a wrapper around
-.Fn select .
-.Sh RETURN VALUES
-The
-.Fn pselect
-function returns the same values and under the same conditions as
-.Fn select .
-.Sh ERRORS
-The
-.Fn pselect
-function may fail for any of the reasons documented for
-.Xr select 2
-and (if a signal mask is provided)
-.Xr sigprocmask 2 .
-.Sh SEE ALSO
-.Xr kqueue 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr sigprocmask 2
-.Sh STANDARDS
-The
-.Fn pselect
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn pselect
-function first appeared in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn pselect
-function and this manual page were written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .

diff --git a/gen/FreeBSD/pselect.c b/gen/FreeBSD/pselect.c
deleted file mode 100644 (file)
index 7dcc208..0000000
--- a/gen/FreeBSD/pselect.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2000 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if (defined(VARIANT_CANCELABLE) || defined(VARIANT_PRE1050)) && __DARWIN_NON_CANCELABLE != 0
-#error cancellable call vs. __DARWIN_NON_CANCELABLE mismatch
-#endif
-
-#ifdef VARIANT_DARWINEXTSN
-#define _DARWIN_UNLIMITED_SELECT
-#endif /* VARIANT_DARWINEXTSN */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/pselect.c,v 1.6 2002/10/12 16:13:37 mike Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/select.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-#include <errno.h>
-#include <signal.h>
-#include "un-namespace.h"
-
-__weak_reference(__pselect, pselect);
-
-// Returns -1 and sets errno in contrast to pthread_sigmask which returns errno
-extern int __pthread_sigmask(int, const sigset_t *, sigset_t *);
-
-/*
- * Emulate the POSIX 1003.1g-2000 `pselect' interface.  This is the
- * same as the traditional BSD `select' function, except that it uses
- * a timespec rather than a timeval, doesn't modify the timeout argument,
- * and allows the user to specify a signal mask to apply during the select.
- */
-int
-__pselect(int count, fd_set * __restrict rfds, fd_set * __restrict wfds, 
-       fd_set * __restrict efds, const struct timespec * __restrict timo, 
-       const sigset_t * __restrict mask)
-{
-       sigset_t omask;
-       struct timeval tvtimo, *tvp;
-       int rv, sverrno;
-
-       if (timo) {
-               TIMESPEC_TO_TIMEVAL(&tvtimo, timo);
-               tvp = &tvtimo;
-       } else
-               tvp = 0;
-
-       if (mask != 0) {
-               rv = __pthread_sigmask(SIG_SETMASK, mask, &omask);
-               if (rv != 0)
-                       return rv;
-       }
-
-       rv = _select(count, rfds, wfds, efds, tvp);
-       if (mask != 0) {
-               sverrno = errno;
-               __pthread_sigmask(SIG_SETMASK, &omask, (sigset_t *)0);
-               errno = sverrno;
-       }
-
-       return rv;
-}

diff --git a/gen/fts.c b/gen/fts.c
index e972b920b215014d4952e1440e630e0a28caf9b6..1bd602528ee165082458f862afce037e831a61f7 100644 (file)
--- a/gen/fts.c
+++ b/gen/fts.c
@@ -742,12 +742,13 @@ fts_build(sp, type)
         * If not changing directories set a pointer so that can just append
         * each new name into the path.
         */
-       maxlen = sp->fts_pathlen - cur->fts_pathlen - 1;
        len = NAPPEND(cur);
        if (ISSET(FTS_NOCHDIR)) {
                cp = sp->fts_path + len;
                *cp++ = '/';
        }
+       len++;
+       maxlen = sp->fts_pathlen - len;
 
        level = cur->fts_level + 1;
 
@@ -759,7 +760,7 @@ fts_build(sp, type)
 
                if ((p = fts_alloc(sp, dp->d_name, (int)dp->d_namlen)) == NULL)
                        goto mem1;
-               if (dp->d_namlen > maxlen) {
+               if (dp->d_namlen >= maxlen) {   /* include space for NUL */
                        if (fts_palloc(sp, (size_t)dp->d_namlen)) {
                                /*
                                 * No more memory for path or structures.  Save
@@ -771,18 +772,18 @@ mem1:                             saved_errno = errno;
                                        free(p);
                                fts_lfree(head);
                                (void)closedir(dirp);
-                               errno = saved_errno;
                                cur->fts_info = FTS_ERR;
                                SET(FTS_STOP);
+                               errno = saved_errno;
                                return (NULL);
                        }
                        adjaddr = sp->fts_path;
                        maxlen = sp->fts_pathlen - sp->fts_cur->fts_pathlen - 1;
                }
 
-               p->fts_pathlen = len + dp->d_namlen + 1;
-               p->fts_parent = sp->fts_cur;
                p->fts_level = level;
+               p->fts_parent = sp->fts_cur;
+               p->fts_pathlen = len + dp->d_namlen;
 
 #ifdef FTS_WHITEOUT
                if (dp->d_type == DT_WHT)
@@ -1123,17 +1124,17 @@ fts_palloc(sp, more)
  * already returned.
  */
 static void
-fts_padjust(sp, addr)
-       FTS *sp;
-       void *addr;
+fts_padjust(FTS *sp, void *addr)
 {
        FTSENT *p;
 
-#define        ADJUST(p) {                                                     \
-       (p)->fts_accpath =                                              \
-           (char *)addr + ((p)->fts_accpath - (p)->fts_path);          \
+#define        ADJUST(p) do {                                                  \
+       if ((p)->fts_accpath != (p)->fts_name) {                        \
+               (p)->fts_accpath =                                      \
+                   (char *)addr + ((p)->fts_accpath - (p)->fts_path);  \
+       }                                                               \
        (p)->fts_path = addr;                                           \
-}
+} while (0)
        /* Adjust the current set of children. */
        for (p = sp->fts_child; p; p = p->fts_link)
                ADJUST(p);
@@ -1154,5 +1155,5 @@ fts_maxarglen(argv)
        for (max = 0; *argv; ++argv)
                if ((len = strlen(*argv)) > max)
                        max = len;
-       return (max);
+       return (max + 1);
 }

diff --git a/man/manpages.lst b/man/manpages.lst
index 65a981c6254b469dd6b9a519a7a357994892b716..9c284c57fe74dbc3be9e91e2fe93c438b9c10b7d 100644 (file)
--- a/man/manpages.lst
+++ b/man/manpages.lst
@@ -219,7 +219,6 @@ popen.3 popen.3 pclose.3
 posix_memalign.3 posix_memalign.3
 printf.3 printf.3 asprintf.3 dprintf.3 fprintf.3 snprintf.3 sprintf.3 vasprintf.3 vdprintf.3 vfprintf.3 vprintf.3 vsnprintf.3 vsprintf.3
 printf_l.3 printf_l.3 asprintf_l.3 fprintf_l.3 snprintf_l.3 sprintf_l.3 vasprintf_l.3 vfprintf_l.3 vprintf_l.3 vsnprintf_l.3 vsprintf_l.3
-pselect.3 pselect.3
 psignal.3 psignal.3 sys_siglist.3 sys_signame.3 strsignal.3 sys_siglist.3 sys_signame.3
 psort.3 psort.3 psort_b.3 psort_r.3
 putc.3 putc.3 fputc.3 putc_unlocked.3 putchar.3 putchar_unlocked.3 putw.3

diff --git a/posix1e/acl_translate.c b/posix1e/acl_translate.c
index 3a06fffaa802aef9dd9b58fdf7ec44e9449d5d3b..2d400f69472a70d3f464b0fd548c4bdb1a7b251d 100644 (file)
--- a/posix1e/acl_translate.c
+++ b/posix1e/acl_translate.c
@@ -249,7 +249,6 @@ static struct {
 /*
  * reallocing snprintf with offset
  */
-
 static int
 raosnprintf(char **buf, size_t *size, ssize_t *offset, char *fmt, ...)
 {
@@ -699,8 +698,8 @@ acl_to_text(acl_t acl, ssize_t *len_p)
                }
            }
        }
-       buf[(*len_p)++] = '\n';
-       buf[(*len_p)] = 0;
+
+       if(!raosnprintf(&buf, &bufsize, len_p, "\n")) goto err_nomem;
        return buf;
 
 err_nomem:

diff --git a/xcodescripts/generate_features.pl b/xcodescripts/generate_features.pl
index df3dd2dde17cbb75d84ee20851d81edcfd46baf5..ac5479559ac3ea2c10a3f8033622be14a12dcfc6 100755 (executable)
--- a/xcodescripts/generate_features.pl
+++ b/xcodescripts/generate_features.pl
@@ -1,9 +1,5 @@
 #!/usr/bin/perl
 
-if ($ENV{"ACTION"} eq "installhdrs") {
-       exit 0;
-}
-
 # Generates the libc-features.h files used to control #ifdef behaviour in Libc
 use warnings;
 use Data::Dumper;

diff --git a/xcodescripts/variants.xcconfig b/xcodescripts/variants.xcconfig
index e578d01d214ace924c66812a11678250d269a6a1..ac21aa6d21145526a36727f1da900498eec8e507 100644 (file)
--- a/xcodescripts/variants.xcconfig
+++ b/xcodescripts/variants.xcconfig
@@ -13,7 +13,7 @@ VARIANT_CANCELABLE_MACROS = -DVARIANT_CANCELABLE
 VARIANT_CANCELABLE_INCLUDE = $(VARIANT_CANCELABLE_INCLUDE_compat) $(VARIANT_CANCELABLE_INCLUDE_gen) $(VARIANT_CANCELABLE_INCLUDE_net) $(VARIANT_CANCELABLE_INCLUDE_sys)
 
 VARIANT_CANCELABLE_INCLUDE_compat = creat.c sigcompat.c
-VARIANT_CANCELABLE_INCLUDE_gen = lockf.c nanosleep.c pause.c pselect.c sleep.c termios.c usleep.c wait.c waitpid.c
+VARIANT_CANCELABLE_INCLUDE_gen = lockf.c nanosleep.c pause.c sleep.c termios.c usleep.c wait.c waitpid.c
 VARIANT_CANCELABLE_INCLUDE_net = recv.c send.c
 VARIANT_CANCELABLE_INCLUDE_sys = system.c
 
@@ -23,7 +23,7 @@ VARIANT_DARWINEXTSN_MACROS = -DVARIANT_DARWINEXTSN
 
 VARIANT_DARWINEXTSN_INCLUDE = $(VARIANT_DARWINEXTSN_INCLUDE_gen) $(VARIANT_DARWINEXTSN_INCLUDE_stdio) $(VARIANT_DARWINEXTSN_INCLUDE_stdlib) $(VARIANT_DARWINEXTSN_INCLUDE_sys)
 
-VARIANT_DARWINEXTSN_INCLUDE_gen = pselect.c popen.c
+VARIANT_DARWINEXTSN_INCLUDE_gen = popen.c
 VARIANT_DARWINEXTSN_INCLUDE_stdio = fdopen.c fopen.c
 VARIANT_DARWINEXTSN_INCLUDE_stdlib = realpath.c
 VARIANT_DARWINEXTSN_INCLUDE_sys = getgroups.c
@@ -31,7 +31,6 @@ VARIANT_DARWINEXTSN_INCLUDE_sys = getgroups.c
 // $DARWINEXTSN + no cancel (everyone else is cancelable anyway)
 
 VARIANT_DARWINEXTSN_CANCELABLE_MACROS = -DVARIANT_CANCELABLE -DVARIANT_DARWINEXTSN
-VARIANT_DARWINEXTSN_CANCELABLE_INCLUDE = pselect.c
 
 // Pre-1050 symbols
 
@@ -39,7 +38,6 @@ VARIANT_PRE1050_MACROS = $(VARIANT_PRE1050_MACROS_$(PLATFORM_NAME))
 VARIANT_PRE1050_MACROS_macosx = -U__DARWIN_VERS_1050 -D__DARWIN_VERS_1050=0 -DVARIANT_PRE1050
 VARIANT_PRE1050_INCLUDE = $(VARIANT_PRE1050_INCLUDE_$(PLATFORM_NAME))
 VARIANT_PRE1050_INCLUDE_macosx = daemon.c $(VARIANT_PRE1050_INCLUDE_$(PLATFORM_NAME)_$(CURRENT_ARCH))
-VARIANT_PRE1050_INCLUDE_macosx_x86_64 = pselect.c
 
 // Legacy symbols
 VARIANT_LEGACY_MACROS = -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_64_BIT_INO_T -D__DARWIN_64_BIT_INO_T=0 -DVARIANT_LEGACY
@@ -50,7 +48,7 @@ VARIANT_LEGACY_INCLUDE_macosx_i386 = $(VARIANT_LEGACY_INCLUDE_compat) $(VARIANT_
 
 VARIANT_LEGACY_INCLUDE_compat = creat.c setregid.c setreuid.c sigcompat.c killpg.c
 VARIANT_LEGACY_INCLUDE_gdtoa = gdtoa-strtof.c gdtoa-strtod.c gdtoa-strtodg.c
-VARIANT_LEGACY_INCLUDE_gen = clock.c closedir.c confstr.c crypt.c fnmatch.c lockf.c nanosleep.c nftw.c nice.c opendir.c pause.c popen.c pselect.c rewinddir.c seekdir.c setmode.c sleep.c telldir.c termios.c timezone.c ttyname.c usleep.c wait.c waitpid.c
+VARIANT_LEGACY_INCLUDE_gen = clock.c closedir.c confstr.c crypt.c fnmatch.c lockf.c nanosleep.c nftw.c nice.c opendir.c pause.c popen.c rewinddir.c seekdir.c setmode.c sleep.c telldir.c termios.c timezone.c ttyname.c usleep.c wait.c waitpid.c
 VARIANT_LEGACY_INCLUDE_locale = wcsftime.c
 VARIANT_LEGACY_INCLUDE_net = recv.c send.c
 VARIANT_LEGACY_INCLUDE_regex = regcomp.c