バージョンアップ

[YACASL2.git] / src / casl2rev.c

diff --git a/src/casl2rev.c b/src/casl2rev.c
index 11a2f5e..af99991 100644 (file)
--- a/src/casl2rev.c
+++ b/src/casl2rev.c
@@ -20,10 +20,13 @@ static struct option longopts[] = {
  */
 int main(int argc, char *argv[])
 {
-    int opt, stat = 0;
-    const char *version = PACKAGE_VERSION,  *cmdversion = "disassemble of YACASL2 version %s\n";
+    int opt = 0;
+    int stat = 0;
+    const char *version = PACKAGE_VERSION;
+    const char *cmdversion = "disassemble of YACASL2 version %s\n";
     const char *usage = "Usage: %s [-vh] FILE\n";
 
+    /* エラーの定義 */
     cerr_init();
     addcerrlist_load();
     addcerrlist_exec();
@@ -33,23 +36,26 @@ int main(int argc, char *argv[])
         switch(opt) {
         case 'v':
             fprintf(stdout, cmdversion, version);
-            return 0;
+            goto casl2revfin;
         case 'h':
             fprintf(stdout, usage, argv[0]);
-            return 0;
+            goto casl2revfin;
         case '?':
             fprintf(stderr, usage, argv[0]);
-            exit(1);
+            setcerr(212, "");    /* invalid option */
+            goto casl2revfin;
         }
     }
     if(argv[optind] == NULL) {
         setcerr(211, "");    /* object file not specified */
         fprintf(stderr, "disassemble error - %d: %s\n", cerr->num, cerr->msg);
-        exit(1);
+        goto casl2revfin;
     }
     disassemble_file(argv[optind]);                /* プログラム実行 */
-    stat = (cerr->num == 0) ? 0 : 1;
-    /* エラーの解放 */
-    freecerr();
+casl2revfin:
+    if(cerr->num > 0) {
+        stat = 1;
+    }
+    freecerr();                 /* エラーの解放 */
     return stat;
 }