Add command-line parameter [-c configuration file].

diff --git a/ChangeLog b/ChangeLog
index 9e7068e..45fea3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-19  deflis
+    Version 0.8.10-mod+deflis
+    * \83R\83\93\83\\81[\83\8b\89B\82µ\82É\8e¸\94s\82·\82é\8fê\8d\87\82Ì\83p\83b\83`\82ðs-yata\8e\81\82Ì\82à\82Ì\82É\90Ø\82è\91Ö\82¦\81B
+      http://d.hatena.ne.jp/s-yata/20080823/1219474577
+    * \83R\83}\83\93\83h\83\89\83C\83\93\83p\83\89\83\81\81[\83^\82É\82æ\82écfg\90Ø\82è\91Ö\82¦\82Ì\8eÀ\91\95\81i\92\86\93r\94¼\92[\81j\81B
+
 2009-10-19  shimizukawa
     Unreleased
     * \95¶\8e\9a\83R\81[\83h\82Æ\82µ\82Ä'\r\n'\82ð\83N\83\8a\83b\83v\83{\81[\83h\82©\82ç\93\\82è\95t\82¯\82½\82Æ\82«\82É\81A\83f\81[\83^\8eó\82¯\8eæ\82é\8eÀ\8ds\92\86\83v\83\8d\83O\83\89\83\80\82ª\81AVK_RETURN\82Æ\82µ\82Ä\8f\88\97\9d\82µ\82È\82¢\8fê\8d\87\82ª\82 \82é\81B\82±\82Ì\82½\82ß\81A\r\82ð\96³\8e\8b\82µ\81A\n\82ðVK_RETURN\82Æ\82µ\82Ä\88µ\82¤\82æ\82¤\82É\82µ\82Ä\82Ý\82½\81B

diff --git a/option.cpp b/option.cpp
index 353a291..10a065f 100644 (file)
--- a/option.cpp
+++ b/option.cpp
@@ -1087,7 +1087,7 @@ static void usage(bool isLong)
                "ckw version " VERSION_STRING " , build " BUILDDATE_STRING "\n"
                COPYRIGHT_STRING "\n"
                "\n"
-               "Usage: ckw [options] [-e command args]\n"
+               "Usage: ckw [options] [-c configration file] [-e command args]\n"
                "\n");
 
        if(isLong) {
@@ -1173,7 +1173,7 @@ bool      ckOpt::set(int argc, char *argv[])
        int     i = 1;
 
        while(i < argc) {
-               if(!strcmp("-e", argv[i])) {
+               if(strcmp("-e", argv[i]) == 0) {
                        if(++i >= argc) {
                                usage(false);
                                return(false);
@@ -1181,15 +1181,25 @@ bool    ckOpt::set(int argc, char *argv[])
                        cmdsMake(argc-i, argv+i);
                        return(true);
                }
-               if(!strcmp("-help", argv[i])) {
+               if(strcmp("-help", argv[i]) == 0) {
                        usage(false);
                        return(false);
                }
-               if(!strcmp("--help", argv[i])) {
+               if(strcmp("--help", argv[i]) == 0) {
                        usage(true);
                        return(false);
                }
 
+               if(strcmp("-c", argv[i]) == 0) {
+                       if(++i >= argc) {
+                               usage(false);
+                               return(false);
+                       }
+                       setFile(argv[i]);
+                       loadXdefaults();
+                       skip = 1;
+               }
+
                skip = setOption(argv[i], (i+1<argc) ? argv[i+1] : NULL, false);
                if(skip < 1) {
                        usage(false);

diff --git a/version.h b/version.h
index 1a393c6..b85a5b1 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,8 +1,8 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 8
 #define VERSION_BUGFIX 10
-#define VERSION_STRING "0.8.10-mod2-smzkw1"
+#define VERSION_STRING "0.8.10-mod+git"
 #define VERSION_NUMSTRING "008101"
 #define BUILDDATE_STRING "2009/1/25 15:10 UTC+9"
-#define COPYRIGHT_STRING "Copyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>"
-#define ABOUT_DLG_STRING "ckw version 0.8.10-mod2-smzkw1 , build 2009/1/25 15:10:00 UTC+9\r\nCopyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>"
+#define COPYRIGHT_STRING "ckw original - Copyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>\r\n"
+#define ABOUT_DLG_STRING "ckw version 0.8.10-mod+git-deflis"