4 files changed, 110 insertions, 1 deletions

diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index 501349548..aa42de648 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -35,6 +35,7 @@
 #include "libbb.h"
 #include "bbconfigopts.h"
 #if ENABLE_FEATURE_COMPRESS_BBCONFIG
+#define BB_ARCHIVE_PUBLIC
 # include "bb_archive.h"
 # include "bbconfigopts_bz2.h"
 #endif
diff --git a/miscutils/dc.c b/miscutils/dc.c
index b922a7184..f752a1377 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -56,7 +56,7 @@ typedef unsigned long data_t;
 #define DATA_FMT "l"
 #else
 typedef unsigned long long data_t;
-#define DATA_FMT "ll"
+#define DATA_FMT LL_FMT
 #endif
 
 
diff --git a/miscutils/less.c b/miscutils/less.c
index 938d9842f..6b5c8c2dd 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -145,6 +145,10 @@
 
 #include <sched.h>  /* sched_yield() */
 
+#if ENABLE_PLATFORM_MINGW32
+#include <conio.h>
+#endif
+
 #include "libbb.h"
 #include "common_bufsiz.h"
 #if ENABLE_FEATURE_LESS_REGEXP
@@ -236,7 +240,9 @@ struct globals {
         smallint winsize_err;
 #endif
         smallint terminated;
+#if !ENABLE_PLATFORM_MINGW32
         struct termios term_orig, term_less;
+#endif
         char kbd_input[KEYCODE_BUFFER_SIZE];
 };
 #define G (*ptr_to_globals)
@@ -298,7 +304,9 @@ struct globals {
 static void set_tty_cooked(void)
 {
         fflush_all();
+#if !ENABLE_PLATFORM_MINGW32
         tcsetattr(kbd_fd, TCSANOW, &term_orig);
+#endif
 }
 
 /* Move the cursor to a position (x,y), where (0,0) is the
@@ -575,6 +583,11 @@ static void read_lines(void)
                                 last_line_pos = 0;
                                 break;
                         }
+#if ENABLE_PLATFORM_MINGW32
+                        if (c == '\r') {
+                                continue;
+                        }
+#endif
                         /* NUL is substituted by '\n'! */
                         if (c == '\0') c = '\n';
                         *p++ = c;
@@ -671,7 +684,12 @@ static void update_num_lines(void)
         /* only do this for regular files */
         if (num_lines == REOPEN_AND_COUNT || num_lines == REOPEN_STDIN) {
                 count = 0;
+#if !ENABLE_PLATFORM_MINGW32
                 fd = open("/proc/self/fd/0", O_RDONLY);
+#else
+                /* don't even try to access /proc on WIN32 */
+                fd = -1;
+#endif
                 if (fd < 0 && num_lines == REOPEN_AND_COUNT) {
                         /* "filename" is valid only if REOPEN_AND_COUNT */
                         fd = open(filename, O_RDONLY);
@@ -854,7 +872,12 @@ static void print_found(const char *line)
                         match_status = 1;
         }
 
+#if !ENABLE_PLATFORM_MINGW32
         printf("%s%s\n", growline ? growline : "", str);
+#else
+        /* skip newline, we use explicit positioning on WIN32 */
+        printf("%s%s", growline ? growline : "", str);
+#endif
         free(growline);
 }
 #else
@@ -890,7 +913,12 @@ static void print_ascii(const char *str)
                 *p = '\0';
                 print_hilite(buf);
         }
+#if !ENABLE_PLATFORM_MINGW32
         puts(str);
+#else
+        /* skip newline, we use explicit positioning on WIN32 */
+        printf("%s", str);
+#endif
 }
 
 /* Print the buffer */
