バージョンアップ

[YACASL2.git] / src / dumpword.c

diff --git a/src/dumpword.c b/src/dumpword.c
index 0c75337..3909890 100644 (file)
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,10 +1,5 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include "word.h"
-#include "cerr.h"

 #include "package.h"
 #include "package.h"

+#include "word.h"

 
 /**
  * @brief dumpwordコマンドのオプション
 
 /**
  * @brief dumpwordコマンドのオプション


@@ -28,13 +23,19 @@ static struct option longopts[] = {
 int main(int argc, char *argv[])
 {
     bool logicalmode = false;    /* レジストリの内容を論理値（0から65535）で表示する場合はtrue */
 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";
 
     const char *usage = "Usage: %s [-alh] WORD\n";
 

+    /* エラーの定義 */

     cerr_init();
     cerr_init();

+    addcerrlist_load();

     addcerrlist_word();
     addcerrlist_word();

+
+    /* オプションの処理 */

     while((opt = getopt_long(argc, argv, "alvh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
     while((opt = getopt_long(argc, argv, "alvh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':


@@ -42,27 +43,35 @@ int main(int argc, char *argv[])
             break;
         case 'v':
             fprintf(stdout, cmdversion, version);
             break;
         case 'v':
             fprintf(stdout, cmdversion, version);

-            return 0;
+            goto dumpwordfin;

         case 'h':
             fprintf(stdout, usage, argv[0]);
         case 'h':
             fprintf(stdout, usage, argv[0]);

-            return 0;
+            goto dumpwordfin;

         case '?':
             fprintf(stderr, usage, argv[0]);
         case '?':
             fprintf(stderr, usage, argv[0]);

-            exit(1);
+            setcerr(212, "");    /* invalid option */
+            goto dumpwordfin;

         }
     }
 
     if(argv[optind] == NULL) {
         }
     }
 
     if(argv[optind] == NULL) {

+        setcerr(213, "");    /* invalid argument */

         fprintf(stderr, usage, argv[0]);
         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);
     }
     /* 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);
     }
     fprintf(stdout, "%6s: ", argv[optind]);
     print_dumpword(word, logicalmode);

-    return 0;
+    fprintf(stdout, "\n");
+dumpwordfin:
+    if(cerr->num > 0) {
+        stat = 1;
+    }
+    freecerr();                 /* エラーの解放 */
+    return stat;

 }
 }