X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fdumpword.c;h=39098903454bf010d26167e7ed0f56c87e7be05f;hp=d39dfafbd865316e3182758f0bc6afd2dde2858a;hb=86e559d164166966a797a1e5855871d48e087ddd;hpb=8b76a2371ab7fc325f11b9164a73e899f98072f0

diff --git a/src/dumpword.c b/src/dumpword.c
index d39dfaf..3909890 100644
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,13 +1,8 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include "word.h"
-#include "cerr.h"
 #include "package.h"
+#include "word.h"
 
 /**
- * dumpwordコマンドのオプション
+ * @brief dumpwordコマンドのオプション
  */
 static struct option longopts[] = {
     { "arithmetic", no_argument, NULL, 'a' },
@@ -18,18 +13,29 @@ static struct option longopts[] = {
 };
 
 /**
- * dumpwordコマンドのメイン
+ * @brief dumpwordコマンドのメイン
+ *
+ * @return 正常終了時は0、エラー発生時は1
+ *
+ * @param argc コマンドライン引数の数
+ * @param *argv[] コマンドライン引数の配列
  */
 int main(int argc, char *argv[])
 {
     bool logicalmode = false;    /* レジストリの内容を論理値（0から65535）で表示する場合はtrue */
-    int opt;
-    WORD word;
-    const char *version = PACKAGE_VERSION,  *cmdversion = "dumpword of YACASL2 version %s\n";
+    int opt = 0;
+    int stat = 0;
+    WORD word = 0;
+    const char *version = PACKAGE_VERSION;
+    const char *cmdversion = "dumpword of YACASL2 version %s\n";
     const char *usage = "Usage: %s [-alh] WORD\n";
 
+    /* エラーの定義 */
     cerr_init();
+    addcerrlist_load();
     addcerrlist_word();
+
+    /* オプションの処理 */
     while((opt = getopt_long(argc, argv, "alvh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
@@ -37,27 +43,35 @@ int main(int argc, char *argv[])
             break;
         case 'v':
             fprintf(stdout, cmdversion, version);
-            return 0;
+            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;
 }