@@ -900,6 +928,10 @@ static void buffer_print(void)
 
         move_cursor(0, 0);
         for (i = 0; i <= max_displayed_line; i++) {
+#if ENABLE_PLATFORM_MINGW32
+                /* make sure we're on the right line */
+                move_cursor(i+1, 0);
+#endif
                 printf(CLEAR_2_EOL);
                 if (option_mask32 & FLAG_N)
                         print_lineno(buffer[i]);
@@ -1087,9 +1119,13 @@ static void reinitialize(void)
         if (G.winsize_err)
                 printf(ESC"[999;999H" ESC"[6n");
 #endif
+#if ENABLE_PLATFORM_MINGW32
+        reset_screen();
+#endif
         buffer_fill_and_print();
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static int64_t getch_nowait(void)
 {
         int rd;
@@ -1151,6 +1187,46 @@ static int64_t getch_nowait(void)
         set_tty_cooked();
         return key64;
 }
+#else
+static int64_t getch_nowait(void)
+{
+        int64_t c;
+
+retry:
+        c = _getch();
+        if (c == 0 || c == 0xe0) {
+                switch (_getch()) {
+                case 0x48:
+                        c = KEYCODE_UP;
+                        break;
+                case 0x50:
+                        c = KEYCODE_DOWN;
+                        break;
+                case 0x49:
+                        c = KEYCODE_PAGEUP;
+                        break;
+                case 0x51:
+                        c = KEYCODE_PAGEDOWN;
+                        break;
+                case 0x47:
+                        c = KEYCODE_HOME;
+                        break;
+                case 0x4f:
+                        c = KEYCODE_END;
+                        break;
+                default:
+                        goto retry;
+                }
+        }
+
+        /* Position cursor if line input is done */
+        if (less_gets_pos >= 0)
+                move_cursor(max_displayed_line + 2, less_gets_pos + 1);
+        fflush_all();
+
+        return c;
+}
+#endif
 
 /* Grab a character from input without requiring the return key.
  * May return KEYCODE_xxx values.
@@ -1791,10 +1867,12 @@ static void keypress_process(int keypress)
                 number_process(keypress);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static void sig_catcher(int sig)
 {
         less_exit(- sig);
 }
+#endif
 
 #if ENABLE_FEATURE_LESS_WINCH
 static void sigwinch_handler(int sig UNUSED_PARAM)
@@ -1806,7 +1884,9 @@ static void sigwinch_handler(int sig UNUSED_PARAM)
 int less_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int less_main(int argc, char **argv)
 {
+#if !ENABLE_PLATFORM_MINGW32
         char *tty_name;
+#endif
         int tty_fd;
 
         INIT_G();
@@ -1865,6 +1945,7 @@ int less_main(int argc, char **argv)
         if (option_mask32 & FLAG_TILDE)
                 empty_line_marker = "";
 
+#if !ENABLE_PLATFORM_MINGW32
         /* Some versions of less can survive w/o controlling tty,
          * try to do the same. This also allows to specify an alternative
          * tty via "less 1<>TTY".
@@ -1890,8 +1971,13 @@ int less_main(int argc, char **argv)
         }
         G.kbd_fd_orig_flags = ndelay_on(tty_fd);
         kbd_fd = tty_fd; /* save in a global */
+#else
+        kbd_fd = tty_fd = 0;
+#endif
 
+#if !ENABLE_PLATFORM_MINGW32
         get_termios_and_make_raw(tty_fd, &term_less, &term_orig, TERMIOS_RAW_CRNL_INPUT);
+#endif
 
         IF_FEATURE_LESS_ASK_TERMINAL(G.winsize_err =) get_terminal_width_height(tty_fd, &width, &max_displayed_line);
         /* 20: two tabstops + 4 */
diff --git a/miscutils/man.c b/miscutils/man.c
index ba6bb4c01..567323a88 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -199,11 +199,19 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
         if (path) while (*path) {
                 char *next_path;
                 char **path_element;
+#if ENABLE_PLATFORM_MINGW32
+                char save;
 
+                next_path = (char *)next_path_sep(path);
+#else
                 next_path = strchr(path, ':');
+#endif
                 if (next_path) {
                         if (next_path == path) /* "::"? */
                                 goto next;
+#if ENABLE_PLATFORM_MINGW32
+                        save = *next_path;
+#endif
                         *next_path = '\0';
                 }
                 /* Do we already have path? */
@@ -222,7 +230,11 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
                 if (!next_path)
                         break;
                 /* "path" may be a result of getenv(), be nice and don't mangle it */
+#if ENABLE_PLATFORM_MINGW32
+                *next_path = save;
+#else
                 *next_path = ':';
+#endif
  next:
                 path = next_path + 1;
         }
@@ -302,6 +314,16 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         }
         config_close(parser);
 
+#if ENABLE_PLATFORM_MINGW32
+        {
+                char *exepath = xstrdup(bb_busybox_exec_path);
+                char *relpath = concat_path_file(dirname(exepath), "man");
+                man_path_list = add_MANPATH(man_path_list, &count_mp, relpath);
+                free(relpath);
+                free(exepath);
+        }
+#endif
+
         {
                 /* environment overrides setting from man.config */
                 char *env_pager = getenv("MANPAGER");