1 files changed, 43 insertions, 3 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 9aba71949..61ceb6085 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -138,6 +138,12 @@
 # include <arpa/inet.h>
 #elif defined __APPLE__
 # include <netinet/in.h>
+#elif ENABLE_PLATFORM_MINGW32
+# ifndef WINVER
+#  define WINVER 0x0501
+# endif
+# include <winsock2.h>
+# include <ws2tcpip.h>
 #else
 # include <arpa/inet.h>
 //This breaks on bionic:
@@ -166,7 +172,9 @@
 
 /* Some libc's forget to declare these, do it ourself */
 
+#if !ENABLE_PLATFORM_MINGW32
 extern char **environ;
+#endif
 /* klogctl is in libc's klog.h, but we cheat and not #include that */
 int klogctl(int type, char *b, int len);
 #ifndef PATH_MAX
@@ -176,6 +184,9 @@ int klogctl(int type, char *b, int len);
 # define BUFSIZ 4096
 #endif
 
+#if ENABLE_PLATFORM_MINGW32
+# include "mingw.h"
+#endif
 
 /* Busybox does not use threads, we can speed up stdio. */
 #ifdef HAVE_UNLOCKED_STDIO
@@ -238,6 +249,13 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
         : ((T)1 << (sizeof(T)*8-1)) \
         )
 
+#if ENABLE_PLATFORM_MINGW32 && \
+        (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO)
+#define LL_FMT "I64"
+#else
+#define LL_FMT "ll"
+#endif
+
 /* Large file support */
 /* Note that CONFIG_LFS=y forces bbox to be built with all common ops
  * (stat, lseek etc) mapped to "largefile" variants by libc.
@@ -263,7 +281,7 @@ typedef unsigned long long uoff_t;
 #  define XATOOFF(a) xatoull_range((a), 0, LLONG_MAX)
 #  define BB_STRTOOFF bb_strtoull
 #  define STRTOOFF strtoull
-#  define OFF_FMT "ll"
+#  define OFF_FMT LL_FMT
 # endif
 #else
 /* CONFIG_LFS is off */
@@ -510,6 +528,7 @@ enum {
                 + (1LL << SIGUSR2)
                 + 0),
 };
+#if !ENABLE_PLATFORM_MINGW32
 void bb_signals(int sigs, void (*f)(int)) FAST_FUNC;
 /* Unlike signal() and bb_signals, sets handler with sigaction()
  * and in a way that while signal handler is run, no other signals
@@ -527,6 +546,10 @@ void sig_unblock(int sig) FAST_FUNC;
 int sigaction_set(int sig, const struct sigaction *act) FAST_FUNC;
 /* SIG_BLOCK/SIG_UNBLOCK all signals: */
 int sigprocmask_allsigs(int how) FAST_FUNC;
+#else
+#define bb_signals(s, f)
+#define kill_myself_with_sig(s)
+#endif
 /* Standard handler which just records signo */
 extern smallint bb_got_signal;
 void record_signo(int signo); /* not FAST_FUNC! */
@@ -606,7 +629,7 @@ char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
 int xsocket(int domain, int type, int protocol) FAST_FUNC;
 void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC;
 void xlisten(int s, int backlog) FAST_FUNC;
-void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen) FAST_FUNC;
+void xconnect(int s, const struct sockaddr *saddr, socklen_t addrlen) FAST_FUNC;
 ssize_t xsendto(int s, const void *buf, size_t len, const struct sockaddr *to,
                                 socklen_t tolen) FAST_FUNC;
 
@@ -941,6 +964,9 @@ char *safe_gethostname(void) FAST_FUNC;
 char* str_tolower(char *str) FAST_FUNC;
 
 char *utoa(unsigned n) FAST_FUNC;
+#if ENABLE_PLATFORM_MINGW32
+# define itoa bb_itoa
+#endif
 char *itoa(int n) FAST_FUNC;
 /* Returns a pointer past the formatted number, does NOT null-terminate */
 char *utoa_to_buf(unsigned n, char *buf, unsigned buflen) FAST_FUNC;
@@ -1116,6 +1142,9 @@ int run_nofork_applet(int applet_no, char **argv) FAST_FUNC;
 extern int find_applet_by_name(const char *name) FAST_FUNC;
 extern void run_applet_no_and_exit(int a, const char *name, char **argv) NORETURN FAST_FUNC;
 #endif
+#if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_NOFORK
+extern int long_running_applet(int applet_no) FAST_FUNC;
+#endif
 
 /* Helpers for daemonization.
  *
@@ -1199,7 +1228,7 @@ extern uint32_t getopt32(char **argv, const char *applet_opts, ...) FAST_FUNC;
  * By ~2008, OpenBSD 3.4 was changed to survive glibc-like optind = 0
  * (to interpret it as if optreset was set).
  */
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || ENABLE_PLATFORM_MINGW32
 #define GETOPT_RESET() (optind = 0)
 #else /* BSD style */
 #define GETOPT_RESET() (optind = 1)
@@ -1776,6 +1805,9 @@ typedef struct procps_status_t {
 #if ENABLE_FEATURE_TOP_SMP_PROCESS
         int last_seen_on_cpu;
 #endif
+#if ENABLE_PLATFORM_MINGW32
+        HANDLE snapshot;
+#endif
 } procps_status_t;
 /* flag bits for procps_scan(xx, flags) calls */
 enum {
@@ -1814,7 +1846,11 @@ void free_procps_scan(procps_status_t* sp) FAST_FUNC;
 procps_status_t* procps_scan(procps_status_t* sp, int flags) FAST_FUNC;
 /* Format cmdline (up to col chars) into char buf[size] */
 /* Puts [comm] if cmdline is empty (-> process is a kernel thread) */
+#if !ENABLE_PLATFORM_MINGW32
 void read_cmdline(char *buf, int size, unsigned pid, const char *comm) FAST_FUNC;
+#else
+#define read_cmdline(buf, size, pid, comm) snprintf(buf, size, "[%s]", comm)
+#endif
 pid_t *find_pid_by_name(const char* procName) FAST_FUNC;
 pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC;
 int starts_with_cpu(const char *str) FAST_FUNC;
@@ -1958,7 +1994,11 @@ extern const char bb_path_wtmp_file[] ALIGN1;
 #define bb_path_motd_file "/etc/motd"
 
 #define bb_dev_null "/dev/null"
+#if ENABLE_PLATFORM_MINGW32
+#define bb_busybox_exec_path get_busybox_exec_path()
+#else
 extern const char bb_busybox_exec_path[] ALIGN1;
+#endif
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
  * but I want to save a few bytes here */
 extern const char bb_PATH_root_path[] ALIGN1; /* "PATH=/sbin:/usr/sbin:/bin:/usr/bin" */