1 files changed, 73 insertions, 2 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 135d9111d..c4734e86d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -143,6 +143,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:
@@ -182,7 +188,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
@@ -192,6 +200,12 @@ int klogctl(int type, char *b, int len);
 # define BUFSIZ 4096
 #endif
 
+#if ENABLE_PLATFORM_MINGW32
+# include "mingw.h"
+# define MINGW_SPECIAL(a) mingw_ ## a
+#else
+# define MINGW_SPECIAL(a) a
+#endif
 
 /* Busybox does not use threads, we can speed up stdio. */
 #ifdef HAVE_UNLOCKED_STDIO
@@ -254,6 +268,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.
@@ -279,7 +300,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 */
@@ -553,20 +574,37 @@ enum {
          * Dance around with long long to guard against that...
          */
         BB_FATAL_SIGS = (int)(0
+#ifdef SIGHUP
                 + (1LL << SIGHUP)
+#endif
                 + (1LL << SIGINT)
                 + (1LL << SIGTERM)
                 + (1LL << SIGPIPE)   // Write to pipe with no readers
+#ifdef SIGQUIT
                 + (1LL << SIGQUIT)   // Quit from keyboard
+#endif
                 + (1LL << SIGABRT)   // Abort signal from abort(3)
+#ifdef SIGALRM
                 + (1LL << SIGALRM)   // Timer signal from alarm(2)
+#endif
+#ifdef SIGVTALRM
                 + (1LL << SIGVTALRM) // Virtual alarm clock
+#endif
+#ifdef SIGXCPU
                 + (1LL << SIGXCPU)   // CPU time limit exceeded
+#endif
+#ifdef SIGXFSZ
                 + (1LL << SIGXFSZ)   // File size limit exceeded
+#endif
+#ifdef SIGUSR1
                 + (1LL << SIGUSR1)   // Yes kids, these are also fatal!
+#endif
+#ifdef SIGUSR1
                 + (1LL << SIGUSR2)
+#endif
                 + 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
@@ -586,6 +624,10 @@ int sigaction_set(int sig, const struct sigaction *act) FAST_FUNC;
 int sigprocmask_allsigs(int how) FAST_FUNC;
 /* Return old set in the same set: */
 int sigprocmask2(int how, sigset_t *set) 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! */
@@ -668,7 +710,7 @@ void xsettimeofday(const struct timeval *tv) 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;
 
@@ -1177,6 +1219,7 @@ void BB_EXECVP_or_die(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(); \
@@ -1184,6 +1227,9 @@ void BB_EXECVP_or_die(char **argv) NORETURN FAST_FUNC;
                 bb_simple_perror_msg_and_die("vfork"); \
         bb__xvfork_pid; \
 })
+#else
+#define xvfork() vfork()
+#endif
 #if BB_MMU
 pid_t xfork(void) FAST_FUNC;
 #endif
@@ -1778,9 +1824,15 @@ int bb_xioctl(int fd, unsigned request, void *argp) FAST_FUNC;
 #define xioctl(fd,request,argp)        bb_xioctl(fd,request,argp)
 #endif
 
+#if !ENABLE_PLATFORM_MINGW32 || ENABLE_FEATURE_EXTRA_FILE_DATA
 char *is_in_ino_dev_hashtable(const struct stat *statbuf) FAST_FUNC;
 void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name) FAST_FUNC;
 void reset_ino_dev_hashtable(void) FAST_FUNC;
+#else
+#define add_to_ino_dev_hashtable(s, n) (void)0
+#define is_in_ino_dev_hashtable(s) NULL
+#define reset_ino_dev_hashtable()
+#endif
 #ifdef __GLIBC__
 /* At least glibc has horrendously large inline for this, so wrap it */
 unsigned long long bb_makedev(unsigned major, unsigned minor) FAST_FUNC;
@@ -1978,7 +2030,11 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                 void (*cb)(struct smaprec *, void *), void *data);
 
 typedef struct procps_status_t {
+#if !ENABLE_PLATFORM_MINGW32
         DIR *dir;
+#else
+        HANDLE snapshot;
+#endif
         IF_FEATURE_SHOW_THREADS(DIR *task_dir;)
         uint8_t shift_pages_to_bytes;
         uint8_t shift_pages_to_kb;
@@ -2212,12 +2268,27 @@ 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()
+extern char bb_comm[];
+extern char bb_command_line[];
+#else
 extern const char bb_busybox_exec_path[] ALIGN1;
+#endif
 /* allow default system PATH to be extended via CFLAGS */
 #ifndef BB_ADDITIONAL_PATH
 #define BB_ADDITIONAL_PATH ""
 #endif
+#if !ENABLE_PLATFORM_MINGW32
 #define BB_PATH_ROOT_PATH "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH
+#define PATH_SEP ':'
+#define PATH_SEP_STR ":"
+#else
+#define BB_PATH_ROOT_PATH "PATH=/sbin;/usr/sbin;/bin;/usr/bin" BB_ADDITIONAL_PATH
+#define PATH_SEP ';'
+#define PATH_SEP_STR ";"
+extern const char bb_skip_ansi_emulation[] ALIGN1;
+#endif
 extern const char bb_PATH_root_path[] ALIGN1; /* BB_PATH_ROOT_PATH */
 #define bb_default_root_path (bb_PATH_root_path + sizeof("PATH"))
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,