X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdumpword.c;h=b81d47c72c51625f547f73366314b6877634f96f;hb=7113052cd865eee849a73da94044bce33ccb08fd;hp=0bc9a472c93344720e5833628cf37db3be2f7896;hpb=7f7bde5dd1305cfc598fe09030c69aad0dc01368;p=YACASL2.git

diff --git a/src/dumpword.c b/src/dumpword.c
index 0bc9a47..b81d47c 100644
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,56 +1,75 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
+#include "package.h"
 #include "word.h"
-#include "cerr.h"
 
 /**
- * dumpwordコマンドのオプション
+ * @brief 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コマンドのメイン
+ * @brief dumpwordコマンドのメイン
+ *
+ * @return 正常終了時は0、エラー発生時は1
+ *
+ * @param argc コマンドライン引数の数
+ * @param *argv[] コマンドライン引数の配列
  */
 int main(int argc, char *argv[])
 {
     bool logicalmode = false;    /* レジストリの内容を論理値（0から65535）で表示する場合はtrue */
-    int opt;
+    int opt, stat = 0;
     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_load();
+    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);
+            goto dumpwordfin;
         case 'h':
             fprintf(stdout, usage, argv[0]);
-            return 0;
+            goto dumpwordfin;
         case '?':
             fprintf(stderr, usage, argv[0]);
-            exit(-1);
+            setcerr(212, "");    /* invalid option */
+            goto dumpwordfin;
         }
     }
 
     if(argv[optind] == NULL) {
+        setcerr(213, "");    /* invalid argument */
         fprintf(stderr, usage, argv[0]);
-        exit(-1);
+        goto dumpwordfin;
     }
     /* WORD値に変換 */
     word = nh2word(argv[optind]);
     if(cerr->num > 0) {
         fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
-        exit(-1);
+        goto dumpwordfin;
     }
     fprintf(stdout, "%6s: ", argv[optind]);
     print_dumpword(word, logicalmode);
-    return 0;
+    fprintf(stdout, "\n");
+dumpwordfin:
+    if(cerr->num > 0) {
+        stat = 1;
+    }
+    freecerr();                 /* エラーの解放 */
+    return stat;
 }