From e413e4b687759bbb7410e6153a3557a16c7e07f0 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 11 Aug 2011 08:33:50 +0200
Subject: [PATCH] yaz-url: HTTP method may be given. Change header (-H)
 option.

Argument for -H is now name:value rather than name=value - it just
seems more natural for Web hackers that way.
---
 util/yaz-url.c |   28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/util/yaz-url.c b/util/yaz-url.c
index b59b176..9cdb388 100644
--- a/util/yaz-url.c
+++ b/util/yaz-url.c
@@ -17,8 +17,9 @@
 static void usage(void)
 {
     printf("yaz-icu [options] url ..\n");
-    printf(" -H name=value       HTTP header\n");
-    printf(" -p file             POST content of file\n");
+    printf(" -H name:value       Set HTTP header (repeat if necessary)\n");
+    printf(" -m method           HTTP method\n");
+    printf(" -p file             POSTs file at following url\n");
     printf(" -u user/password    Basic HTTP auth\n");
     printf(" -x proxy            HTTP proxy\n");
     exit(1);
@@ -39,9 +40,12 @@ static char *get_file(const char *fname, size_t *len)
         exit(1);
     }
     *len = ftell(inf);
-    buf = xmalloc(*len);
-    fseek(inf, 0L, SEEK_SET);
-    fread(buf, 1, *len, inf);
+    if (*len)  /* zero length not considered an error */
+    {
+        buf = xmalloc(*len);
+        fseek(inf, 0L, SEEK_SET);
+        fread(buf, 1, *len, inf);
+    }
     fclose(inf);
     return buf;
 }
@@ -60,7 +64,7 @@ int main(int argc, char **argv)
     int exit_code = 0;
     int no_urls = 0;
 
-    while ((ret = options("hH:p:u:x:", argv, argc, &arg))
+    while ((ret = options("hH:m:p:u:x:", argv, argc, &arg))
            != YAZ_OPTIONS_EOF)
     {
         switch (ret)
@@ -69,21 +73,26 @@ int main(int argc, char **argv)
             usage();
             break;
         case 'H':
-            if (!strchr(arg, '='))
+            if (!strchr(arg, ':'))
             {
-                yaz_log(YLOG_FATAL, "bad header option (missing =): %s\n", arg);
+                yaz_log(YLOG_FATAL, "bad header option (missing :) %s\n", arg);
                 exit_code = 1;
             }
             else
             {
-                char *cp = strchr(arg, '=');
+                char *cp = strchr(arg, ':');
                 char *name = odr_malloc(odr, 1 + cp - arg);
                 char *value = cp + 1;
                 memcpy(name, arg, cp - arg);
                 name[cp - arg] = '\0';
+                while (*value == ' ') /* skip space after = */
+                    value++;
                 z_HTTP_header_add(odr, &http_headers, name, value);
             }
             break;
+        case 'm':
+            method = arg;
+            break;
         case 'p':
             xfree(post_buf);
             post_buf = get_file(arg, &post_len);
@@ -122,6 +131,7 @@ int main(int argc, char **argv)
             usage();
         }
     }
+    xfree(post_buf);
     yaz_url_destroy(p);
     odr_destroy(odr);
     if (no_urls == 0)
-- 
1.7.10.4