バージョン表示機能を追加

[YACASL2.git] / src / dumpword.c

diff --git a/src/dumpword.c b/src/dumpword.c
index dd49cd5..d39dfaf 100644 (file)
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,45 +1,61 @@
-#include "casl2.h"
 #define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
+#include "word.h"
+#include "cerr.h"
+#include "package.h"
 
+/**
+ * dumpwordコマンドのオプション
+ */
 static struct option longopts[] = {
     { "arithmetic", no_argument, NULL, 'a' },
     { "logical", no_argument, NULL, 'l' },
+    { "version", no_argument, NULL, 'v' },
     { "help", no_argument, NULL, 'h' },
     { 0, 0, 0, 0 },
 };
 
+/**
+ * dumpwordコマンドのメイン
+ */
 int main(int argc, char *argv[])
 {
-    bool logicalmode = false;    /* ã\83¬ã\82¸ã\82¹ã\83\88ã\83ªã\81®å\86\85容ã\82\92è«\96ç\90\86å\80¤ï¼\880ã\80\9c65535）で表示する場合はtrue */
+    bool logicalmode = false;    /* ã\83¬ã\82¸ã\82¹ã\83\88ã\83ªã\81®å\86\85容ã\82\92è«\96ç\90\86å\80¤ï¼\880ã\81\8bã\82\8965535）で表示する場合はtrue */
     int opt;
     WORD word;
+    const char *version = PACKAGE_VERSION,  *cmdversion = "dumpword of YACASL2 version %s\n";
     const char *usage = "Usage: %s [-alh] WORD\n";
 
     cerr_init();
-    while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
+    addcerrlist_word();
+    while((opt = getopt_long(argc, argv, "alvh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
             logicalmode = true;
             break;
+        case 'v':
+            fprintf(stdout, cmdversion, version);
+            return 0;
         case 'h':
             fprintf(stdout, usage, argv[0]);
             return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
-            exit(-1);
+            exit(1);
         }
     }
 
     if(argv[optind] == NULL) {
         fprintf(stderr, usage, argv[0]);
-        exit(-1);
+        exit(1);
     }
     /* WORD値に変換 */
     word = nh2word(argv[optind]);
     if(cerr->num > 0) {
         fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
-        exit(-1);
+        exit(1);
     }
     fprintf(stdout, "%6s: ", argv[optind]);
     print_dumpword(word, logicalmode);