dumpwordコマンドで10進数／16進数を表す文字列が引数になるよう仕様変更

[YACASL2.git] / src / dumpword.c

diff --git a/src/dumpword.c b/src/dumpword.c
index 081ee44..f907eac 100644 (file)
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -6,14 +6,13 @@ static struct option longopts[] = {
     {"arithmetic", no_argument, NULL, 'a'},
     {"logical", no_argument, NULL, 'l'},
     {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0}
+    {0, 0, 0, 0},
 };
 
 int main(int argc, char *argv[])
 {
     int opt;
-    WORD w;
-    char *check;
+    WORD word;
     const char *usage = "Usage: %s [-alh] WORD\n";
 
     logicalmode = false;
@@ -24,7 +23,7 @@ int main(int argc, char *argv[])
             break;
         case 'h':
             fprintf(stdout, usage, argv[0]);
-            exit(-1);
+            return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
             exit(-1);
@@ -35,22 +34,16 @@ int main(int argc, char *argv[])
         fprintf(stderr, usage, argv[0]);
         exit(-1);
     }
-    if(*argv[optind] == '-' || strlen(argv[optind]) > 4) {
-        setcerr(116, argv[optind]);    /* out of hex range */
-    }
     /* WORD値に変換 */
-    w = (WORD)strtol(argv[optind], &check, 16);
-    if(*check != '\0') {
-        setcerr(115, argv[optind]);    /* not hex */
-    }
+    word = a2word(argv[optind]);
     if(cerrno > 0) {
         fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg);
         exit(-1);
     }
     if(logicalmode == true) {
-        fprintf(stdout, "%4s: %6d = #%04X = %s\n", argv[optind], w, w, word2bit(w));
+        fprintf(stdout, "%6s: %6d = #%04X = %s\n", argv[optind], word, word, word2bit(word));
     } else {
-        fprintf(stdout, "%4s: %6d = #%04X = %s\n", argv[optind], (short)w, w, word2bit(w));
+        fprintf(stdout, "%6s: %6d = #%04X = %s\n", argv[optind], (short)word, word, word2bit(word));
     }
     return 0;
 }