X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fdumpword.c;h=05cfe9a58de85bedbe3d8083b3d2cd7c9d7f25b5;hp=0c7533732b2094701448eda78883c631ce3a8ce6;hb=aac61489b663d7156faba49d9c3e99702dcf9b8c;hpb=1708c99d4b6263863304d48ebca3b3473d6a0112

diff --git a/src/dumpword.c b/src/dumpword.c
index 0c75337..05cfe9a 100644
--- 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 "word.h"
 
 /**
  * @brief dumpwordコマンドのオプション
@@ -33,8 +28,6 @@ int main(int argc, char *argv[])
     const char *version = PACKAGE_VERSION,  *cmdversion = "dumpword of YACASL2 version %s\n";
     const char *usage = "Usage: %s [-alh] WORD\n";
 
-    cerr_init();
-    addcerrlist_word();
     while((opt = getopt_long(argc, argv, "alvh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
@@ -52,17 +45,25 @@ int main(int argc, char *argv[])
         }
     }
 
+    /* エラーの定義 */
+    cerr_init();
+    addcerrlist_word();
+
     if(argv[optind] == NULL) {
         fprintf(stderr, usage, argv[0]);
+        freecerr();
         exit(1);
     }
     /* WORD値に変換 */
     word = nh2word(argv[optind]);
     if(cerr->num > 0) {
         fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
+        freecerr();
         exit(1);
     }
     fprintf(stdout, "%6s: ", argv[optind]);
     print_dumpword(word, logicalmode);
+    fprintf(stdout, "\n");
+    freecerr();
     return 0;
 }