X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcasl2.c;h=204d307471d1ffe8c5f4212b30e462079c825351;hb=3242e69dd21cc00458447c231ef63f876ea54ad1;hp=47490a1d718c8e7697ce0c6cc7e2e3af27883d80;hpb=f8636262f5c60efbb9d1c608e2276d359bc348a0;p=YACASL2.git

diff --git a/src/casl2.c b/src/casl2.c
index 47490a1..204d307 100644
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -8,6 +8,7 @@
 #include "cerr.h"
 #include "assemble.h"
 #include "exec.h"
+#include "package.h"
 
 /**
  * casl2コマンドのオプション
@@ -26,6 +27,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 },
 };
@@ -65,7 +67,7 @@ void assemble(int filec, char *filev[])
 
     create_cmdtype_code();                         /* 命令の名前とタイプがキーのハッシュ表を作成 */
     asptr = malloc_chk(sizeof(ASPTR), "asptr");    /* アセンブル時のプロパティ用の領域確保 */
-    asptr->prog = malloc_chk(sizeof(LABELSIZE + 1), "asptr.prog");
+    asptr->prog = malloc_chk(LABELSIZE + 1, "asptr.prog");
     asptr->ptr = 0;
     /* アセンブル。ラベル表作成のため、2回行う */
     for(pass = FIRST; pass <= SECOND; pass++) {
@@ -107,17 +109,17 @@ asfin:
 int main(int argc, char *argv[])
 {
     int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS, opt, i, stat;
-    char *af[argc];
-    char *objfile = NULL;
+    char *af[argc], *objfile = NULL;
+    const char *version = PACKAGE_VERSION,  *cmdversion = "casl2 of YACASL2 version %s\n";
     const char *usage =
-        "Usage: %s [-slLaAtTdh] [-oO[<OBJECTFILE>]] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE1[ FILE2  ...]\n";
+        "Usage: %s [-slLaAtTdvh] [-oO[<OBJECTFILE>]] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE1[ FILE2  ...]\n";
 
     cerr_init();
     addcerrlist_casl2();
     addcerrlist_assemble();
     addcerrlist_exec();
     /* オプションの処理 */
-    while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
+    while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:vh", longopts, NULL)) != -1) {
         switch(opt) {
         case 's':
             asmode.src = true;
@@ -159,6 +161,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;