numconvert: adding support for strings

3 files changed, 79 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index d47219b..3ecbeb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Copyright (C) 2008, 2009, 2010, 2021 David M. Syzdek <david@syzdek.net>
 1.6
         - numconvert: fixing output for char (syzdek)
         - numconvert: fixing padding in  output (syzdek)
+        - numconvert: adding support for strings (syzdek)
 
 1.5     2021/10/11 (syzdek)
         - autotools: adding flags to enable/disable individual tools (syzdek)
diff --git a/doc/numconvert.1.in b/doc/numconvert.1.in
index 03a4135..1791166 100644
--- a/doc/numconvert.1.in
+++ b/doc/numconvert.1.in
@@ -37,7 +37,7 @@
 .SH NAME
 numconvert \- displays values using multiple numeral systems
 .SH SYNOPSIS
-\fBnumconvert\fR [\fB-a\fR | \fB-b\fR | \fB-d\fR \fB | \fB-o\fR | \fB-x\fR] [\fB-ABDlOqRrsX\fR] [\fB-f\fR \fIorder\fR] \fInumber1\fR [\fInumber2\fR [\fInumberN\fR]]
+\fBnumconvert\fR [\fB-a\fR | \fB-b\fR | \fB-d\fR \fB | \fB-o\fR | \fB-x\fR] [\fB-ABDlOqRrSswX\fR] [\fB-f\fR \fIorder\fR] \fInumber1\fR [\fInumber2\fR [\fInumberN\fR]]
 .sp
 \fBnumconvert\fR [\fB--help\fR | \fB-h\fR]
 .sp
@@ -100,7 +100,13 @@ Display binary numerals in little endian byte order.
 \fB-r\fR
 Display binary numerals in little endian byte order and little endian bit order
 .TP
+\fB-S\fR
+Display the values as a string.
+.TP
 \fB-s\fR
+Process input strings as a ASCII string.
+.TP
+\fB-w\fR
 Do not print spaces when displaying numerals.
 .TP
 \fB\-V\fR, \fB--version\fR
diff --git a/src/numconvert.c b/src/numconvert.c
index 3f52a53..5db075c 100644
--- a/src/numconvert.c
+++ b/src/numconvert.c
@@ -101,6 +101,7 @@
 #define MY_OPT_ASCII    0x0100
 #define MY_OPT_HEADER   0x0200
 #define MY_OPT_QUIET    0x0400
+#define MY_OPT_STR      0x0800
 
 #define MY_TOGGLE(value, bit) ( (value&bit) ? (value&(~bit)) : (value|bit))
 
@@ -142,13 +143,13 @@ int main(int argc, char * argv[])
    int            bases;
    int32_t        opt;
    intmax_t       x;
-   intmax_t       y;
+   size_t         y;
    uintmax_t      num;
    char *         endptr;
    const char *   order;
 
    // getopt options
-   static char   short_opt[] = "AaBbDdf:hlOoqRrwVXx";
+   static char   short_opt[] = "AaBbDdf:hlOoqRrSswVXx";
    static struct option long_opt[] =
    {
       {"help",          no_argument, 0, 'h'},
@@ -230,6 +231,15 @@ int main(int argc, char * argv[])
          opt |= MY_OPT_LEBIT;
          break;
 
+         case 'S':
+         opt |= MY_OPT_STR;
+         bases++;
+         break;
+
+         case 's':
+         base = 128;
+         break;
+
          case 'w':
          opt = MY_TOGGLE(opt, MY_OPT_SPACE);
          break;
@@ -295,6 +305,12 @@ int main(int argc, char * argv[])
             bases++;
             break;
 
+            case 'S':
+            case 's':
+            opt |= MY_OPT_STR;
+            bases++;
+            break;
+
             default:
             fprintf(stderr, "%s: unknown order option -- %c\n", PROGRAM_NAME, order[x]);
             fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
@@ -303,7 +319,7 @@ int main(int argc, char * argv[])
       };
    };
    if (!(order))
