[svn] dirmngr - r321 - in trunk: doc po src

[svn author wk]

Author: wk
Date: 2009-07-31 15:36:49 +0200 (Fri, 31 Jul 2009)
New Revision: 321

Modified:
   trunk/doc/dirmngr.texi
   trunk/po/de.po
   trunk/po/dirmngr.pot
   trunk/src/dirmngr-client.c
   trunk/src/http.c
Log:
Escape spaces in URLs


Modified: trunk/doc/dirmngr.texi
===================================================================
--- trunk/doc/dirmngr.texi	2009-07-31 13:10:43 UTC (rev 320)
+++ trunk/doc/dirmngr.texi	2009-07-31 13:36:49 UTC (rev 321)
@@ -1000,7 +1000,7 @@
 @item --load-crl
 @opindex load-crl
 This command expects a list of filenames with DER encoded CRL files.
-With the option @option{--url} URLs are expected in palce of filenames
+With the option @option{--url} URLs are expected in place of filenames
 and they are loaded directly from the given location.  All CRLs will be
 validated and then loaded into dirmngr's cache.
 

Modified: trunk/po/de.po  [not shown]
Modified: trunk/po/dirmngr.pot
===================================================================
--- trunk/po/dirmngr.pot	2009-07-31 13:10:43 UTC (rev 320)
+++ trunk/po/dirmngr.pot	2009-07-31 13:36:49 UTC (rev 321)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2009-07-31 13:57+0200\n"
+"POT-Creation-Date: 2009-07-31 14:26+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1563,7 +1563,7 @@
 "not valid and other error codes for general failures\n"
 msgstr ""
 
-#: src/dirmngr-client.c:285 src/dirmngr-client.c:1005
+#: src/dirmngr-client.c:285 src/dirmngr-client.c:1004
 #, c-format
 msgid "error reading certificate from stdin: %s\n"
 msgstr ""
@@ -1596,15 +1596,15 @@
 msgid "validation of certificate failed: %s\n"
 msgstr ""
 
-#: src/dirmngr-client.c:404 src/dirmngr-client.c:1016
+#: src/dirmngr-client.c:404 src/dirmngr-client.c:1015
 msgid "certificate is valid\n"
 msgstr ""
 
-#: src/dirmngr-client.c:410 src/dirmngr-client.c:1024
+#: src/dirmngr-client.c:410 src/dirmngr-client.c:1023
 msgid "certificate has been revoked\n"
 msgstr ""
 
-#: src/dirmngr-client.c:415 src/dirmngr-client.c:1026
+#: src/dirmngr-client.c:415 src/dirmngr-client.c:1025
 #, c-format
 msgid "certificate check failed: %s\n"
 msgstr ""
@@ -1650,11 +1650,11 @@
 msgid "unsupported inquiry `%s'\n"
 msgstr ""
 
-#: src/dirmngr-client.c:906
+#: src/dirmngr-client.c:903
 msgid "absolute file name expected\n"
 msgstr ""
 
-#: src/dirmngr-client.c:949
+#: src/dirmngr-client.c:948
 #, c-format
 msgid "looking up `%s'\n"
 msgstr ""

Modified: trunk/src/dirmngr-client.c
===================================================================
--- trunk/src/dirmngr-client.c	2009-07-31 13:10:43 UTC (rev 320)
+++ trunk/src/dirmngr-client.c	2009-07-31 13:36:49 UTC (rev 321)
@@ -884,10 +884,7 @@
   char *fname, *line, *p;
 
   if (opt.url)
-    {
-      line = xmalloc (8+6+ strlen (filename) + 1);
-      strcpy (stpcpy (line, "LOADCRL --url "), filename?filename:"");
-    }
+    fname = xstrdup (filename);
   else
     {
 #ifdef HAVE_CANONICALIZE_FILE_NAME
@@ -906,23 +903,25 @@
           log_error (_("absolute file name expected\n"));
           return gpg_error (GPG_ERR_GENERAL);
         }
-      
-      line = xmalloc (8+ strlen (fname) * 3 + 1);
-      p = stpcpy (line, "LOADCRL ");
-      for (s = fname; *s; s++)
+    }
+  
+  line = xmalloc (8 + 6 + strlen (fname) * 3 + 1);
+  p = stpcpy (line, "LOADCRL ");
+  if (opt.url)
+    p = stpcpy (p, "--url ");
+  for (s = fname; *s; s++)
+    {
+      if (*s < ' ' || *s == '+')
         {
-          if (*s < ' ' || *s == '+')
-            {
-              sprintf (p, "%%%02X", *s);
-              p += 3;
-            }
-          else if (*s == ' ')
-            *p++ = '+';
-          else
-            *p++ = *s;
+          sprintf (p, "%%%02X", *s);
+          p += 3;
         }
-      *p = 0;
-    }
+      else if (*s == ' ')
+        *p++ = '+';
+      else
+        *p++ = *s;
+        }
+  *p = 0;
 
   err = assuan_transact (ctx, line, NULL, NULL,
                         NULL, NULL,

Modified: trunk/src/http.c
===================================================================
--- trunk/src/http.c	2009-07-31 13:10:43 UTC (rev 320)
+++ trunk/src/http.c	2009-07-31 13:36:49 UTC (rev 321)
@@ -1770,7 +1770,7 @@
   uri = NULL;
 
   rc = http_open_document (&hd, *argv, NULL, 
-                           HTTP_FLAG_NO_SHUTDOWN | HTTP_FLAG_NEED_HEADER,
+                           HTTP_FLAG_NEED_HEADER,
                            NULL, tls_session);
   if (rc)
     {
@@ -1805,7 +1805,7 @@
 #endif /*TEST*/
 
 /*
-Saved Local Variables:
+Local Variables:
 compile-command: "gcc -I.. -I../gl -DTEST -DHAVE_CONFIG_H -Wall -O2 -g -o http-test http.c -L. -lcommon -L../jnlib -ljnlib -lgcrypt -lpth -lgnutls"
 End:
 */