libc: fix local from-source upgrades

Commit git-c38dbb9 inadvertently broke local MINIX3-on-MINIX3 builds,
since its libc changes relied on VFS being upgraded already as well.
As a result, after installing the new libc, networking ceased to work,
leading to curl(1) failing later on in the build process.  This patch
introduces transitional code that is necessary for the build process
to complete, after which it is obsolete again.

Change-Id: I93bf29c01d228e3d7efc7b01befeff682954f54d

diff --git a/minix/lib/libc/sys/accept.c b/minix/lib/libc/sys/accept.c
index 6207f233a7afaf7788a4a066fe578962a766bc9a..e1eeed821dc436d0fb1b09db2289e74e85a000ed 100644 (file)
--- a/minix/lib/libc/sys/accept.c
+++ b/minix/lib/libc/sys/accept.c
@@ -60,7 +60,7 @@ int accept(int sock, struct sockaddr *__restrict address,
        nwio_udpopt_t udpopt;
 
        r = __accept(sock, address, address_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= _tcp_accept(sock, address, address_len);

diff --git a/minix/lib/libc/sys/bind.c b/minix/lib/libc/sys/bind.c
index ddefa6ad132f84dd2319debb76df6af3e66ba01a..d7c9a749518ba4be7c2fcb62f536e0f5d47bc039 100644 (file)
--- a/minix/lib/libc/sys/bind.c
+++ b/minix/lib/libc/sys/bind.c
@@ -58,7 +58,7 @@ int bind(int sock, const struct sockaddr *address, socklen_t address_len)
        struct sockaddr_un uds_addr;
 
        r = __bind(sock, address, address_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= ioctl(sock, NWIOGTCPCONF, &tcpconf);

diff --git a/minix/lib/libc/sys/connect.c b/minix/lib/libc/sys/connect.c
index be494845fe361017c5b8bf32a3386ccb6d410079..9d542beb47efc8a09658c8b1931f6598b0ea9731 100644 (file)
--- a/minix/lib/libc/sys/connect.c
+++ b/minix/lib/libc/sys/connect.c
@@ -57,7 +57,7 @@ int connect(int sock, const struct sockaddr *address,
        nwio_udpopt_t udpopt;
 
        r = __connect(sock, address, address_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= ioctl(sock, NWIOGTCPCONF, &tcpconf);

diff --git a/minix/lib/libc/sys/getpeername.c b/minix/lib/libc/sys/getpeername.c
index f7930340614cf2e51423b6b4f737a4910ecafcc9..975e3a9245b934e987da241b0beaa3139854e843 100644 (file)
--- a/minix/lib/libc/sys/getpeername.c
+++ b/minix/lib/libc/sys/getpeername.c
@@ -60,7 +60,7 @@ int getpeername(int sock, struct sockaddr *__restrict address,
        struct sockaddr_un uds_addr;
 
        r = __getpeername(sock, address, address_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= ioctl(sock, NWIOGTCPCONF, &tcpconf);

diff --git a/minix/lib/libc/sys/getsockname.c b/minix/lib/libc/sys/getsockname.c
index e021185fef2d98a467c39ac18b5f5bd3ba8a287a..23b1de92f8f839590f5bdbf908b50a76b9fda2e7 100644 (file)
--- a/minix/lib/libc/sys/getsockname.c
+++ b/minix/lib/libc/sys/getsockname.c
@@ -62,7 +62,7 @@ int getsockname(int fd, struct sockaddr *__restrict address,
        struct sockaddr_un uds_addr;
 
        r = __getsockname(fd, address, address_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
 #if DEBUG

diff --git a/minix/lib/libc/sys/getsockopt.c b/minix/lib/libc/sys/getsockopt.c
index 7a1d1cf50adc3f0fdf7c2d72378cf5b497a61a6a..7edea530e71cfaf4d5f260856295780c9a070f65 100644 (file)
--- a/minix/lib/libc/sys/getsockopt.c
+++ b/minix/lib/libc/sys/getsockopt.c
@@ -68,7 +68,7 @@ int getsockopt(int sock, int level, int option_name,
        struct sockaddr_un uds_addr;
 
        r = __getsockopt(sock, level, option_name, option_value, option_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= ioctl(sock, NWIOGTCPOPT, &tcpopt);

diff --git a/minix/lib/libc/sys/listen.c b/minix/lib/libc/sys/listen.c
index d0ac514390be16e8b9dfb0645f16aef74e7351b0..a2522af906f05d1938403f57004d5fb934b00c78 100644 (file)
--- a/minix/lib/libc/sys/listen.c
+++ b/minix/lib/libc/sys/listen.c
@@ -35,7 +35,7 @@ int listen(int sock, int backlog)
        int r;
 
        r = __listen(sock, backlog);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= ioctl(sock, NWIOTCPLISTENQ, &backlog);

diff --git a/minix/lib/libc/sys/recvfrom.c b/minix/lib/libc/sys/recvfrom.c
index f04c627e61038e54de058987a8324816d47c4c1e..47f508486156e2ff449d0ed3b7ae6e73f7972a3e 100644 (file)
--- a/minix/lib/libc/sys/recvfrom.c
+++ b/minix/lib/libc/sys/recvfrom.c
@@ -81,7 +81,7 @@ ssize_t recvfrom(int sock, void *__restrict buffer, size_t length,
        int uds_sotype = -1;
 
        r = __recvfrom(sock, buffer, length, flags, address, address_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
 #if DEBUG

diff --git a/minix/lib/libc/sys/recvmsg.c b/minix/lib/libc/sys/recvmsg.c
index 18ea01cf29597618d05154ed91bda352dd737b9a..d8c32e5044162e281a5cf8148c280ed1fca148cb 100644 (file)
--- a/minix/lib/libc/sys/recvmsg.c
+++ b/minix/lib/libc/sys/recvmsg.c
@@ -90,7 +90,7 @@ ssize_t recvmsg(int sock, struct msghdr *msg, int flags)
        int uds_sotype;
 
        r = __recvmsg(sock, msg, flags);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        if (msg == NULL) {

diff --git a/minix/lib/libc/sys/sendmsg.c b/minix/lib/libc/sys/sendmsg.c
index abfdfec4707e661f4f09bac2e18f95e4afc82f24..4d4452cff233e06867ec6f3681f58c93250c6f91 100644 (file)
--- a/minix/lib/libc/sys/sendmsg.c
+++ b/minix/lib/libc/sys/sendmsg.c
@@ -88,7 +88,7 @@ ssize_t sendmsg(int sock, const struct msghdr *msg, int flags)
        int uds_sotype;
 
        r = __sendmsg(sock, msg, flags);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        if (msg == NULL) {

diff --git a/minix/lib/libc/sys/sendto.c b/minix/lib/libc/sys/sendto.c
index ff83d8f7efe63e29dc38727211a39c590506fc4a..77304f30143d56eb4aab930edc08b56864533ac8 100644 (file)
--- a/minix/lib/libc/sys/sendto.c
+++ b/minix/lib/libc/sys/sendto.c
@@ -63,7 +63,7 @@ ssize_t sendto(int sock, const void *message, size_t length, int flags,
        int uds_sotype = -1;
 
        r = __sendto(sock, message, length, flags, dest_addr, dest_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= ioctl(sock, NWIOGTCPOPT, &tcpopt);

diff --git a/minix/lib/libc/sys/setsockopt.c b/minix/lib/libc/sys/setsockopt.c
index 8ab1dcac8ac0beed73e605553958a3cee17e4b0b..04c0d311d38766d138145b02fd3b6b5ff60c6a97 100644 (file)
--- a/minix/lib/libc/sys/setsockopt.c
+++ b/minix/lib/libc/sys/setsockopt.c
@@ -56,7 +56,7 @@ int setsockopt(int sock, int level, int option_name,
        struct sockaddr_un uds_addr;
 
        r = __setsockopt(sock, level, option_name, option_value, option_len);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= ioctl(sock, NWIOGTCPOPT, &tcpopt);

diff --git a/minix/lib/libc/sys/shutdown.c b/minix/lib/libc/sys/shutdown.c
index f0839f48601a70b9c82bc2767925c6f4eeaa3f4a..e2eaf838450a90a7c0c3d821d74328ad730021be 100644 (file)
--- a/minix/lib/libc/sys/shutdown.c
+++ b/minix/lib/libc/sys/shutdown.c
@@ -40,7 +40,7 @@ int shutdown(int sock, int how)
        nwio_tcpconf_t tcpconf;
 
        r = __shutdown(sock, how);
-       if (r != -1 || errno != ENOTSOCK)
+       if (r != -1 || (errno != ENOTSOCK && errno != ENOSYS))
                return r;
 
        r= ioctl(sock, NWIOGTCPCONF, &tcpconf);

diff --git a/minix/lib/libc/sys/socket.c b/minix/lib/libc/sys/socket.c
index e07f4ba13bc9701ae7193d7d65be9bf65b999fd8..ce2352a2bec7a09a2a7c39839b74db75a49d69e6 100644 (file)
--- a/minix/lib/libc/sys/socket.c
+++ b/minix/lib/libc/sys/socket.c
@@ -60,7 +60,7 @@ int socket(int domain, int type, int protocol)
        int r, sock_type;
 
        r = __socket(domain, type, protocol);
-       if (r != -1 || errno != EAFNOSUPPORT)
+       if (r != -1 || (errno != EAFNOSUPPORT && errno != ENOSYS))
                return r;
 
        sock_type = type & ~SOCK_FLAGS_MASK;

diff --git a/minix/lib/libc/sys/socketpair.c b/minix/lib/libc/sys/socketpair.c
index 5f4a8446001d210c59e02be482ffd9fd0b0ff3ad..1b1767dcd773a12bd1d8987b363fc832598c0e55 100644 (file)
--- a/minix/lib/libc/sys/socketpair.c
+++ b/minix/lib/libc/sys/socketpair.c
@@ -45,7 +45,7 @@ socketpair(int domain, int type, int protocol, int sv[2])
        int r;
 
        r = __socketpair(domain, type, protocol, sv);
-       if (r != -1 || errno != EAFNOSUPPORT)
+       if (r != -1 || (errno != EAFNOSUPPORT && errno != ENOSYS))
                return r;
 
 #if DEBUG