バージョン表示機能を追加

[YACASL2.git] / src / comet2.c

diff --git a/src/comet2.c b/src/comet2.c
index f9eaa4e..36060d3 100644 (file)
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -6,6 +6,7 @@
 #include "exec.h"
 #include "cmem.h"
 #include "cerr.h"
+#include "package.h"
 
 /**
  * comet2コマンドのオプション
@@ -17,6 +18,7 @@ static struct option longopts[] = {
     {"dump", no_argument, NULL, 'd'},
     {"memorysize", required_argument, NULL, 'M'},
     {"clocks", required_argument, NULL, 'C'},
+    { "version", no_argument, NULL, 'v' },
     {"help", no_argument, NULL, 'h'},
     {0, 0, 0, 0},
 };
@@ -28,14 +30,15 @@ int main(int argc, char *argv[])
 {
     int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
     int opt, stat = 0;
-    const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
+    const char *version = PACKAGE_VERSION,  *cmdversion = "comet2 of YACASL2 version %s\n";
+    const char *usage = "Usage: %s [-tTdvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
     cerr_init();
     addcerrlist_load();
     addcerrlist_exec();
 
     /* オプションの処理 */
-    while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
+    while((opt = getopt_long(argc, argv, "tTdM:C:vh", longopts, NULL)) != -1) {
         switch(opt) {
         case 't':
             execmode.trace = true;
@@ -53,6 +56,9 @@ int main(int argc, char *argv[])
         case 'C':
             clocks = atoi(optarg);
             break;
+        case 'v':
+            fprintf(stdout, cmdversion, version);
+            return 0;
         case 'h':
             fprintf(stdout, usage, argv[0]);
             return 0;
@@ -62,7 +68,7 @@ int main(int argc, char *argv[])
         }
     }
     if(argv[optind] == NULL) {
-        setcerr(211, NULL);    /* object file not specified */
+        setcerr(211, "");    /* object file not specified */
         fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
         exit(1);
     }