[Cvs-cvs] ccvs/src ChangeLog main.c root.c sign.c verify.c [signed-commits3]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits3
Changes by:     Derek Robert Price <address@hidden>     06/01/12 03:15:23

Modified files:
        src            : ChangeLog main.c root.c sign.c verify.c 

Log message:
        * main.c (opt_usage): Clarify --verify usage.
        (main): Accept `--no-textmode'.
        * root.c (new_cvsroot_t): Default sign/verify options to NULL.
        (parse_cvsroot_t): Handle multiple textmode options and no-textmode.
        * sign.c (get_sign_template): Return default when method option is
        NULL.
        (get_sign_textmode): Ditto, but return NULL when an option is set to
        the empty string.
        * verify.c (get_verify_template): Return default when method option is
        NULL.
        (iverify_signature): Use documented template format strings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits3&tr1=1.3328.2.23&tr2=1.3328.2.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/main.c.diff?only_with_tag=signed-commits3&tr1=1.262.6.5&tr2=1.262.6.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/root.c.diff?only_with_tag=signed-commits3&tr1=1.121.2.2&tr2=1.121.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sign.c.diff?only_with_tag=signed-commits3&tr1=1.1.6.8&tr2=1.1.6.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/verify.c.diff?only_with_tag=signed-commits3&tr1=1.1.2.7&tr2=1.1.2.8&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3328.2.23 ccvs/src/ChangeLog:1.3328.2.24
--- ccvs/src/ChangeLog:1.3328.2.23      Wed Jan 11 04:43:15 2006
+++ ccvs/src/ChangeLog  Thu Jan 12 03:15:23 2006
@@ -1,3 +1,17 @@
+2006-01-11  Derek Price  <address@hidden>
+
+       * main.c (opt_usage): Clarify --verify usage.
+       (main): Accept `--no-textmode'.
+       * root.c (new_cvsroot_t): Default sign/verify options to NULL.
+       (parse_cvsroot_t): Handle multiple textmode options and no-textmode.
+       * sign.c (get_sign_template): Return default when method option is
+       NULL.
+       (get_sign_textmode): Ditto, but return NULL when an option is set to
+       the empty string.
+       * verify.c (get_verify_template): Return default when method option is
+       NULL.
+       (iverify_signature): Use documented template format strings.
+
 2006-01-10  Derek Price  <address@hidden>
 
        * sign.c (sign_usage): Add usage for `-r'.
Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.262.6.5 ccvs/src/main.c:1.262.6.6
--- ccvs/src/main.c:1.262.6.5   Fri Jan  6 20:37:13 2006
+++ ccvs/src/main.c     Thu Jan 12 03:15:23 2006
@@ -330,7 +330,7 @@
     "                 generating signatures.\n",
     "    --verify[=(off | warn | fatal)] | --no-verify\n",
     "                 Force (or forbid) OpenPGP signature verification\n",
-    "                 (default warns).\n",
+    "                 on checkout (default warns on failure).\n",
     "    -G TEMPLATE\n",
     "    --verify-template TEMPLATE\n",
     "                 Use TEMPLATE to verify OpenPGP signatures.\n",
@@ -560,10 +560,11 @@
        {"sign-template", required_argument, NULL, 'G'},
        {"sign-arg", required_argument, NULL, 6},
        {"textmode", required_argument, NULL, 7},
-       {"verify", optional_argument, NULL, 8},
-       {"no-verify", 0, NULL, 9},
-       {"verify-template", required_argument, NULL, 10},
-       {"verify-arg", required_argument, NULL, 11},
+       {"no-textmode", NULL, NULL, 8},
+       {"verify", optional_argument, NULL, 9},
+       {"no-verify", 0, NULL, 10},
+       {"verify-template", required_argument, NULL, 11},
+       {"verify-arg", required_argument, NULL, 12},
 #ifdef SERVER_SUPPORT
        {"allow-root", required_argument, NULL, 3},
 #endif /* SERVER_SUPPORT */
@@ -722,6 +723,10 @@
                set_sign_textmode (optarg);
                break;
            case 8:
+               /* --no-textmode */
+               set_sign_textmode ("");
+               break;
+           case 9:
                /* --verify */
                if (optarg)
                {
@@ -744,15 +749,15 @@
                else
                    set_verify_checkouts (VERIFY_FATAL);
                break;
-           case 9:
+           case 10:
                /* --no-verify */
                set_verify_checkouts (VERIFY_OFF);
                break;
-           case 10:
+           case 11:
                /* --verify-template */
                set_verify_template (optarg);
                break;
-           case 11:
+           case 12:
                /* --verify-arg */
                add_verify_arg (optarg);
                break;
Index: ccvs/src/root.c
diff -u ccvs/src/root.c:1.121.2.2 ccvs/src/root.c:1.121.2.3
--- ccvs/src/root.c:1.121.2.2   Sat Dec 31 19:51:11 2005
+++ ccvs/src/root.c     Thu Jan 12 03:15:23 2006
@@ -399,11 +399,11 @@
     newroot->method = null_method;
     newroot->isremote = false;
     newroot->sign = SIGN_DEFAULT;
-    newroot->sign_template = xstrdup (DEFAULT_SIGN_TEMPLATE);
-    newroot->sign_textmode = xstrdup (DEFAULT_SIGN_TEXTMODE);
+    newroot->sign_template = NULL;
+    newroot->sign_textmode = NULL;
     newroot->sign_args = getlist ();
     newroot->verify = VERIFY_DEFAULT;
-    newroot->verify_template = xstrdup (DEFAULT_VERIFY_TEMPLATE);
+    newroot->verify_template = NULL;
     newroot->verify_args = getlist ();
 #ifdef CLIENT_SUPPORT
     newroot->username = NULL;
@@ -648,8 +648,18 @@
                newroot->sign = SIGN_NEVER;
            else if (!strcasecmp (p, "sign-template"))
                newroot->sign_template = xstrdup (q);
-           else if (!strcasecmp (p, "sign-textmode"))
+           else if (!strcasecmp (p, "textmode"))
+           {
+               if (newroot->sign_textmode)
+                   free (newroot->sign_textmode);
                newroot->sign_textmode = xstrdup (q);
+           }
+           else if (!strcasecmp (p, "no-textmode"))
+           {
+               if (newroot->sign_textmode)
+                   free (newroot->sign_textmode);
+               newroot->sign_textmode = xstrdup ("");
+           }
            else if (!strcasecmp (p, "sign-arg"))
                push_string (newroot->sign_args, q);
            else if (!strcasecmp (p, "no-verify"))
Index: ccvs/src/sign.c
diff -u ccvs/src/sign.c:1.1.6.8 ccvs/src/sign.c:1.1.6.9
--- ccvs/src/sign.c:1.1.6.8     Wed Jan 11 04:43:15 2006
+++ ccvs/src/sign.c     Thu Jan 12 03:15:23 2006
@@ -150,7 +150,9 @@
 get_sign_template (void)
 {
     if (sign_template) return sign_template;
-    return current_parsed_root->sign_template;
+    if (current_parsed_root->sign_template)
+       return current_parsed_root->sign_template;
+    return DEFAULT_SIGN_TEMPLATE;
 }
 
 
@@ -164,8 +166,18 @@
 const char *
 get_sign_textmode (void)
 {
-    if (sign_textmode) return sign_textmode;
-    return current_parsed_root->sign_textmode;
+    const char *tmp = NULL;
+
+    if (sign_textmode)
+       tmp = sign_textmode;
+    else if (current_parsed_root->sign_textmode)
+       tmp = current_parsed_root->sign_textmode;
+    else
+       tmp = DEFAULT_SIGN_TEXTMODE;
+
+    if (tmp && !strlen (tmp)) return NULL;
+    /* else */
+    return tmp;
 }
 
 
Index: ccvs/src/verify.c
diff -u ccvs/src/verify.c:1.1.2.7 ccvs/src/verify.c:1.1.2.8
--- ccvs/src/verify.c:1.1.2.7   Wed Jan 11 04:37:08 2006
+++ ccvs/src/verify.c   Thu Jan 12 03:15:23 2006
@@ -155,7 +155,9 @@
 get_verify_template (void)
 {
     if (verify_template) return verify_template;
-    return current_parsed_root->verify_template;
+    if (current_parsed_root->verify_template)
+       return current_parsed_root->verify_template;
+    return DEFAULT_VERIFY_TEMPLATE;
 }
 
 
@@ -289,8 +291,8 @@
                              "r", "s", current_parsed_root->directory,
                              "p", "s", srepos,
                              "t", "s", bin ? NULL : get_sign_textmode (),
-                             "s", "s", sigfile,
-                             "d", "s", filename,
+                             "S", "s", sigfile,
+                             "s", "s", filename,
                              (char *) NULL);
 
     if (!cmdline || !strlen (cmdline))