Kevin P Roth's idea of supporting multiple -d options was turned into reality

1 files changed, 35 insertions, 20 deletions

diff --git a/src/main.c b/src/main.c
index d997d7b6b..d9bbd7c73 100644
--- a/src/main.c
+++ b/src/main.c
@@ -686,28 +686,43 @@ static int getparameter(char *flag, /* f or -long-flag */
       break;
     case 'd':
       /* postfield data */
-      if('@' == *nextarg) {
-        /* the data begins with a '@' letter, it means that a file name
-           or - (stdin) follows */
-        FILE *file;
-        char *ptr;
-
-        nextarg++; /* pass the @ */
-
-        if(strequal("-", nextarg))
-          file = stdin;
-        else 
-          file = fopen(nextarg, "r");
+      {
+        char *postdata=NULL;
+
+        if('@' == *nextarg) {
+          /* the data begins with a '@' letter, it means that a file name
+             or - (stdin) follows */
+          FILE *file;
+          char *ptr;
+
+          nextarg++; /* pass the @ */
+
+          if(strequal("-", nextarg))
+            file = stdin;
+          else 
+            file = fopen(nextarg, "r");
+
+          if(subletter == 'b') /* forced binary */
+            postdata = file2memory(file, &config->postfieldsize);
+          else
+            postdata = file2string(file);
+          if(file && (file != stdin))
+            fclose(stdin);
+        }
+        else {
+          GetStr(&postdata, nextarg);
+        }
 
-        if(subletter == 'b') /* forced binary */
-          config->postfields = file2memory(file, &config->postfieldsize);
+        if(config->postfields && *config->postfields) {
+          /* we already have a string, we append this one
+             with a separating &-letter */
+          char *oldpost=config->postfields;
+          config->postfields=maprintf("%s&%s", oldpost, postdata);
+          free(oldpost);
+          free(postdata);
+        }
         else
-          config->postfields = file2string(file);
-        if(file && (file != stdin))
-          fclose(stdin);
-      }
-      else {
-        GetStr(&config->postfields, nextarg);
+          config->postfields=postdata;
       }
       if(config->postfields)
         config->conf |= CONF_POST;