win32: make vfork fail at compile-time

Nothing in busybox-w32 uses fork.  Remove the implementations of fork,
vfork and xvfork so that, for example, enabling cpio pass-through causes
an error at compile-time, not run-time.

MinGW-w64 defines pid_t, so we don't have to.

Ensure code containing xvfork in netcat is disabled when NC_EXTRA
is disabled.  Otherwise removing the implementation of vfork costs
64 bytes.

3 files changed, 8 insertions, 8 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 2b349ed12..9ce89636a 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1103,6 +1103,7 @@ void exec_prog_or_SHELL(char **argv) NORETURN FAST_FUNC;
 
 /* xvfork() can't be a _function_, return after vfork in child mangles stack
  * in the parent. It must be a macro. */
+#if !ENABLE_PLATFORM_MINGW32
 #define xvfork() \
 ({ \
         pid_t bb__xvfork_pid = vfork(); \
@@ -1110,6 +1111,9 @@ void exec_prog_or_SHELL(char **argv) NORETURN FAST_FUNC;
                 bb_perror_msg_and_die("vfork"); \
         bb__xvfork_pid; \
 })
+#else
+#define xvfork() vfork()
+#endif
 #if BB_MMU
 pid_t xfork(void) FAST_FUNC;
 #endif
diff --git a/include/mingw.h b/include/mingw.h
index ff5e8ee1e..d7dabacaf 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -7,11 +7,6 @@
  */
 typedef int gid_t;
 typedef int uid_t;
-#ifndef _WIN64
-typedef int pid_t;
-#else
-typedef __int64 pid_t;
-#endif
 
 #define DEFAULT_UID 1000
 #define DEFAULT_GID 1000
@@ -397,7 +392,6 @@ NOIMPL(getsid,pid_t pid UNUSED_PARAM);
 IMPL(getuid,int,DEFAULT_UID,void);
 int getlogin_r(char *buf, size_t len);
 int fcntl(int fd, int cmd, ...);
-#define fork() -1
 IMPL(fsync,int,0,int fd UNUSED_PARAM);
 int kill(pid_t pid, int sig);
 int link(const char *oldpath, const char *newpath);
@@ -417,7 +411,7 @@ long sysconf(int name);
 IMPL(getpagesize,int,4096,void);
 NOIMPL(ttyname_r,int fd UNUSED_PARAM, char *buf UNUSED_PARAM, int sz UNUSED_PARAM);
 int mingw_unlink(const char *pathname);
-NOIMPL(vfork,void);
+pid_t vfork(void);
 int mingw_access(const char *name, int mode);
 int mingw_rmdir(const char *name);
 int mingw_isatty(int fd);
diff --git a/networking/nc.c b/networking/nc.c
index df073d7df..3437c565e 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -198,7 +198,7 @@ int nc_main(int argc, char **argv)
                         }
 #endif
                         close_on_exec_on(sfd);
- accept_again:
+ IF_NC_EXTRA(accept_again:)
                         cfd = accept(sfd, NULL, 0);
                         if (cfd < 0)
                                 bb_perror_msg_and_die("accept");
@@ -216,6 +216,7 @@ int nc_main(int argc, char **argv)
                 /*signal(SIGALRM, SIG_DFL);*/
         }
 
+#if ENABLE_NC_EXTRA
         /* -e given? */
         if (execparam) {
                 pid_t pid;
@@ -234,6 +235,7 @@ int nc_main(int argc, char **argv)
                 IF_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
                 IF_NC_EXTRA(bb_perror_msg_and_die("can't execute '%s'", execparam[0]);)
         }
+#endif
 
         /* Select loop copying stdin to cfd, and cfd to stdout */