-      order  = "abxod";
+      order  = ((opt & MY_OPT_STR)) ? (((opt & MY_OPT_ASCII)) ? "sabxod" : "sbxod") : "abxod";
 
    if (!(opt & (MY_OPT_BIN|MY_OPT_DEC|MY_OPT_HEX|MY_OPT_OCT|MY_OPT_ASCII)))
    {
@@ -344,7 +360,7 @@ int main(int argc, char * argv[])
             optbase = 10;
             for(y = 0; ( ((uint32_t)y) < strlen(argv[x]) && (optbase == 10) ); y++)
                if ((argv[x][y] < '0') || (argv[x][y] > '9'))
-                  optbase = -1;
+                  optbase = 128;
          };
       };
 
@@ -352,10 +368,25 @@ int main(int argc, char * argv[])
       switch(optbase)
       {
          case -1:
-         for(y = 0; (y < (int)strlen(argv[x])); y++)
+         for(y = 0; (y < strlen(argv[x])); y++)
             my_print(opt, (intmax_t)argv[x][y], order);
          break;
 
+         case 128:
+         for(y = 0; (y < strlen(argv[x])); y++)
+         {
+            if ((y % sizeof(uintmax_t)) == 0)
+            {
+               if (y != 0)
+                  my_print(opt, num, order);
+               num = 0;
+            };
+            num <<= 8;
+            num  |= argv[x][y];
+         };
+         my_print(opt, num, order);
+         break;
+
          default:
          num = strtoumax(argv[x], &endptr, optbase);
          if (endptr[0] != '\0')
@@ -382,11 +413,13 @@ void my_print(int32_t opt, uintmax_t num, const char * order)
 {
    char      buff[56];
    unsigned  pos;
-   intmax_t  y;
-   intmax_t  z;
+   char      c;
+   uintmax_t y;
+   uintmax_t z;
    uintmax_t len;
    uintmax_t max;
    uintmax_t byte;
+   uintmax_t mask;
 
    len = 0;
 
@@ -414,6 +447,35 @@ void my_print(int32_t opt, uintmax_t num, const char * order)
          len = printf("'%c'", (((num >= 32) && (num <= 126)) ? (char)num : '.'));
          break;
 
+         // print ASCII string value
+         case 'S':
+         case 's':
+         if (!(opt & MY_OPT_STR))
+            break;
+         if (len)
+            printf((opt & MY_OPT_SPACE) ? ", " : ",");
+         if ((opt & MY_OPT_HEADER))
+         {
+            len = printf("%*s", (int)((!(opt & MY_OPT_SPACE)) ? 0 : (max+2)), "String");
+            break;
+         };
+         mask = ~((uintmax_t)0);
+         for(y = 2; ((mask > 0) && ((mask & num))); y++)
+            mask <<= 8;
+         y = (y < (max+2)) ? (max+2) : y;
+         byte      = num;
+         buff[y]   = '\0';
+         buff[0]   = '"';
+         buff[y-1] = '"';
+         for(z = y-1; (z > 1); z--)
+         {
+            c           = byte & 0xff;
+            buff[z-1]   = ((c >= 32) && (c <= 126)) ? c : '.';
+            byte      >>= 8;
+         };
+         len = printf("%*s", (int)(max+2), buff);
+         break;
+
          // print binary value
          case 'B':
          case 'b':
@@ -521,6 +583,8 @@ void my_usage()
    printf("  -q                        suppress column names\n");
    printf("  -R                        display binary in little endian byte order\n");
    printf("  -r                        display binary in little endian bit nad byte order\n");
+   printf("  -S                        enable ASCII string output\n");
+   printf("  -s                        assume ASCII string notation for input\n");
    printf("  -w                        display output without spacing\n");
    printf("  -X                        enable hexadecimal output\n");
    printf("  -x                        assume hexadecimal notation for input\n");