1 files changed, 71 insertions, 20 deletions

diff --git a/libbb/dump.c b/libbb/dump.c
index ac5d47d9e..3dc53d55f 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -36,6 +36,9 @@ typedef struct priv_dumper_t {
         off_t eaddress;          /* end address */
         int blocksize;
         smallint exitval;        /* final exit value */
+#if ENABLE_PLATFORM_MINGW32
+        FILE *fd;
+#endif
 
         /* former statics */
         smallint next__done;
@@ -59,6 +62,9 @@ dumper_t* FAST_FUNC alloc_dumper(void)
         dumper->pub.dump_length = -1;
         dumper->pub.dump_vflag = FIRST;
         dumper->get__ateof = 1;
+#if ENABLE_PLATFORM_MINGW32
+        dumper->fd = stdin;
+#endif
         return &dumper->pub;
 }
 
@@ -335,7 +341,11 @@ static void do_skip(priv_dumper_t *dumper, const char *fname)
 {
         struct stat sbuf;
 
+#if ENABLE_PLATFORM_MINGW32
+        xfstat(fileno(dumper->fd), &sbuf, fname);
+#else
         xfstat(STDIN_FILENO, &sbuf, fname);
+#endif
         if (S_ISREG(sbuf.st_mode)
          && dumper->pub.dump_skip >= sbuf.st_size
         ) {
@@ -344,7 +354,11 @@ static void do_skip(priv_dumper_t *dumper, const char *fname)
                 dumper->pub.address += sbuf.st_size;
                 return;
         }
+#if ENABLE_PLATFORM_MINGW32
+        if (fseeko(dumper->fd, dumper->pub.dump_skip, SEEK_SET)) {
+#else
         if (fseeko(stdin, dumper->pub.dump_skip, SEEK_SET)) {
+#endif
                 bb_simple_perror_msg_and_die(fname);
         }
         dumper->pub.address += dumper->pub.dump_skip;
@@ -360,13 +374,23 @@ static NOINLINE int next(priv_dumper_t *dumper)
                 if (fname) {
                         dumper->argv++;
                         if (NOT_LONE_DASH(fname)) {
+#if ENABLE_PLATFORM_MINGW32
+                                dumper->fd = fopen(fname, "r");
+                                if (!dumper->fd) {
+#else
                                 if (!freopen(fname, "r", stdin)) {
+#endif
                                         bb_simple_perror_msg(fname);
                                         dumper->exitval = 1;
                                         dumper->next__done = 1;
                                         continue;
                                 }
                         }
+#if ENABLE_PLATFORM_MINGW32
+                        else {
+                                dumper->fd = stdin;
+                        }
+#endif
                 } else {
                         if (dumper->next__done)
                                 return 0; /* no next file */
@@ -421,13 +445,25 @@ static unsigned char *get(priv_dumper_t *dumper)
                         dumper->eaddress = dumper->pub.address + nread;
                         return dumper->get__curp;
                 }
+#if ENABLE_PLATFORM_MINGW32
+                n = fread(dumper->get__curp + nread, sizeof(unsigned char),
+                                dumper->pub.dump_length == -1 ? need : MIN(dumper->pub.dump_length, need), dumper->fd);
+#else
                 n = fread(dumper->get__curp + nread, sizeof(unsigned char),
                                 dumper->pub.dump_length == -1 ? need : MIN(dumper->pub.dump_length, need), stdin);
+#endif
                 if (n == 0) {
+#if ENABLE_PLATFORM_MINGW32
+                        if (ferror(dumper->fd)) {
+#else
                         if (ferror(stdin)) {
+#endif
                                 bb_simple_perror_msg(dumper->argv[-1]);
                         }
                         dumper->get__ateof = 1;
+#if ENABLE_PLATFORM_MINGW32
+                        fclose(dumper->fd);
+#endif
                         continue;
                 }
                 dumper->get__ateof = 0;
@@ -478,37 +514,52 @@ static void bpad(PR *pr)
                 continue;
 }
 
-static const char conv_str[] ALIGN1 =
-        "\0"  "\\""0""\0"
-        "\007""\\""a""\0"
-        "\b"  "\\""b""\0"
-        "\f"  "\\""f""\0"
-        "\n"  "\\""n""\0"
-        "\r"  "\\""r""\0"
-        "\t"  "\\""t""\0"
-        "\v"  "\\""v""\0"
-        ;
-
 static void conv_c(PR *pr, unsigned char *p)
 {
-        const char *str = conv_str;
-
-        do {
-                if (*p == *str) {
-                        ++str;
-                        goto strpr; /* map e.g. '\n' to "\\n" */
-                }
-                str += 4;
-        } while (*str);
+        const char *str;
+        unsigned char ch;
+
+        ch = *p;
+        if (ch == 0 || (ch -= 6, (signed char)ch > 0 && ch <= 7)) {
+                /* map chars 0,7..13 to "\0","\{a,b,t,n,v,f,r}" */
+                str = c_escape_conv_str00 + 3 * ch;
+                goto strpr;
+        }
 
         if (isprint_asciionly(*p)) {
                 *pr->cchar = 'c';
                 printf(pr->fmt, *p);
         } else {
+#if defined(__i386__) || defined(__x86_64__)
+                /* Abuse partial register operations */
+                uint32_t buf;
+                unsigned n = *p;
+                asm (           //00000000 00000000 00000000 aabbbccc
+"\n             shll $10,%%eax" //00000000 000000aa bbbccc00 00000000
+"\n             shrw $5,%%ax"   //00000000 000000aa 00000bbb ccc00000
+"\n             shrb $5,%%al"   //00000000 000000aa 00000bbb 00000ccc
+"\n             shll $8,%%eax"  //000000aa 00000bbb 00000ccc 00000000
+"\n             bswapl %%eax"   //00000000 00000ccc 00000bbb 000000aa
+"\n             addl $0x303030,%%eax"
+"\n"            : "=a" (n)
+                : "0" (n)
+                );
+                buf = n;
+                str = (void*)&buf;
+#elif 1
                 char buf[4];
                 /* gcc-8.0.1 needs lots of casts to shut up */
                 sprintf(buf, "%03o", (unsigned)(uint8_t)*p);
                 str = buf;
+#else // use faster version? +20 bytes of code relative to sprintf() method
+                char buf[4];
+                buf[3] = '\0';
+                ch = *p;
+                buf[2] = '0' + (ch & 7); ch >>= 3;
+                buf[1] = '0' + (ch & 7); ch >>= 3;
+                buf[0] = '0' + ch;
+                str = buf;
+#endif
  strpr:
                 *pr->cchar = 's';
                 printf(pr->fmt, str);