2002-09-03 13:52:59 +02:00
|
|
|
/***************************************************************************
|
1999-12-29 15:20:26 +01:00
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2004-01-07 10:19:33 +01:00
|
|
|
* Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2002-09-03 13:52:59 +02:00
|
|
|
* This software is licensed as described in the file COPYING, which
|
|
|
|
* you should have received as part of this distribution. The terms
|
|
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
|
|
* copies of the Software, and permit persons to whom the Software is
|
2002-09-03 13:52:59 +02:00
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* $Id$
|
2002-09-03 13:52:59 +02:00
|
|
|
***************************************************************************/
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Debug the form generator stand-alone by compiling this source file with:
|
|
|
|
|
2001-08-21 15:18:07 +02:00
|
|
|
gcc -DHAVE_CONFIG_H -I../ -g -D_FORM_DEBUG -o formdata -I../include formdata.c strequal.c
|
|
|
|
|
|
|
|
run the 'formdata' executable the output should end with:
|
|
|
|
All Tests seem to have worked ...
|
|
|
|
and the following parts should be there:
|
|
|
|
|
|
|
|
Content-Disposition: form-data; name="simple_COPYCONTENTS"
|
|
|
|
value for simple COPYCONTENTS
|
|
|
|
|
|
|
|
Content-Disposition: form-data; name="COPYCONTENTS_+_CONTENTTYPE"
|
|
|
|
Content-Type: image/gif
|
|
|
|
value for COPYCONTENTS + CONTENTTYPE
|
|
|
|
|
2001-08-28 10:54:33 +02:00
|
|
|
Content-Disposition: form-data; name="PRNAME_+_NAMELENGTH_+_COPYNAME_+_CONTENTSLENGTH"
|
|
|
|
vlue for PTRNAME + NAMELENGTH + COPYNAME + CONTENTSLENGTH
|
|
|
|
(or you might see P^@RNAME and v^@lue at the start)
|
|
|
|
|
2001-08-21 15:18:07 +02:00
|
|
|
Content-Disposition: form-data; name="simple_PTRCONTENTS"
|
|
|
|
value for simple PTRCONTENTS
|
|
|
|
|
|
|
|
Content-Disposition: form-data; name="PTRCONTENTS_+_CONTENTSLENGTH"
|
|
|
|
vlue for PTRCONTENTS + CONTENTSLENGTH
|
|
|
|
(or you might see v^@lue at the start)
|
|
|
|
|
|
|
|
Content-Disposition: form-data; name="PTRCONTENTS_+_CONTENTSLENGTH_+_CONTENTTYPE"
|
|
|
|
Content-Type: text/plain
|
|
|
|
vlue for PTRCOTNENTS + CONTENTSLENGTH + CONTENTTYPE
|
2001-08-28 10:54:33 +02:00
|
|
|
(or you might see v^@lue at the start)
|
2001-08-21 15:18:07 +02:00
|
|
|
|
|
|
|
Content-Disposition: form-data; name="FILE1_+_CONTENTTYPE"; filename="inet_ntoa_r.h"
|
|
|
|
Content-Type: text/html
|
|
|
|
...
|
|
|
|
|
|
|
|
Content-Disposition: form-data; name="FILE1_+_FILE2"
|
|
|
|
Content-Type: multipart/mixed, boundary=curlz1s0dkticx49MV1KGcYP5cvfSsz
|
2001-08-28 10:54:33 +02:00
|
|
|
...
|
2001-08-21 15:18:07 +02:00
|
|
|
Content-Disposition: attachment; filename="inet_ntoa_r.h"
|
|
|
|
Content-Type: text/plain
|
|
|
|
...
|
|
|
|
Content-Disposition: attachment; filename="Makefile.b32.resp"
|
|
|
|
Content-Type: text/plain
|
2001-08-28 10:54:33 +02:00
|
|
|
...
|
|
|
|
|
|
|
|
Content-Disposition: form-data; name="FILE1_+_FILE2_+_FILE3"
|
|
|
|
Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
|
|
|
|
...
|
|
|
|
Content-Disposition: attachment; filename="inet_ntoa_r.h"
|
|
|
|
Content-Type: text/plain
|
|
|
|
...
|
|
|
|
Content-Disposition: attachment; filename="Makefile.b32.resp"
|
|
|
|
Content-Type: text/plain
|
|
|
|
...
|
|
|
|
Content-Disposition: attachment; filename="inet_ntoa_r.h"
|
|
|
|
Content-Type: text/plain
|
2001-08-21 15:18:07 +02:00
|
|
|
...
|
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
|
|
|
|
Content-Disposition: form-data; name="ARRAY: FILE1_+_FILE2_+_FILE3"
|
|
|
|
Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
|
|
|
|
...
|
|
|
|
Content-Disposition: attachment; filename="inet_ntoa_r.h"
|
|
|
|
Content-Type: text/plain
|
|
|
|
...
|
|
|
|
Content-Disposition: attachment; filename="Makefile.b32.resp"
|
|
|
|
Content-Type: text/plain
|
|
|
|
...
|
|
|
|
Content-Disposition: attachment; filename="inet_ntoa_r.h"
|
|
|
|
Content-Type: text/plain
|
|
|
|
...
|
|
|
|
|
|
|
|
Content-Disposition: form-data; name="FILECONTENT"
|
|
|
|
...
|
|
|
|
|
2001-08-21 15:18:07 +02:00
|
|
|
For the old FormParse used by curl_formparse use:
|
|
|
|
|
|
|
|
gcc -DHAVE_CONFIG_H -I../ -g -D_OLD_FORM_DEBUG -o formdata -I../include formdata.c strequal.c
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
run the 'formdata' executable and make sure the output is ok!
|
|
|
|
|
|
|
|
try './formdata "name=Daniel" "poo=noo" "foo=bar"' and similarly
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2000-08-24 16:26:33 +02:00
|
|
|
#include "setup.h"
|
|
|
|
|
2002-06-11 13:13:01 +02:00
|
|
|
#ifndef CURL_DISABLE_HTTP
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
|
|
|
#include <time.h>
|
|
|
|
|
2004-01-29 14:56:45 +01:00
|
|
|
#ifndef CURL_OLDSTYLE
|
|
|
|
#define CURL_OLDSTYLE 1 /* enable deprecated prototype for curl_formparse */
|
|
|
|
#endif
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "formdata.h"
|
|
|
|
|
2000-05-22 16:12:12 +02:00
|
|
|
#include "strequal.h"
|
|
|
|
|
2000-10-09 13:12:34 +02:00
|
|
|
/* The last #include file should be: */
|
2003-06-26 13:22:12 +02:00
|
|
|
#ifdef CURLDEBUG
|
2000-10-09 13:12:34 +02:00
|
|
|
#include "memdebug.h"
|
|
|
|
#endif
|
|
|
|
|
2003-04-04 14:24:01 +02:00
|
|
|
/* Length of the random boundary string. */
|
|
|
|
#define BOUNDARY_LENGTH 40
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
/* What kind of Content-Type to use on un-specified files with unrecognized
|
|
|
|
extensions. */
|
2003-11-13 08:43:18 +01:00
|
|
|
#define HTTPPOST_CONTENTTYPE_DEFAULT "application/octet-stream"
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
/* This is a silly duplicate of the function in main.c to enable this source
|
|
|
|
to compile stand-alone for better debugging */
|
|
|
|
static void GetStr(char **string,
|
2001-08-21 15:18:07 +02:00
|
|
|
const char *value)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
|
|
|
if(*string)
|
|
|
|
free(*string);
|
|
|
|
*string = strdup(value);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***************************************************************************
|
|
|
|
*
|
|
|
|
* FormParse()
|
|
|
|
*
|
|
|
|
* Reads a 'name=value' paramter and builds the appropriate linked list.
|
|
|
|
*
|
|
|
|
* Specify files to upload with 'name=@filename'. Supports specified
|
|
|
|
* given Content-Type of the files. Such as ';type=<content-type>'.
|
|
|
|
*
|
|
|
|
* You may specify more than one file for a single name (field). Specify
|
|
|
|
* multiple files by writing it like:
|
|
|
|
*
|
|
|
|
* 'name=@filename,filename2,filename3'
|
|
|
|
*
|
|
|
|
* If you want content-types specified for each too, write them like:
|
|
|
|
*
|
|
|
|
* 'name=@filename;type=image/gif,filename2,filename3'
|
|
|
|
*
|
|
|
|
***************************************************************************/
|
|
|
|
|
|
|
|
#define FORM_FILE_SEPARATOR ','
|
|
|
|
#define FORM_TYPE_SEPARATOR ';'
|
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
static
|
1999-12-29 15:20:26 +01:00
|
|
|
int FormParse(char *input,
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost **httppost,
|
|
|
|
struct curl_httppost **last_post)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
|
|
|
/* nextarg MUST be a string in the format 'name=contents' and we'll
|
|
|
|
build a linked list with the info */
|
|
|
|
char name[256];
|
2001-08-13 08:33:26 +02:00
|
|
|
char *contents;
|
1999-12-29 15:20:26 +01:00
|
|
|
char major[128];
|
|
|
|
char minor[128];
|
|
|
|
long flags = 0;
|
|
|
|
char *contp;
|
2001-08-14 10:23:20 +02:00
|
|
|
const char *type = NULL;
|
1999-12-29 15:20:26 +01:00
|
|
|
char *prevtype = NULL;
|
|
|
|
char *sep;
|
|
|
|
char *sep2;
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost *post;
|
|
|
|
struct curl_httppost *subpost; /* a sub-node */
|
1999-12-29 15:20:26 +01:00
|
|
|
unsigned int i;
|
|
|
|
|
2001-08-13 08:33:26 +02:00
|
|
|
/* Preallocate contents to the length of input to make sure we don't
|
|
|
|
overwrite anything. */
|
|
|
|
contents = malloc(strlen(input));
|
|
|
|
contents[0] = '\000';
|
|
|
|
|
|
|
|
if(1 <= sscanf(input, "%255[^=]=%[^\n]", name, contents)) {
|
1999-12-29 15:20:26 +01:00
|
|
|
/* the input was using the correct format */
|
|
|
|
contp = contents;
|
|
|
|
|
|
|
|
if('@' == contp[0]) {
|
|
|
|
/* we use the @-letter to indicate file name(s) */
|
|
|
|
|
|
|
|
flags = HTTPPOST_FILENAME;
|
|
|
|
contp++;
|
|
|
|
|
|
|
|
post=NULL;
|
|
|
|
|
|
|
|
do {
|
|
|
|
/* since this was a file, it may have a content-type specifier
|
|
|
|
at the end too */
|
|
|
|
|
|
|
|
sep=strchr(contp, FORM_TYPE_SEPARATOR);
|
|
|
|
sep2=strchr(contp, FORM_FILE_SEPARATOR);
|
|
|
|
|
|
|
|
/* pick the closest */
|
|
|
|
if(sep2 && (sep2 < sep)) {
|
|
|
|
sep = sep2;
|
|
|
|
|
|
|
|
/* no type was specified! */
|
|
|
|
}
|
|
|
|
if(sep) {
|
|
|
|
|
|
|
|
/* if we got here on a comma, don't do much */
|
|
|
|
if(FORM_FILE_SEPARATOR != *sep)
|
|
|
|
type = strstr(sep+1, "type=");
|
|
|
|
else
|
|
|
|
type=NULL;
|
|
|
|
|
|
|
|
*sep=0; /* terminate file name at separator */
|
|
|
|
|
|
|
|
if(type) {
|
|
|
|
type += strlen("type=");
|
|
|
|
|
|
|
|
if(2 != sscanf(type, "%127[^/]/%127[^,\n]",
|
|
|
|
major, minor)) {
|
2001-08-13 08:33:26 +02:00
|
|
|
free(contents);
|
1999-12-29 15:20:26 +01:00
|
|
|
return 2; /* illegal content-type syntax! */
|
|
|
|
}
|
|
|
|
/* now point beyond the content-type specifier */
|
2001-08-14 10:23:20 +02:00
|
|
|
sep = (char *)type + strlen(major)+strlen(minor)+1;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
/* find the following comma */
|
|
|
|
sep=strchr(sep, FORM_FILE_SEPARATOR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
type=NULL;
|
|
|
|
sep=strchr(contp, FORM_FILE_SEPARATOR);
|
|
|
|
}
|
|
|
|
if(sep) {
|
|
|
|
/* the next file name starts here */
|
|
|
|
*sep =0;
|
|
|
|
sep++;
|
|
|
|
}
|
|
|
|
if(!type) {
|
|
|
|
/*
|
|
|
|
* No type was specified, we scan through a few well-known
|
|
|
|
* extensions and pick the first we match!
|
|
|
|
*/
|
|
|
|
struct ContentType {
|
2001-08-14 10:23:20 +02:00
|
|
|
const char *extension;
|
|
|
|
const char *type;
|
1999-12-29 15:20:26 +01:00
|
|
|
};
|
2001-08-14 10:23:20 +02:00
|
|
|
static struct ContentType ctts[]={
|
1999-12-29 15:20:26 +01:00
|
|
|
{".gif", "image/gif"},
|
|
|
|
{".jpg", "image/jpeg"},
|
|
|
|
{".jpeg", "image/jpeg"},
|
|
|
|
{".txt", "text/plain"},
|
2003-11-13 08:43:18 +01:00
|
|
|
{".html", "text/html"}
|
1999-12-29 15:20:26 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
if(prevtype)
|
|
|
|
/* default to the previously set/used! */
|
|
|
|
type = prevtype;
|
|
|
|
else
|
|
|
|
/* It seems RFC1867 defines no Content-Type to default to
|
|
|
|
text/plain so we don't actually need to set this: */
|
|
|
|
type = HTTPPOST_CONTENTTYPE_DEFAULT;
|
|
|
|
|
|
|
|
for(i=0; i<sizeof(ctts)/sizeof(ctts[0]); i++) {
|
|
|
|
if(strlen(contp) >= strlen(ctts[i].extension)) {
|
|
|
|
if(strequal(contp +
|
|
|
|
strlen(contp) - strlen(ctts[i].extension),
|
|
|
|
ctts[i].extension)) {
|
|
|
|
type = ctts[i].type;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* we have a type by now */
|
|
|
|
}
|
|
|
|
|
|
|
|
if(NULL == post) {
|
|
|
|
/* For the first file name, we allocate and initiate the main list
|
|
|
|
node */
|
|
|
|
|
2002-03-11 16:18:59 +01:00
|
|
|
post = (struct curl_httppost *)malloc(sizeof(struct curl_httppost));
|
1999-12-29 15:20:26 +01:00
|
|
|
if(post) {
|
2002-03-11 16:18:59 +01:00
|
|
|
memset(post, 0, sizeof(struct curl_httppost));
|
1999-12-29 15:20:26 +01:00
|
|
|
GetStr(&post->name, name); /* get the name */
|
|
|
|
GetStr(&post->contents, contp); /* get the contents */
|
2001-08-21 15:18:07 +02:00
|
|
|
post->contentslength = 0;
|
1999-12-29 15:20:26 +01:00
|
|
|
post->flags = flags;
|
|
|
|
if(type) {
|
2001-08-14 10:23:20 +02:00
|
|
|
GetStr(&post->contenttype, (char *)type); /* get type */
|
1999-12-29 15:20:26 +01:00
|
|
|
prevtype=post->contenttype; /* point to the allocated string! */
|
|
|
|
}
|
|
|
|
/* make the previous point to this */
|
|
|
|
if(*last_post)
|
|
|
|
(*last_post)->next = post;
|
|
|
|
else
|
|
|
|
(*httppost) = post;
|
|
|
|
|
|
|
|
(*last_post) = post;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* we add a file name to the previously allocated node, known as
|
|
|
|
'post' now */
|
2002-03-11 16:18:59 +01:00
|
|
|
subpost =(struct curl_httppost *)
|
|
|
|
malloc(sizeof(struct curl_httppost));
|
1999-12-29 15:20:26 +01:00
|
|
|
if(subpost) {
|
2002-03-11 16:18:59 +01:00
|
|
|
memset(subpost, 0, sizeof(struct curl_httppost));
|
1999-12-29 15:20:26 +01:00
|
|
|
GetStr(&subpost->name, name); /* get the name */
|
|
|
|
GetStr(&subpost->contents, contp); /* get the contents */
|
2001-08-21 15:18:07 +02:00
|
|
|
subpost->contentslength = 0;
|
1999-12-29 15:20:26 +01:00
|
|
|
subpost->flags = flags;
|
|
|
|
if(type) {
|
2001-08-14 10:23:20 +02:00
|
|
|
GetStr(&subpost->contenttype, (char *)type); /* get type */
|
|
|
|
prevtype=subpost->contenttype; /* point to allocated string! */
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
/* now, point our 'more' to the original 'more' */
|
|
|
|
subpost->more = post->more;
|
|
|
|
|
|
|
|
/* then move the original 'more' to point to ourselves */
|
|
|
|
post->more = subpost;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
contp = sep; /* move the contents pointer to after the separator */
|
|
|
|
} while(sep && *sep); /* loop if there's another file name */
|
|
|
|
}
|
|
|
|
else {
|
2002-03-11 16:18:59 +01:00
|
|
|
post = (struct curl_httppost *)malloc(sizeof(struct curl_httppost));
|
1999-12-29 15:20:26 +01:00
|
|
|
if(post) {
|
2002-03-11 16:18:59 +01:00
|
|
|
memset(post, 0, sizeof(struct curl_httppost));
|
1999-12-29 15:20:26 +01:00
|
|
|
GetStr(&post->name, name); /* get the name */
|
2000-07-25 14:21:22 +02:00
|
|
|
if( contp[0]=='<' ) {
|
|
|
|
GetStr(&post->contents, contp+1); /* get the contents */
|
2001-08-21 15:18:07 +02:00
|
|
|
post->contentslength = 0;
|
2000-07-25 14:21:22 +02:00
|
|
|
post->flags = HTTPPOST_READFILE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
GetStr(&post->contents, contp); /* get the contents */
|
2001-08-21 15:18:07 +02:00
|
|
|
post->contentslength = 0;
|
2000-07-25 14:21:22 +02:00
|
|
|
post->flags = 0;
|
|
|
|
}
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
/* make the previous point to this */
|
|
|
|
if(*last_post)
|
|
|
|
(*last_post)->next = post;
|
|
|
|
else
|
|
|
|
(*httppost) = post;
|
|
|
|
|
|
|
|
(*last_post) = post;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else {
|
2001-08-13 08:33:26 +02:00
|
|
|
free(contents);
|
1999-12-29 15:20:26 +01:00
|
|
|
return 1;
|
|
|
|
}
|
2001-08-13 08:33:26 +02:00
|
|
|
free(contents);
|
1999-12-29 15:20:26 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
int curl_formparse(char *input,
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost **httppost,
|
|
|
|
struct curl_httppost **last_post)
|
2001-01-05 11:11:41 +01:00
|
|
|
{
|
|
|
|
return FormParse(input, httppost, last_post);
|
|
|
|
}
|
|
|
|
|
2001-08-21 15:18:07 +02:00
|
|
|
/***************************************************************************
|
|
|
|
*
|
|
|
|
* AddHttpPost()
|
|
|
|
*
|
|
|
|
* Adds a HttpPost structure to the list, if parent_post is given becomes
|
|
|
|
* a subpost of parent_post instead of a direct list element.
|
|
|
|
*
|
2001-08-28 10:54:33 +02:00
|
|
|
* Returns newly allocated HttpPost on success and NULL if malloc failed.
|
2001-08-21 15:18:07 +02:00
|
|
|
*
|
|
|
|
***************************************************************************/
|
2002-03-11 16:18:59 +01:00
|
|
|
static struct curl_httppost *
|
2004-02-27 14:21:14 +01:00
|
|
|
AddHttpPost(char * name, size_t namelength,
|
|
|
|
char * value, size_t contentslength,
|
|
|
|
char * buffer, size_t bufferlength,
|
2002-03-11 16:18:59 +01:00
|
|
|
char *contenttype,
|
|
|
|
long flags,
|
|
|
|
struct curl_slist* contentHeader,
|
|
|
|
char *showfilename,
|
|
|
|
struct curl_httppost *parent_post,
|
|
|
|
struct curl_httppost **httppost,
|
|
|
|
struct curl_httppost **last_post)
|
2001-08-21 15:18:07 +02:00
|
|
|
{
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost *post;
|
|
|
|
post = (struct curl_httppost *)malloc(sizeof(struct curl_httppost));
|
2001-08-21 15:18:07 +02:00
|
|
|
if(post) {
|
2002-03-11 16:18:59 +01:00
|
|
|
memset(post, 0, sizeof(struct curl_httppost));
|
2001-08-21 15:18:07 +02:00
|
|
|
post->name = name;
|
2004-02-27 14:21:14 +01:00
|
|
|
post->namelength = (long)(name?(namelength?namelength:strlen(name)):0);
|
2001-08-21 15:18:07 +02:00
|
|
|
post->contents = value;
|
2004-03-03 14:11:28 +01:00
|
|
|
post->contentslength = (long)contentslength;
|
2002-06-12 23:40:59 +02:00
|
|
|
post->buffer = buffer;
|
2004-03-03 14:11:28 +01:00
|
|
|
post->bufferlength = (long)bufferlength;
|
2001-08-28 10:54:33 +02:00
|
|
|
post->contenttype = contenttype;
|
2001-12-14 13:59:16 +01:00
|
|
|
post->contentheader = contentHeader;
|
2002-03-11 16:18:59 +01:00
|
|
|
post->showfilename = showfilename;
|
2001-08-21 15:18:07 +02:00
|
|
|
post->flags = flags;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (parent_post) {
|
|
|
|
/* now, point our 'more' to the original 'more' */
|
|
|
|
post->more = parent_post->more;
|
|
|
|
|
|
|
|
/* then move the original 'more' to point to ourselves */
|
|
|
|
parent_post->more = post;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* make the previous point to this */
|
|
|
|
if(*last_post)
|
|
|
|
(*last_post)->next = post;
|
|
|
|
else
|
|
|
|
(*httppost) = post;
|
|
|
|
|
|
|
|
(*last_post) = post;
|
|
|
|
}
|
|
|
|
return post;
|
|
|
|
}
|
|
|
|
|
2001-08-28 10:54:33 +02:00
|
|
|
/***************************************************************************
|
|
|
|
*
|
|
|
|
* AddFormInfo()
|
|
|
|
*
|
|
|
|
* Adds a FormInfo structure to the list presented by parent_form_info.
|
|
|
|
*
|
|
|
|
* Returns newly allocated FormInfo on success and NULL if malloc failed/
|
|
|
|
* parent_form_info is NULL.
|
|
|
|
*
|
|
|
|
***************************************************************************/
|
2001-10-03 09:54:42 +02:00
|
|
|
static FormInfo * AddFormInfo(char *value,
|
|
|
|
char *contenttype,
|
|
|
|
FormInfo *parent_form_info)
|
2001-08-28 10:54:33 +02:00
|
|
|
{
|
|
|
|
FormInfo *form_info;
|
|
|
|
form_info = (FormInfo *)malloc(sizeof(FormInfo));
|
|
|
|
if(form_info) {
|
|
|
|
memset(form_info, 0, sizeof(FormInfo));
|
|
|
|
if (value)
|
|
|
|
form_info->value = value;
|
|
|
|
if (contenttype)
|
|
|
|
form_info->contenttype = contenttype;
|
|
|
|
form_info->flags = HTTPPOST_FILENAME;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (parent_form_info) {
|
|
|
|
/* now, point our 'more' to the original 'more' */
|
|
|
|
form_info->more = parent_form_info->more;
|
|
|
|
|
|
|
|
/* then move the original 'more' to point to ourselves */
|
|
|
|
parent_form_info->more = form_info;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return form_info;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***************************************************************************
|
|
|
|
*
|
|
|
|
* ContentTypeForFilename()
|
|
|
|
*
|
|
|
|
* Provides content type for filename if one of the known types (else
|
|
|
|
* (either the prevtype or the default is returned).
|
|
|
|
*
|
|
|
|
* Returns some valid contenttype for filename.
|
|
|
|
*
|
|
|
|
***************************************************************************/
|
2001-10-03 09:54:42 +02:00
|
|
|
static const char * ContentTypeForFilename (const char *filename,
|
2001-08-28 10:54:33 +02:00
|
|
|
const char *prevtype)
|
|
|
|
{
|
|
|
|
const char *contenttype = NULL;
|
|
|
|
unsigned int i;
|
|
|
|
/*
|
|
|
|
* No type was specified, we scan through a few well-known
|
|
|
|
* extensions and pick the first we match!
|
|
|
|
*/
|
|
|
|
struct ContentType {
|
|
|
|
const char *extension;
|
|
|
|
const char *type;
|
|
|
|
};
|
|
|
|
static struct ContentType ctts[]={
|
|
|
|
{".gif", "image/gif"},
|
|
|
|
{".jpg", "image/jpeg"},
|
|
|
|
{".jpeg", "image/jpeg"},
|
|
|
|
{".txt", "text/plain"},
|
2003-04-15 11:29:39 +02:00
|
|
|
{".html", "text/html"}
|
2001-08-28 10:54:33 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
if(prevtype)
|
|
|
|
/* default to the previously set/used! */
|
|
|
|
contenttype = prevtype;
|
|
|
|
else
|
|
|
|
/* It seems RFC1867 defines no Content-Type to default to
|
|
|
|
text/plain so we don't actually need to set this: */
|
|
|
|
contenttype = HTTPPOST_CONTENTTYPE_DEFAULT;
|
|
|
|
|
|
|
|
for(i=0; i<sizeof(ctts)/sizeof(ctts[0]); i++) {
|
|
|
|
if(strlen(filename) >= strlen(ctts[i].extension)) {
|
|
|
|
if(strequal(filename +
|
|
|
|
strlen(filename) - strlen(ctts[i].extension),
|
|
|
|
ctts[i].extension)) {
|
|
|
|
contenttype = ctts[i].type;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* we have a contenttype by now */
|
|
|
|
return contenttype;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***************************************************************************
|
|
|
|
*
|
|
|
|
* AllocAndCopy()
|
|
|
|
*
|
|
|
|
* Copies the data currently available under *buffer using newly allocated
|
|
|
|
* buffer (that becomes *buffer). Uses buffer_length if not null, else
|
|
|
|
* uses strlen to determine the length of the buffer to be copied
|
|
|
|
*
|
|
|
|
* Returns 0 on success and 1 if the malloc failed.
|
|
|
|
*
|
|
|
|
***************************************************************************/
|
2004-02-26 14:40:43 +01:00
|
|
|
static int AllocAndCopy(char **buffer, size_t buffer_length)
|
2001-08-28 10:54:33 +02:00
|
|
|
{
|
2001-10-03 09:54:42 +02:00
|
|
|
const char *src = *buffer;
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t length;
|
|
|
|
bool add = FALSE;
|
2001-08-28 10:54:33 +02:00
|
|
|
if (buffer_length)
|
|
|
|
length = buffer_length;
|
2001-10-03 09:54:42 +02:00
|
|
|
else {
|
2001-08-28 10:54:33 +02:00
|
|
|
length = strlen(*buffer);
|
2004-02-26 14:40:43 +01:00
|
|
|
add = TRUE;
|
2001-10-03 09:54:42 +02:00
|
|
|
}
|
|
|
|
*buffer = (char*)malloc(length+add);
|
2001-08-28 10:54:33 +02:00
|
|
|
if (!*buffer)
|
|
|
|
return 1;
|
|
|
|
memcpy(*buffer, src, length);
|
2001-10-03 09:54:42 +02:00
|
|
|
/* if length unknown do null termination */
|
|
|
|
if (add)
|
|
|
|
(*buffer)[length] = '\0';
|
2001-08-28 10:54:33 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-08-21 15:18:07 +02:00
|
|
|
/***************************************************************************
|
|
|
|
*
|
|
|
|
* FormAdd()
|
|
|
|
*
|
|
|
|
* Stores a 'name=value' formpost parameter and builds the appropriate
|
|
|
|
* linked list.
|
|
|
|
*
|
|
|
|
* Has two principal functionalities: using files and byte arrays as
|
|
|
|
* post parts. Byte arrays are either copied or just the pointer is stored
|
|
|
|
* (as the user requests) while for files only the filename and not the
|
|
|
|
* content is stored.
|
|
|
|
*
|
|
|
|
* While you may have only one byte array for each name, multiple filenames
|
|
|
|
* are allowed (and because of this feature CURLFORM_END is needed after
|
|
|
|
* using CURLFORM_FILE).
|
|
|
|
*
|
|
|
|
* Examples:
|
|
|
|
*
|
|
|
|
* Simple name/value pair with copied contents:
|
|
|
|
* curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
|
2001-10-03 09:54:42 +02:00
|
|
|
* CURLFORM_COPYCONTENTS, "value", CURLFORM_END);
|
2001-08-21 15:18:07 +02:00
|
|
|
*
|
|
|
|
* name/value pair where only the content pointer is remembered:
|
|
|
|
* curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
|
2001-10-03 09:54:42 +02:00
|
|
|
* CURLFORM_PTRCONTENTS, ptr, CURLFORM_CONTENTSLENGTH, 10, CURLFORM_END);
|
2001-08-21 15:18:07 +02:00
|
|
|
* (if CURLFORM_CONTENTSLENGTH is missing strlen () is used)
|
|
|
|
*
|
|
|
|
* storing a filename (CONTENTTYPE is optional!):
|
|
|
|
* curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
|
|
|
|
* CURLFORM_FILE, "filename1", CURLFORM_CONTENTTYPE, "plain/text",
|
|
|
|
* CURLFORM_END);
|
|
|
|
*
|
|
|
|
* storing multiple filenames:
|
|
|
|
* curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
|
|
|
|
* CURLFORM_FILE, "filename1", CURLFORM_FILE, "filename2", CURLFORM_END);
|
|
|
|
*
|
2001-10-03 09:54:42 +02:00
|
|
|
* Returns:
|
2002-05-21 09:44:27 +02:00
|
|
|
* CURL_FORMADD_OK on success
|
|
|
|
* CURL_FORMADD_MEMORY if the FormInfo allocation fails
|
|
|
|
* CURL_FORMADD_OPTION_TWICE if one option is given twice for one Form
|
|
|
|
* CURL_FORMADD_NULL if a null pointer was given for a char
|
|
|
|
* CURL_FORMADD_MEMORY if the allocation of a FormInfo struct failed
|
|
|
|
* CURL_FORMADD_UNKNOWN_OPTION if an unknown option was used
|
|
|
|
* CURL_FORMADD_INCOMPLETE if the some FormInfo is not complete (or an error)
|
|
|
|
* CURL_FORMADD_MEMORY if a HttpPost struct cannot be allocated
|
|
|
|
* CURL_FORMADD_MEMORY if some allocation for string copying failed.
|
|
|
|
* CURL_FORMADD_ILLEGAL_ARRAY if an illegal option is used in an array
|
2001-08-21 15:18:07 +02:00
|
|
|
*
|
|
|
|
***************************************************************************/
|
|
|
|
|
|
|
|
static
|
2002-05-21 09:44:27 +02:00
|
|
|
CURLFORMcode FormAdd(struct curl_httppost **httppost,
|
|
|
|
struct curl_httppost **last_post,
|
|
|
|
va_list params)
|
2001-08-21 15:18:07 +02:00
|
|
|
{
|
2001-10-03 09:54:42 +02:00
|
|
|
FormInfo *first_form, *current_form, *form;
|
2002-05-21 09:44:27 +02:00
|
|
|
CURLFORMcode return_value = CURL_FORMADD_OK;
|
2001-08-21 15:18:07 +02:00
|
|
|
const char *prevtype = NULL;
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost *post = NULL;
|
2001-10-03 09:54:42 +02:00
|
|
|
CURLformoption option;
|
|
|
|
struct curl_forms *forms = NULL;
|
2002-10-28 20:21:30 +01:00
|
|
|
char *array_value=NULL; /* value read from an array */
|
2001-10-03 09:54:42 +02:00
|
|
|
|
|
|
|
/* This is a state variable, that if TRUE means that we're parsing an
|
|
|
|
array that we got passed to us. If FALSE we're parsing the input
|
|
|
|
va_list arguments. */
|
|
|
|
bool array_state = FALSE;
|
2001-08-21 15:18:07 +02:00
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
/*
|
|
|
|
* We need to allocate the first struct to fill in.
|
|
|
|
*/
|
|
|
|
first_form = (FormInfo *)malloc(sizeof(struct FormInfo));
|
|
|
|
if(first_form) {
|
|
|
|
memset(first_form, 0, sizeof(FormInfo));
|
|
|
|
current_form = first_form;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return CURL_FORMADD_MEMORY;
|
2001-08-21 15:18:07 +02:00
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
/*
|
|
|
|
* Loop through all the options set.
|
|
|
|
*/
|
|
|
|
while (1) {
|
|
|
|
|
|
|
|
/* break if we have an error to report */
|
2002-05-21 09:44:27 +02:00
|
|
|
if (return_value != CURL_FORMADD_OK)
|
2001-10-03 09:54:42 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* first see if we have more parts of the array param */
|
|
|
|
if ( array_state ) {
|
|
|
|
/* get the upcoming option from the given array */
|
2001-10-03 11:31:16 +02:00
|
|
|
option = forms->option;
|
2002-03-19 08:32:35 +01:00
|
|
|
array_value = (char *)forms->value;
|
2001-10-03 11:31:16 +02:00
|
|
|
|
|
|
|
forms++; /* advance this to next entry */
|
2001-10-03 09:54:42 +02:00
|
|
|
if (CURLFORM_END == option) {
|
|
|
|
/* end of array state */
|
|
|
|
array_state = FALSE;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* This is not array-state, get next option */
|
|
|
|
option = va_arg(params, CURLformoption);
|
|
|
|
if (CURLFORM_END == option)
|
2001-08-21 15:18:07 +02:00
|
|
|
break;
|
2001-10-03 09:54:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (option) {
|
|
|
|
case CURLFORM_ARRAY:
|
2002-03-13 13:10:20 +01:00
|
|
|
if(array_state)
|
|
|
|
/* we don't support an array from within an array */
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_ILLEGAL_ARRAY;
|
2002-03-13 13:10:20 +01:00
|
|
|
else {
|
|
|
|
forms = va_arg(params, struct curl_forms *);
|
|
|
|
if (forms)
|
|
|
|
array_state = TRUE;
|
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_NULL;
|
2002-03-13 13:10:20 +01:00
|
|
|
}
|
2001-10-03 09:54:42 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the Name property.
|
|
|
|
*/
|
|
|
|
case CURLFORM_PTRNAME:
|
|
|
|
current_form->flags |= HTTPPOST_PTRNAME; /* fall through */
|
|
|
|
case CURLFORM_COPYNAME:
|
|
|
|
if (current_form->name)
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2001-10-03 09:54:42 +02:00
|
|
|
else {
|
2002-03-19 08:32:35 +01:00
|
|
|
char *name = array_state?
|
|
|
|
array_value:va_arg(params, char *);
|
2001-10-03 09:54:42 +02:00
|
|
|
if (name)
|
|
|
|
current_form->name = name; /* store for the moment */
|
2001-08-28 10:54:33 +02:00
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_NULL;
|
2001-10-03 09:54:42 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CURLFORM_NAMELENGTH:
|
|
|
|
if (current_form->namelength)
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2001-10-03 09:54:42 +02:00
|
|
|
else
|
2002-03-13 13:10:20 +01:00
|
|
|
current_form->namelength =
|
2002-03-19 08:32:35 +01:00
|
|
|
array_state?(long)array_value:va_arg(params, long);
|
2001-10-03 09:54:42 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the contents property.
|
|
|
|
*/
|
|
|
|
case CURLFORM_PTRCONTENTS:
|
|
|
|
current_form->flags |= HTTPPOST_PTRCONTENTS; /* fall through */
|
|
|
|
case CURLFORM_COPYCONTENTS:
|
|
|
|
if (current_form->value)
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2001-10-03 09:54:42 +02:00
|
|
|
else {
|
2002-03-19 08:32:35 +01:00
|
|
|
char *value =
|
|
|
|
array_state?array_value:va_arg(params, char *);
|
2001-10-03 09:54:42 +02:00
|
|
|
if (value)
|
|
|
|
current_form->value = value; /* store for the moment */
|
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_NULL;
|
2001-10-03 09:54:42 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CURLFORM_CONTENTSLENGTH:
|
|
|
|
if (current_form->contentslength)
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2001-10-03 09:54:42 +02:00
|
|
|
else
|
2002-03-13 13:10:20 +01:00
|
|
|
current_form->contentslength =
|
2002-03-19 08:32:35 +01:00
|
|
|
array_state?(long)array_value:va_arg(params, long);
|
2001-10-03 09:54:42 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* Get contents from a given file name */
|
|
|
|
case CURLFORM_FILECONTENT:
|
|
|
|
if (current_form->flags != 0)
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2001-10-03 09:54:42 +02:00
|
|
|
else {
|
2002-03-13 13:10:20 +01:00
|
|
|
char *filename = array_state?
|
|
|
|
array_value:va_arg(params, char *);
|
2001-10-03 09:54:42 +02:00
|
|
|
if (filename) {
|
|
|
|
current_form->value = strdup(filename);
|
|
|
|
current_form->flags |= HTTPPOST_READFILE;
|
2001-08-21 15:18:07 +02:00
|
|
|
}
|
2001-08-28 10:54:33 +02:00
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_NULL;
|
2001-10-03 09:54:42 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* We upload a file */
|
|
|
|
case CURLFORM_FILE:
|
|
|
|
{
|
2002-03-19 08:32:35 +01:00
|
|
|
char *filename = array_state?array_value:
|
|
|
|
va_arg(params, char *);
|
2002-03-13 13:10:20 +01:00
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
if (current_form->value) {
|
|
|
|
if (current_form->flags & HTTPPOST_FILENAME) {
|
|
|
|
if (filename) {
|
|
|
|
if (!(current_form = AddFormInfo(strdup(filename),
|
|
|
|
NULL, current_form)))
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_MEMORY;
|
2001-10-03 09:54:42 +02:00
|
|
|
}
|
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_NULL;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2001-08-21 15:18:07 +02:00
|
|
|
}
|
|
|
|
else {
|
2001-10-03 09:54:42 +02:00
|
|
|
if (filename)
|
|
|
|
current_form->value = strdup(filename);
|
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_NULL;
|
2001-10-03 09:54:42 +02:00
|
|
|
current_form->flags |= HTTPPOST_FILENAME;
|
2001-08-21 15:18:07 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2002-06-12 23:40:59 +02:00
|
|
|
|
|
|
|
case CURLFORM_BUFFER:
|
|
|
|
{
|
|
|
|
char *filename = array_state?array_value:
|
|
|
|
va_arg(params, char *);
|
|
|
|
|
|
|
|
if (current_form->value) {
|
|
|
|
if (current_form->flags & HTTPPOST_BUFFER) {
|
|
|
|
if (filename) {
|
|
|
|
if (!(current_form = AddFormInfo(strdup(filename),
|
|
|
|
NULL, current_form)))
|
|
|
|
return_value = CURL_FORMADD_MEMORY;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return_value = CURL_FORMADD_NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (filename)
|
|
|
|
current_form->value = strdup(filename);
|
|
|
|
else
|
|
|
|
return_value = CURL_FORMADD_NULL;
|
|
|
|
current_form->flags |= HTTPPOST_BUFFER;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CURLFORM_BUFFERPTR:
|
|
|
|
current_form->flags |= HTTPPOST_PTRBUFFER;
|
|
|
|
if (current_form->buffer)
|
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
|
|
|
else {
|
|
|
|
char *buffer =
|
|
|
|
array_state?array_value:va_arg(params, char *);
|
|
|
|
if (buffer)
|
|
|
|
current_form->buffer = buffer; /* store for the moment */
|
|
|
|
else
|
|
|
|
return_value = CURL_FORMADD_NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CURLFORM_BUFFERLENGTH:
|
|
|
|
if (current_form->bufferlength)
|
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
|
|
|
else
|
|
|
|
current_form->bufferlength =
|
|
|
|
array_state?(long)array_value:va_arg(params, long);
|
|
|
|
break;
|
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
case CURLFORM_CONTENTTYPE:
|
|
|
|
{
|
2002-06-12 23:40:59 +02:00
|
|
|
char *contenttype =
|
2002-03-19 08:32:35 +01:00
|
|
|
array_state?array_value:va_arg(params, char *);
|
2001-10-03 09:54:42 +02:00
|
|
|
if (current_form->contenttype) {
|
|
|
|
if (current_form->flags & HTTPPOST_FILENAME) {
|
2001-08-28 10:54:33 +02:00
|
|
|
if (contenttype) {
|
2001-10-03 09:54:42 +02:00
|
|
|
if (!(current_form = AddFormInfo(NULL,
|
|
|
|
strdup(contenttype),
|
|
|
|
current_form)))
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_MEMORY;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_NULL;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (contenttype)
|
2001-10-03 09:54:42 +02:00
|
|
|
current_form->contenttype = strdup(contenttype);
|
2001-08-28 10:54:33 +02:00
|
|
|
else
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_NULL;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
2001-08-21 15:18:07 +02:00
|
|
|
break;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
2001-12-14 13:59:16 +01:00
|
|
|
case CURLFORM_CONTENTHEADER:
|
|
|
|
{
|
2002-03-19 08:32:35 +01:00
|
|
|
/* this "cast increases required alignment of target type" but
|
|
|
|
we consider it OK anyway */
|
2002-03-13 13:10:20 +01:00
|
|
|
struct curl_slist* list = array_state?
|
|
|
|
(struct curl_slist*)array_value:
|
|
|
|
va_arg(params, struct curl_slist*);
|
2001-12-14 13:59:16 +01:00
|
|
|
|
|
|
|
if( current_form->contentheader )
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2001-12-14 13:59:16 +01:00
|
|
|
else
|
|
|
|
current_form->contentheader = list;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2002-03-11 16:18:59 +01:00
|
|
|
case CURLFORM_FILENAME:
|
|
|
|
{
|
2002-03-13 13:10:20 +01:00
|
|
|
char *filename = array_state?array_value:
|
2002-03-11 16:18:59 +01:00
|
|
|
va_arg(params, char *);
|
|
|
|
if( current_form->showfilename )
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_OPTION_TWICE;
|
2002-03-11 16:18:59 +01:00
|
|
|
else
|
|
|
|
current_form->showfilename = strdup(filename);
|
|
|
|
break;
|
|
|
|
}
|
2001-10-03 09:54:42 +02:00
|
|
|
default:
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_UNKNOWN_OPTION;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
2001-10-03 09:54:42 +02:00
|
|
|
}
|
|
|
|
|
2002-05-21 09:44:27 +02:00
|
|
|
if(CURL_FORMADD_OK == return_value) {
|
2001-10-03 09:54:42 +02:00
|
|
|
/* go through the list, check for copleteness and if everything is
|
|
|
|
* alright add the HttpPost item otherwise set return_value accordingly */
|
2001-10-29 14:21:25 +01:00
|
|
|
|
|
|
|
post = NULL;
|
|
|
|
for(form = first_form;
|
|
|
|
form != NULL;
|
|
|
|
form = form->more) {
|
|
|
|
if ( ((!form->name || !form->value) && !post) ||
|
2001-10-03 09:54:42 +02:00
|
|
|
( (form->contentslength) &&
|
|
|
|
(form->flags & HTTPPOST_FILENAME) ) ||
|
|
|
|
( (form->flags & HTTPPOST_FILENAME) &&
|
|
|
|
(form->flags & HTTPPOST_PTRCONTENTS) ) ||
|
2002-06-12 23:40:59 +02:00
|
|
|
|
|
|
|
( (!form->buffer) &&
|
|
|
|
(form->flags & HTTPPOST_BUFFER) &&
|
|
|
|
(form->flags & HTTPPOST_PTRBUFFER) ) ||
|
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
( (form->flags & HTTPPOST_READFILE) &&
|
|
|
|
(form->flags & HTTPPOST_PTRCONTENTS) )
|
|
|
|
) {
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_INCOMPLETE;
|
2001-10-03 09:54:42 +02:00
|
|
|
break;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
2001-10-03 09:54:42 +02:00
|
|
|
else {
|
2002-06-12 23:40:59 +02:00
|
|
|
if ( ((form->flags & HTTPPOST_FILENAME) ||
|
|
|
|
(form->flags & HTTPPOST_BUFFER)) &&
|
2001-10-03 09:54:42 +02:00
|
|
|
!form->contenttype ) {
|
|
|
|
/* our contenttype is missing */
|
|
|
|
form->contenttype
|
|
|
|
= strdup(ContentTypeForFilename(form->value, prevtype));
|
|
|
|
}
|
|
|
|
if ( !(form->flags & HTTPPOST_PTRNAME) &&
|
|
|
|
(form == first_form) ) {
|
|
|
|
/* copy name (without strdup; possibly contains null characters) */
|
|
|
|
if (AllocAndCopy(&form->name, form->namelength)) {
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_MEMORY;
|
2001-10-03 09:54:42 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( !(form->flags & HTTPPOST_FILENAME) &&
|
|
|
|
!(form->flags & HTTPPOST_READFILE) &&
|
2002-06-12 23:40:59 +02:00
|
|
|
!(form->flags & HTTPPOST_PTRCONTENTS) &&
|
|
|
|
!(form->flags & HTTPPOST_PTRBUFFER) ) {
|
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
/* copy value (without strdup; possibly contains null characters) */
|
|
|
|
if (AllocAndCopy(&form->value, form->contentslength)) {
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_MEMORY;
|
2001-10-03 09:54:42 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2001-12-14 13:59:16 +01:00
|
|
|
post = AddHttpPost(form->name, form->namelength,
|
|
|
|
form->value, form->contentslength,
|
2002-06-12 23:40:59 +02:00
|
|
|
form->buffer, form->bufferlength,
|
2001-12-14 13:59:16 +01:00
|
|
|
form->contenttype, form->flags,
|
2002-03-11 16:18:59 +01:00
|
|
|
form->contentheader, form->showfilename,
|
2001-12-14 13:59:16 +01:00
|
|
|
post, httppost,
|
|
|
|
last_post);
|
|
|
|
|
|
|
|
if(!post)
|
2002-05-21 09:44:27 +02:00
|
|
|
return_value = CURL_FORMADD_MEMORY;
|
2001-12-14 13:59:16 +01:00
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
if (form->contenttype)
|
|
|
|
prevtype = form->contenttype;
|
2001-08-28 10:54:33 +02:00
|
|
|
}
|
|
|
|
}
|
2001-10-03 09:54:42 +02:00
|
|
|
}
|
2001-08-21 15:18:07 +02:00
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
/* always delete the allocated memory before returning */
|
|
|
|
form = first_form;
|
|
|
|
while (form != NULL) {
|
|
|
|
FormInfo *delete_form;
|
2001-08-28 10:54:33 +02:00
|
|
|
|
2001-10-03 09:54:42 +02:00
|
|
|
delete_form = form;
|
|
|
|
form = form->more;
|
|
|
|
free (delete_form);
|
|
|
|
}
|
2001-08-28 10:54:33 +02:00
|
|
|
|
|
|
|
return return_value;
|
2001-08-21 15:18:07 +02:00
|
|
|
}
|
|
|
|
|
2002-05-21 09:44:27 +02:00
|
|
|
CURLFORMcode curl_formadd(struct curl_httppost **httppost,
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost **last_post,
|
2001-08-21 15:18:07 +02:00
|
|
|
...)
|
|
|
|
{
|
|
|
|
va_list arg;
|
2002-05-21 09:44:27 +02:00
|
|
|
CURLFORMcode result;
|
2001-08-21 15:18:07 +02:00
|
|
|
va_start(arg, last_post);
|
|
|
|
result = FormAdd(httppost, last_post, arg);
|
|
|
|
va_end(arg);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2004-03-03 14:11:28 +01:00
|
|
|
static size_t AddFormData(struct FormData **formp,
|
|
|
|
const void *line,
|
|
|
|
size_t length)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
|
|
|
struct FormData *newform = (struct FormData *)
|
|
|
|
malloc(sizeof(struct FormData));
|
|
|
|
newform->next = NULL;
|
|
|
|
|
|
|
|
/* we make it easier for plain strings: */
|
|
|
|
if(!length)
|
|
|
|
length = strlen((char *)line);
|
|
|
|
|
|
|
|
newform->line = (char *)malloc(length+1);
|
2001-11-08 16:06:58 +01:00
|
|
|
memcpy(newform->line, line, length);
|
1999-12-29 15:20:26 +01:00
|
|
|
newform->length = length;
|
2000-06-15 16:33:17 +02:00
|
|
|
newform->line[length]=0; /* zero terminate for easier debugging */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
if(*formp) {
|
|
|
|
(*formp)->next = newform;
|
|
|
|
*formp = newform;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*formp = newform;
|
|
|
|
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-03-03 14:11:28 +01:00
|
|
|
static size_t AddFormDataf(struct FormData **formp,
|
2001-08-14 10:23:20 +02:00
|
|
|
const char *fmt, ...)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
2000-07-25 14:21:22 +02:00
|
|
|
char s[4096];
|
1999-12-29 15:20:26 +01:00
|
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vsprintf(s, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
return AddFormData(formp, s, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
char *Curl_FormBoundary(void)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
|
|
|
char *retstring;
|
|
|
|
static int randomizer=0; /* this is just so that two boundaries within
|
|
|
|
the same form won't be identical */
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t i;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2003-04-04 14:24:01 +02:00
|
|
|
static char table16[]="abcdef0123456789";
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2003-04-04 14:24:01 +02:00
|
|
|
retstring = (char *)malloc(BOUNDARY_LENGTH+1);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
if(!retstring)
|
|
|
|
return NULL; /* failed */
|
|
|
|
|
|
|
|
srand(time(NULL)+randomizer++); /* seed */
|
|
|
|
|
2003-04-04 14:24:01 +02:00
|
|
|
strcpy(retstring, "----------------------------");
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2003-04-04 14:24:01 +02:00
|
|
|
for(i=strlen(retstring); i<BOUNDARY_LENGTH; i++)
|
|
|
|
retstring[i] = table16[rand()%16];
|
|
|
|
|
|
|
|
/* 28 dashes and 12 hexadecimal digits makes 12^16 (184884258895036416)
|
|
|
|
combinations */
|
|
|
|
retstring[BOUNDARY_LENGTH]=0; /* zero terminate */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
return retstring;
|
|
|
|
}
|
|
|
|
|
2001-08-06 14:36:18 +02:00
|
|
|
/* Used from http.c, this cleans a built FormData linked list */
|
|
|
|
void Curl_formclean(struct FormData *form)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
|
|
|
struct FormData *next;
|
2001-04-06 07:52:23 +02:00
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
do {
|
|
|
|
next=form->next; /* the following form line */
|
|
|
|
free(form->line); /* free the line */
|
|
|
|
free(form); /* free the struct */
|
2000-11-17 15:06:24 +01:00
|
|
|
|
|
|
|
} while((form=next)); /* continue */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* external function to free up a whole form post chain */
|
2002-03-11 16:18:59 +01:00
|
|
|
void curl_formfree(struct curl_httppost *form)
|
2000-11-17 15:06:24 +01:00
|
|
|
{
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost *next;
|
2001-04-06 07:52:23 +02:00
|
|
|
|
|
|
|
if(!form)
|
|
|
|
/* no form to free, just get out of this */
|
|
|
|
return;
|
|
|
|
|
2000-11-17 15:06:24 +01:00
|
|
|
do {
|
|
|
|
next=form->next; /* the following form line */
|
|
|
|
|
|
|
|
/* recurse to sub-contents */
|
|
|
|
if(form->more)
|
|
|
|
curl_formfree(form->more);
|
|
|
|
|
2001-08-28 10:54:33 +02:00
|
|
|
if( !(form->flags & HTTPPOST_PTRNAME) && form->name)
|
2000-11-17 15:06:24 +01:00
|
|
|
free(form->name); /* free the name */
|
2001-08-21 15:18:07 +02:00
|
|
|
if( !(form->flags & HTTPPOST_PTRCONTENTS) && form->contents)
|
2000-11-17 15:06:24 +01:00
|
|
|
free(form->contents); /* free the contents */
|
|
|
|
if(form->contenttype)
|
|
|
|
free(form->contenttype); /* free the content type */
|
2002-03-11 16:18:59 +01:00
|
|
|
if(form->showfilename)
|
|
|
|
free(form->showfilename); /* free the faked file name */
|
2000-11-17 15:06:24 +01:00
|
|
|
free(form); /* free the struct */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2000-05-22 16:12:12 +02:00
|
|
|
} while((form=next)); /* continue */
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2002-04-15 13:19:03 +02:00
|
|
|
CURLcode Curl_getFormData(struct FormData **finalform,
|
|
|
|
struct curl_httppost *post,
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t *sizep)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
|
|
|
struct FormData *form = NULL;
|
|
|
|
struct FormData *firstform;
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost *file;
|
2002-04-15 13:19:03 +02:00
|
|
|
CURLcode result = CURLE_OK;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2004-03-03 14:11:28 +01:00
|
|
|
size_t size =0;
|
1999-12-29 15:20:26 +01:00
|
|
|
char *boundary;
|
|
|
|
char *fileboundary=NULL;
|
2001-12-14 13:59:16 +01:00
|
|
|
struct curl_slist* curList;
|
|
|
|
|
2002-04-15 13:19:03 +02:00
|
|
|
*finalform=NULL; /* default form is empty */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
if(!post)
|
2002-04-15 13:19:03 +02:00
|
|
|
return result; /* no input => no output! */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
boundary = Curl_FormBoundary();
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
/* Make the first line of the output */
|
|
|
|
AddFormDataf(&form,
|
|
|
|
"Content-Type: multipart/form-data;"
|
|
|
|
" boundary=%s\r\n",
|
|
|
|
boundary);
|
|
|
|
/* we DO NOT count that line since that'll be part of the header! */
|
|
|
|
|
|
|
|
firstform = form;
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
2002-02-06 16:48:53 +01:00
|
|
|
if(size)
|
|
|
|
size += AddFormDataf(&form, "\r\n");
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
/* boundary */
|
2002-01-29 21:30:56 +01:00
|
|
|
size += AddFormDataf(&form, "--%s\r\n", boundary);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2001-08-28 10:54:33 +02:00
|
|
|
size += AddFormData(&form,
|
|
|
|
"Content-Disposition: form-data; name=\"", 0);
|
|
|
|
|
|
|
|
size += AddFormData(&form, post->name, post->namelength);
|
|
|
|
|
|
|
|
size += AddFormData(&form, "\"", 0);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
if(post->more) {
|
|
|
|
/* If used, this is a link to more file names, we must then do
|
|
|
|
the magic to include several files with the same field name */
|
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
fileboundary = Curl_FormBoundary();
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
size += AddFormDataf(&form,
|
2002-06-12 23:40:59 +02:00
|
|
|
"\r\nContent-Type: multipart/mixed,"
|
|
|
|
" boundary=%s\r\n",
|
|
|
|
fileboundary);
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
file = post;
|
|
|
|
|
|
|
|
do {
|
2002-03-11 16:18:59 +01:00
|
|
|
|
|
|
|
/* If 'showfilename' is set, that is a faked name passed on to us
|
|
|
|
to use to in the formpost. If that is not set, the actually used
|
|
|
|
local file name should be added. */
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
if(post->more) {
|
2002-06-12 23:40:59 +02:00
|
|
|
/* if multiple-file */
|
|
|
|
size += AddFormDataf(&form,
|
|
|
|
"\r\n--%s\r\nContent-Disposition: "
|
2002-03-11 16:18:59 +01:00
|
|
|
"attachment; filename=\"%s\"",
|
2002-06-12 23:40:59 +02:00
|
|
|
fileboundary,
|
2002-03-11 16:18:59 +01:00
|
|
|
(file->showfilename?file->showfilename:
|
|
|
|
file->contents));
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2002-06-12 23:40:59 +02:00
|
|
|
else if((post->flags & HTTPPOST_FILENAME) ||
|
|
|
|
(post->flags & HTTPPOST_BUFFER)) {
|
|
|
|
|
|
|
|
size += AddFormDataf(&form,
|
|
|
|
"; filename=\"%s\"",
|
|
|
|
(post->showfilename?post->showfilename:
|
2002-03-11 16:18:59 +01:00
|
|
|
post->contents));
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if(file->contenttype) {
|
2002-06-12 23:40:59 +02:00
|
|
|
/* we have a specified type */
|
|
|
|
size += AddFormDataf(&form,
|
|
|
|
"\r\nContent-Type: %s",
|
|
|
|
file->contenttype);
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2000-10-10 00:29:35 +02:00
|
|
|
|
2001-12-14 13:59:16 +01:00
|
|
|
curList = file->contentheader;
|
|
|
|
while( curList ) {
|
|
|
|
/* Process the additional headers specified for this form */
|
|
|
|
size += AddFormDataf( &form, "\r\n%s", curList->data );
|
|
|
|
curList = curList->next;
|
|
|
|
}
|
|
|
|
|
2000-10-10 00:29:35 +02:00
|
|
|
#if 0
|
|
|
|
/* The header Content-Transfer-Encoding: seems to confuse some receivers
|
|
|
|
* (like the built-in PHP engine). While I can't see any reason why it
|
|
|
|
* should, I can just as well skip this to the benefit of the users who
|
|
|
|
* are using such confused receivers.
|
|
|
|
*/
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
if(file->contenttype &&
|
2002-10-28 22:52:00 +01:00
|
|
|
!checkprefix("text/", file->contenttype)) {
|
2002-06-12 23:40:59 +02:00
|
|
|
/* this is not a text content, mention our binary encoding */
|
|
|
|
size += AddFormData(&form, "\r\nContent-Transfer-Encoding: binary", 0);
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2000-10-10 00:29:35 +02:00
|
|
|
#endif
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2000-07-25 14:21:22 +02:00
|
|
|
size += AddFormData(&form, "\r\n\r\n", 0);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2000-07-25 14:21:22 +02:00
|
|
|
if((post->flags & HTTPPOST_FILENAME) ||
|
2002-06-12 23:40:59 +02:00
|
|
|
(post->flags & HTTPPOST_READFILE)) {
|
|
|
|
/* we should include the contents from the specified file */
|
|
|
|
FILE *fileread;
|
|
|
|
char buffer[1024];
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t nread;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2002-06-12 23:40:59 +02:00
|
|
|
fileread = strequal("-", file->contents)?stdin:
|
1999-12-29 15:20:26 +01:00
|
|
|
/* binary read for win32 crap */
|
2002-06-12 23:40:59 +02:00
|
|
|
/*VMS??*/ fopen(file->contents, "rb"); /* ONLY ALLOWS FOR STREAM FILES ON VMS */
|
|
|
|
/*VMS?? Stream files are OK, as are FIXED & VAR files WITHOUT implied CC */
|
|
|
|
/*VMS?? For implied CC, every record needs to have a \n appended & 1 added to SIZE */
|
|
|
|
if(fileread) {
|
|
|
|
while((nread = fread(buffer, 1, 1024, fileread)))
|
|
|
|
size += AddFormData(&form, buffer, nread);
|
2002-04-15 13:19:03 +02:00
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
if(fileread != stdin)
|
|
|
|
fclose(fileread);
|
2002-06-12 23:40:59 +02:00
|
|
|
}
|
2002-01-19 12:08:05 +01:00
|
|
|
else {
|
2002-04-15 13:19:03 +02:00
|
|
|
#if 0
|
2002-01-19 12:08:05 +01:00
|
|
|
/* File wasn't found, add a nothing field! */
|
2002-06-12 23:40:59 +02:00
|
|
|
size += AddFormData(&form, "", 0);
|
2002-04-15 13:19:03 +02:00
|
|
|
#endif
|
|
|
|
Curl_formclean(firstform);
|
|
|
|
free(boundary);
|
|
|
|
*finalform = NULL;
|
|
|
|
return CURLE_READ_ERROR;
|
2002-06-12 23:40:59 +02:00
|
|
|
}
|
|
|
|
|
2004-02-27 14:21:14 +01:00
|
|
|
}
|
|
|
|
else if (post->flags & HTTPPOST_BUFFER) {
|
2002-06-12 23:40:59 +02:00
|
|
|
/* include contents of buffer */
|
|
|
|
size += AddFormData(&form, post->buffer, post->bufferlength);
|
2002-01-19 12:08:05 +01:00
|
|
|
}
|
2002-06-12 23:40:59 +02:00
|
|
|
|
2002-04-15 13:19:03 +02:00
|
|
|
else {
|
2002-06-12 23:40:59 +02:00
|
|
|
/* include the contents we got */
|
|
|
|
size += AddFormData(&form, post->contents, post->contentslength);
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
} while((file = file->more)); /* for each specified file for this field */
|
|
|
|
|
|
|
|
if(post->more) {
|
|
|
|
/* this was a multiple-file inclusion, make a termination file
|
|
|
|
boundary: */
|
|
|
|
size += AddFormDataf(&form,
|
2002-06-12 23:40:59 +02:00
|
|
|
"\r\n--%s--",
|
|
|
|
fileboundary);
|
1999-12-29 15:20:26 +01:00
|
|
|
free(fileboundary);
|
|
|
|
}
|
|
|
|
|
|
|
|
} while((post=post->next)); /* for each field */
|
|
|
|
|
|
|
|
/* end-boundary for everything */
|
|
|
|
size += AddFormDataf(&form,
|
2002-06-12 23:40:59 +02:00
|
|
|
"\r\n--%s--\r\n",
|
|
|
|
boundary);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
*sizep = size;
|
|
|
|
|
|
|
|
free(boundary);
|
|
|
|
|
2002-04-15 13:19:03 +02:00
|
|
|
*finalform=firstform;
|
|
|
|
|
|
|
|
return result;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
int Curl_FormInit(struct Form *form, struct FormData *formdata )
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
|
|
|
if(!formdata)
|
|
|
|
return 1; /* error */
|
2000-06-15 16:33:17 +02:00
|
|
|
|
2000-05-22 16:12:12 +02:00
|
|
|
form->data = formdata;
|
|
|
|
form->sent = 0;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fread() emulation */
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t Curl_FormReader(char *buffer,
|
|
|
|
size_t size,
|
|
|
|
size_t nitems,
|
|
|
|
FILE *mydata)
|
2001-08-21 15:18:07 +02:00
|
|
|
{
|
|
|
|
struct Form *form;
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t wantedsize;
|
|
|
|
size_t gotsize = 0;
|
2001-08-21 15:18:07 +02:00
|
|
|
|
|
|
|
form=(struct Form *)mydata;
|
|
|
|
|
|
|
|
wantedsize = size * nitems;
|
|
|
|
|
|
|
|
if(!form->data)
|
2002-11-29 09:12:20 +01:00
|
|
|
return 0; /* nothing, error, empty */
|
2001-08-21 15:18:07 +02:00
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
|
|
if( (form->data->length - form->sent ) > wantedsize - gotsize) {
|
|
|
|
|
|
|
|
memcpy(buffer + gotsize , form->data->line + form->sent,
|
|
|
|
wantedsize - gotsize);
|
|
|
|
|
|
|
|
form->sent += wantedsize-gotsize;
|
|
|
|
|
|
|
|
return wantedsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(buffer+gotsize,
|
|
|
|
form->data->line + form->sent,
|
|
|
|
(form->data->length - form->sent) );
|
|
|
|
gotsize += form->data->length - form->sent;
|
|
|
|
|
|
|
|
form->sent = 0;
|
|
|
|
|
|
|
|
form->data = form->data->next; /* advance */
|
|
|
|
|
|
|
|
} while(form->data);
|
|
|
|
/* If we got an empty line and we have more data, we proceed to the next
|
|
|
|
line immediately to avoid returning zero before we've reached the end.
|
|
|
|
This is the bug reported November 22 1999 on curl 6.3. (Daniel) */
|
|
|
|
|
|
|
|
return gotsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* possible (old) fread() emulation that copies at most one line */
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t Curl_FormReadOneLine(char *buffer,
|
|
|
|
size_t size,
|
|
|
|
size_t nitems,
|
|
|
|
FILE *mydata)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
|
|
|
struct Form *form;
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t wantedsize;
|
|
|
|
size_t gotsize;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
form=(struct Form *)mydata;
|
|
|
|
|
|
|
|
wantedsize = size * nitems;
|
|
|
|
|
|
|
|
if(!form->data)
|
2004-02-26 14:40:43 +01:00
|
|
|
return 0; /* nothing, error, empty */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
|
|
if( (form->data->length - form->sent ) > wantedsize ) {
|
|
|
|
|
|
|
|
memcpy(buffer, form->data->line + form->sent, wantedsize);
|
|
|
|
|
|
|
|
form->sent += wantedsize;
|
|
|
|
|
|
|
|
return wantedsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(buffer,
|
|
|
|
form->data->line + form->sent,
|
|
|
|
gotsize = (form->data->length - form->sent) );
|
|
|
|
|
|
|
|
form->sent = 0;
|
|
|
|
|
|
|
|
form->data = form->data->next; /* advance */
|
|
|
|
|
|
|
|
} while(!gotsize && form->data);
|
|
|
|
/* If we got an empty line and we have more data, we proceed to the next
|
|
|
|
line immediately to avoid returning zero before we've reached the end.
|
|
|
|
This is the bug reported November 22 1999 on curl 6.3. (Daniel) */
|
|
|
|
|
|
|
|
return gotsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _FORM_DEBUG
|
2001-08-21 15:18:07 +02:00
|
|
|
int FormAddTest(const char * errormsg,
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost **httppost,
|
|
|
|
struct curl_httppost **last_post,
|
2001-08-21 15:18:07 +02:00
|
|
|
...)
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
va_list arg;
|
|
|
|
va_start(arg, last_post);
|
|
|
|
if ((result = FormAdd(httppost, last_post, arg)))
|
|
|
|
fprintf (stderr, "ERROR doing FormAdd ret: %d action: %s\n", result,
|
|
|
|
errormsg);
|
|
|
|
va_end(arg);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int main()
|
|
|
|
{
|
|
|
|
char name1[] = "simple_COPYCONTENTS";
|
|
|
|
char name2[] = "COPYCONTENTS_+_CONTENTTYPE";
|
2001-08-28 10:54:33 +02:00
|
|
|
char name3[] = "PTRNAME_+_NAMELENGTH_+_COPYNAME_+_CONTENTSLENGTH";
|
|
|
|
char name4[] = "simple_PTRCONTENTS";
|
|
|
|
char name5[] = "PTRCONTENTS_+_CONTENTSLENGTH";
|
|
|
|
char name6[] = "PTRCONTENTS_+_CONTENTSLENGTH_+_CONTENTTYPE";
|
|
|
|
char name7[] = "FILE1_+_CONTENTTYPE";
|
|
|
|
char name8[] = "FILE1_+_FILE2";
|
|
|
|
char name9[] = "FILE1_+_FILE2_+_FILE3";
|
2001-10-03 09:54:42 +02:00
|
|
|
char name10[] = "ARRAY: FILE1_+_FILE2_+_FILE3";
|
|
|
|
char name11[] = "FILECONTENT";
|
2001-08-21 15:18:07 +02:00
|
|
|
char value1[] = "value for simple COPYCONTENTS";
|
|
|
|
char value2[] = "value for COPYCONTENTS + CONTENTTYPE";
|
2001-08-28 10:54:33 +02:00
|
|
|
char value3[] = "value for PTRNAME + NAMELENGTH + COPYNAME + CONTENTSLENGTH";
|
|
|
|
char value4[] = "value for simple PTRCONTENTS";
|
|
|
|
char value5[] = "value for PTRCONTENTS + CONTENTSLENGTH";
|
|
|
|
char value6[] = "value for PTRCOTNENTS + CONTENTSLENGTH + CONTENTTYPE";
|
|
|
|
char value7[] = "inet_ntoa_r.h";
|
|
|
|
char value8[] = "Makefile.b32.resp";
|
2001-08-21 15:18:07 +02:00
|
|
|
char type2[] = "image/gif";
|
2001-08-28 10:54:33 +02:00
|
|
|
char type6[] = "text/plain";
|
|
|
|
char type7[] = "text/html";
|
|
|
|
int name3length = strlen(name3);
|
|
|
|
int value3length = strlen(value3);
|
|
|
|
int value5length = strlen(value4);
|
|
|
|
int value6length = strlen(value5);
|
2001-08-21 15:18:07 +02:00
|
|
|
int errors = 0;
|
|
|
|
int size;
|
2004-02-26 14:40:43 +01:00
|
|
|
size_t nread;
|
2001-08-21 15:18:07 +02:00
|
|
|
char buffer[4096];
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost *httppost=NULL;
|
|
|
|
struct curl_httppost *last_post=NULL;
|
2001-10-03 09:54:42 +02:00
|
|
|
struct curl_forms forms[4];
|
2001-08-21 15:18:07 +02:00
|
|
|
|
|
|
|
struct FormData *form;
|
|
|
|
struct Form formread;
|
|
|
|
|
|
|
|
if (FormAddTest("simple COPYCONTENTS test", &httppost, &last_post,
|
|
|
|
CURLFORM_COPYNAME, name1, CURLFORM_COPYCONTENTS, value1,
|
|
|
|
CURLFORM_END))
|
|
|
|
++errors;
|
|
|
|
if (FormAddTest("COPYCONTENTS + CONTENTTYPE test", &httppost, &last_post,
|
|
|
|
CURLFORM_COPYNAME, name2, CURLFORM_COPYCONTENTS, value2,
|
|
|
|
CURLFORM_CONTENTTYPE, type2, CURLFORM_END))
|
|
|
|
++errors;
|
2001-08-28 10:54:33 +02:00
|
|
|
/* make null character at start to check that contentslength works
|
|
|
|
correctly */
|
|
|
|
name3[1] = '\0';
|
|
|
|
value3[1] = '\0';
|
|
|
|
if (FormAddTest("PTRNAME + NAMELENGTH + COPYNAME + CONTENTSLENGTH test",
|
|
|
|
&httppost, &last_post,
|
|
|
|
CURLFORM_PTRNAME, name3, CURLFORM_COPYCONTENTS, value3,
|
|
|
|
CURLFORM_CONTENTSLENGTH, value3length,
|
|
|
|
CURLFORM_NAMELENGTH, name3length, CURLFORM_END))
|
|
|
|
++errors;
|
2001-08-21 15:18:07 +02:00
|
|
|
if (FormAddTest("simple PTRCONTENTS test", &httppost, &last_post,
|
2001-08-28 10:54:33 +02:00
|
|
|
CURLFORM_COPYNAME, name4, CURLFORM_PTRCONTENTS, value4,
|
2001-08-21 15:18:07 +02:00
|
|
|
CURLFORM_END))
|
|
|
|
++errors;
|
|
|
|
/* make null character at start to check that contentslength works
|
|
|
|
correctly */
|
2001-08-28 10:54:33 +02:00
|
|
|
value5[1] = '\0';
|
2001-08-21 15:18:07 +02:00
|
|
|
if (FormAddTest("PTRCONTENTS + CONTENTSLENGTH test", &httppost, &last_post,
|
2001-08-28 10:54:33 +02:00
|
|
|
CURLFORM_COPYNAME, name5, CURLFORM_PTRCONTENTS, value5,
|
|
|
|
CURLFORM_CONTENTSLENGTH, value5length, CURLFORM_END))
|
2001-08-21 15:18:07 +02:00
|
|
|
++errors;
|
|
|
|
/* make null character at start to check that contentslength works
|
|
|
|
correctly */
|
2001-08-28 10:54:33 +02:00
|
|
|
value6[1] = '\0';
|
2001-08-21 15:18:07 +02:00
|
|
|
if (FormAddTest("PTRCONTENTS + CONTENTSLENGTH + CONTENTTYPE test",
|
|
|
|
&httppost, &last_post,
|
2001-08-28 10:54:33 +02:00
|
|
|
CURLFORM_COPYNAME, name6, CURLFORM_PTRCONTENTS, value6,
|
|
|
|
CURLFORM_CONTENTSLENGTH, value6length,
|
|
|
|
CURLFORM_CONTENTTYPE, type6, CURLFORM_END))
|
2001-08-21 15:18:07 +02:00
|
|
|
++errors;
|
|
|
|
if (FormAddTest("FILE + CONTENTTYPE test", &httppost, &last_post,
|
2001-08-28 10:54:33 +02:00
|
|
|
CURLFORM_COPYNAME, name7, CURLFORM_FILE, value7,
|
|
|
|
CURLFORM_CONTENTTYPE, type7, CURLFORM_END))
|
2001-08-21 15:18:07 +02:00
|
|
|
++errors;
|
|
|
|
if (FormAddTest("FILE1 + FILE2 test", &httppost, &last_post,
|
2001-08-28 10:54:33 +02:00
|
|
|
CURLFORM_COPYNAME, name8, CURLFORM_FILE, value7,
|
|
|
|
CURLFORM_FILE, value8, CURLFORM_END))
|
|
|
|
++errors;
|
|
|
|
if (FormAddTest("FILE1 + FILE2 + FILE3 test", &httppost, &last_post,
|
|
|
|
CURLFORM_COPYNAME, name9, CURLFORM_FILE, value7,
|
|
|
|
CURLFORM_FILE, value8, CURLFORM_FILE, value7, CURLFORM_END))
|
2001-08-21 15:18:07 +02:00
|
|
|
++errors;
|
2001-10-03 09:54:42 +02:00
|
|
|
forms[0].option = CURLFORM_FILE;
|
|
|
|
forms[0].value = value7;
|
|
|
|
forms[1].option = CURLFORM_FILE;
|
|
|
|
forms[1].value = value8;
|
|
|
|
forms[2].option = CURLFORM_FILE;
|
|
|
|
forms[2].value = value7;
|
|
|
|
forms[3].option = CURLFORM_END;
|
|
|
|
if (FormAddTest("FILE1 + FILE2 + FILE3 ARRAY test", &httppost, &last_post,
|
|
|
|
CURLFORM_COPYNAME, name10, CURLFORM_ARRAY, forms,
|
|
|
|
CURLFORM_END))
|
|
|
|
++errors;
|
|
|
|
if (FormAddTest("FILECONTENT test", &httppost, &last_post,
|
|
|
|
CURLFORM_COPYNAME, name11, CURLFORM_FILECONTENT, value7,
|
|
|
|
CURLFORM_END))
|
|
|
|
++errors;
|
2001-08-21 15:18:07 +02:00
|
|
|
|
|
|
|
form=Curl_getFormData(httppost, &size);
|
|
|
|
|
|
|
|
Curl_FormInit(&formread, form);
|
|
|
|
|
|
|
|
do {
|
|
|
|
nread = Curl_FormReader(buffer, 1, sizeof(buffer),
|
|
|
|
(FILE *)&formread);
|
|
|
|
|
|
|
|
if(-1 == nread)
|
|
|
|
break;
|
2001-10-29 14:21:25 +01:00
|
|
|
fwrite(buffer, nread, 1, stdout);
|
2001-08-21 15:18:07 +02:00
|
|
|
} while(1);
|
|
|
|
|
2001-10-29 14:21:25 +01:00
|
|
|
fprintf(stdout, "size: %d\n", size);
|
2001-08-21 15:18:07 +02:00
|
|
|
if (errors)
|
2001-10-29 14:21:25 +01:00
|
|
|
fprintf(stdout, "\n==> %d Test(s) failed!\n", errors);
|
2001-08-21 15:18:07 +02:00
|
|
|
else
|
|
|
|
fprintf(stdout, "\nAll Tests seem to have worked (please check output)\n");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef _OLD_FORM_DEBUG
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
char *testargs[]={
|
|
|
|
"name1 = data in number one",
|
|
|
|
"name2 = number two data",
|
|
|
|
"test = @upload"
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
int i;
|
|
|
|
char *nextarg;
|
2002-03-11 16:18:59 +01:00
|
|
|
struct curl_httppost *httppost=NULL;
|
|
|
|
struct curl_httppost *last_post=NULL;
|
|
|
|
struct curl_httppost *post;
|
1999-12-29 15:20:26 +01:00
|
|
|
int size;
|
|
|
|
int nread;
|
|
|
|
char buffer[4096];
|
|
|
|
|
|
|
|
struct FormData *form;
|
|
|
|
struct Form formread;
|
|
|
|
|
|
|
|
for(i=1; i<argc; i++) {
|
|
|
|
|
|
|
|
if( FormParse( argv[i],
|
|
|
|
&httppost,
|
|
|
|
&last_post)) {
|
|
|
|
fprintf(stderr, "Illegally formatted input field: '%s'!\n",
|
|
|
|
argv[i]);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
form=Curl_getFormData(httppost, &size);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2001-06-05 13:27:40 +02:00
|
|
|
Curl_FormInit(&formread, form);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2001-06-05 13:27:40 +02:00
|
|
|
do {
|
|
|
|
nread = Curl_FormReader(buffer, 1, sizeof(buffer),
|
|
|
|
(FILE *)&formread);
|
|
|
|
|
|
|
|
if(-1 == nread)
|
|
|
|
break;
|
1999-12-29 15:20:26 +01:00
|
|
|
fwrite(buffer, nread, 1, stderr);
|
2001-06-05 13:27:40 +02:00
|
|
|
} while(1);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
fprintf(stderr, "size: %d\n", size);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2001-09-07 06:01:32 +02:00
|
|
|
|
2002-06-11 13:13:01 +02:00
|
|
|
#endif /* CURL_DISABLE_HTTP */
|