Newer
Older
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
Daniel Stenberg
committed
* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
* 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.
* 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
* furnished to do so, under the terms of the COPYING file.
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
***************************************************************************/
/*
Debug the form generator stand-alone by compiling this source file with:
Daniel Stenberg
committed
gcc -DHAVE_CONFIG_H -I../ -g -D_FORM_DEBUG -DCURLDEBUG -o formdata \
-I../include formdata.c strequal.c memdebug.c mprintf.c strerror.c
(depending on circumstances you may need further externals added)
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
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)
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"
Daniel Stenberg
committed
Content-Type: application/octet-stream
vlue for PTRCONTENTS + CONTENTSLENGTH + CONTENTTYPE
(or you might see v^@lue at the start)
Content-Disposition: form-data; name="FILE1_+_CONTENTTYPE"; filename="formdata.h"
Content-Type: text/html
...
Content-Disposition: form-data; name="FILE1_+_FILE2"
Content-Type: multipart/mixed, boundary=curlz1s0dkticx49MV1KGcYP5cvfSsz
Content-Disposition: attachment; filename="formdata.h"
Daniel Stenberg
committed
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="Makefile.b32"
Daniel Stenberg
committed
Content-Type: application/octet-stream
...
Content-Disposition: form-data; name="FILE1_+_FILE2_+_FILE3"
Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
...
Content-Disposition: attachment; filename="formdata.h"
Daniel Stenberg
committed
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="Makefile.b32"
Daniel Stenberg
committed
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="formdata.h"
Daniel Stenberg
committed
Content-Type: application/octet-stream
Content-Disposition: form-data; name="ARRAY: FILE1_+_FILE2_+_FILE3"
Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
...
Content-Disposition: attachment; filename="formdata.h"
Daniel Stenberg
committed
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="Makefile.b32"
Daniel Stenberg
committed
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="formdata.h"
Daniel Stenberg
committed
Content-Type: application/octet-stream
...
Content-Disposition: form-data; name="FILECONTENT"
...
Daniel Stenberg
committed
/* Length of the random boundary string. */
#define BOUNDARY_LENGTH 40
#if !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY)
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <time.h>
#if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)
Daniel Stenberg
committed
#include <libgen.h>
#endif
#include "urldata.h" /* for struct SessionHandle */
#include "easyif.h" /* for Curl_convert_... prototypes */
#include "memory.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
/* The last #include file should be: */
#include "memdebug.h"
#endif /* !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY) */
#ifndef CURL_DISABLE_HTTP
Daniel Stenberg
committed
#if defined(HAVE_BASENAME) && defined(NEED_BASENAME_PROTO)
/* This system has a basename() but no prototype for it! */
char *basename(char *path);
#endif
Daniel Stenberg
committed
static size_t readfromfile(struct Form *form, char *buffer, size_t size);
/* What kind of Content-Type to use on un-specified files with unrecognized
extensions. */
Daniel Stenberg
committed
#define HTTPPOST_CONTENTTYPE_DEFAULT "application/octet-stream"
#define FORM_FILE_SEPARATOR ','
#define FORM_TYPE_SEPARATOR ';'
/***************************************************************************
*
* 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.
*
* Returns newly allocated HttpPost on success and NULL if malloc failed.
*
***************************************************************************/
static struct curl_httppost *
Daniel Stenberg
committed
AddHttpPost(char *name, size_t namelength,
char *value, size_t contentslength,
char *buffer, size_t bufferlength,
char *contenttype,
long flags,
struct curl_slist* contentHeader,
Daniel Stenberg
committed
char *showfilename, char *userp,
struct curl_httppost *parent_post,
struct curl_httppost **httppost,
struct curl_httppost **last_post)
struct curl_httppost *post;
post = calloc(sizeof(struct curl_httppost), 1);
if(post) {
post->name = name;
post->namelength = (long)(name?(namelength?namelength:strlen(name)):0);
post->contents = value;
Daniel Stenberg
committed
post->contentslength = (long)contentslength;
Daniel Stenberg
committed
post->buffer = buffer;
Daniel Stenberg
committed
post->bufferlength = (long)bufferlength;
post->contenttype = contenttype;
post->contentheader = contentHeader;
post->showfilename = showfilename;
Daniel Stenberg
committed
post->userp = userp,
post->flags = flags;
}
else
return NULL;
Daniel Stenberg
committed
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 */
}
else {
/* make the previous point to this */
if(*last_post)
(*last_post)->next = post;
else
(*httppost) = post;
}
return post;
}
/***************************************************************************
*
* 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.
*
***************************************************************************/
static FormInfo * AddFormInfo(char *value,
char *contenttype,
FormInfo *parent_form_info)
{
FormInfo *form_info;
form_info = malloc(sizeof(FormInfo));
if(form_info) {
memset(form_info, 0, sizeof(FormInfo));
Daniel Stenberg
committed
if(value)
form_info->value = value;
Daniel Stenberg
committed
if(contenttype)
form_info->contenttype = contenttype;
form_info->flags = HTTPPOST_FILENAME;
}
else
return NULL;
Daniel Stenberg
committed
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.
*
***************************************************************************/
static const char * ContentTypeForFilename (const char *filename,
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 const struct ContentType ctts[]={
{".gif", "image/gif"},
{".jpg", "image/jpeg"},
{".jpeg", "image/jpeg"},
{".txt", "text/plain"},
{".html", "text/html"}
if(prevtype)
/* default to the previously set/used! */
contenttype = prevtype;
else
contenttype = HTTPPOST_CONTENTTYPE_DEFAULT;
if(filename) { /* in case a NULL was passed in */
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;
}
/***************************************************************************
*
* Copies the 'source' data to a newly allocated buffer buffer (that is
* returned). Uses buffer_length if not null, else uses strlen to determine
* the length of the buffer to be copied
* Returns the new pointer or NULL on failure.
*
***************************************************************************/
static char *memdup(const char *src, size_t buffer_length)
size_t length;
bool add = FALSE;
Daniel Stenberg
committed
if(buffer_length)
length = buffer_length;
else
/* no length and a NULL src pointer! */
Daniel Stenberg
committed
if(!buffer)
memcpy(buffer, src, length);
/* if length unknown do null termination */
Daniel Stenberg
committed
if(add)
buffer[length] = '\0';
return buffer;
/***************************************************************************
*
* FormAdd()
* Stores a 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",
* CURLFORM_COPYCONTENTS, "value", CURLFORM_END);
*
* name/value pair where only the content pointer is remembered:
* curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
* CURLFORM_PTRCONTENTS, ptr, CURLFORM_CONTENTSLENGTH, 10, CURLFORM_END);
* (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);
*
Daniel Stenberg
committed
* 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
*
***************************************************************************/
static
Daniel Stenberg
committed
CURLFORMcode FormAdd(struct curl_httppost **httppost,
struct curl_httppost **last_post,
va_list params)
FormInfo *first_form, *current_form, *form = NULL;
Daniel Stenberg
committed
CURLFORMcode return_value = CURL_FORMADD_OK;
const char *prevtype = NULL;
struct curl_httppost *post = NULL;
CURLformoption option;
struct curl_forms *forms = NULL;
char *array_value=NULL; /* value read from an array */
/* 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;
/*
* We need to allocate the first struct to fill in.
*/
first_form = calloc(sizeof(struct FormInfo), 1);
Daniel Stenberg
committed
return CURL_FORMADD_MEMORY;
current_form = first_form;
* Loop through all the options set. Break if we have an error to report.
Daniel Stenberg
committed
while(return_value == CURL_FORMADD_OK) {
/* first see if we have more parts of the array param */
Daniel Stenberg
committed
if( array_state ) {
/* get the upcoming option from the given array */
option = forms->option;
array_value = (char *)forms->value;
forms++; /* advance this to next entry */
Daniel Stenberg
committed
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);
Daniel Stenberg
committed
if(CURLFORM_END == option)
}
switch (option) {
case CURLFORM_ARRAY:
if(array_state)
/* we don't support an array from within an array */
Daniel Stenberg
committed
return_value = CURL_FORMADD_ILLEGAL_ARRAY;
else {
forms = va_arg(params, struct curl_forms *);
Daniel Stenberg
committed
if(forms)
array_state = TRUE;
else
Daniel Stenberg
committed
return_value = CURL_FORMADD_NULL;
}
break;
/*
* Set the Name property.
*/
case CURLFORM_PTRNAME:
#ifdef CURL_DOES_CONVERSIONS
/* treat CURLFORM_PTR like CURLFORM_COPYNAME so we'll
have safe memory for the eventual conversion */
#else
current_form->flags |= HTTPPOST_PTRNAME; /* fall through */
#endif
Daniel Stenberg
committed
if(current_form->name)
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
char *name = array_state?
array_value:va_arg(params, char *);
Daniel Stenberg
committed
if(name)
current_form->name = name; /* store for the moment */
Daniel Stenberg
committed
return_value = CURL_FORMADD_NULL;
}
break;
case CURLFORM_NAMELENGTH:
Daniel Stenberg
committed
if(current_form->namelength)
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
current_form->namelength =
array_state?(size_t)array_value:(size_t)va_arg(params, long);
break;
/*
* Set the contents property.
*/
case CURLFORM_PTRCONTENTS:
current_form->flags |= HTTPPOST_PTRCONTENTS; /* fall through */
case CURLFORM_COPYCONTENTS:
Daniel Stenberg
committed
if(current_form->value)
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
char *value =
array_state?array_value:va_arg(params, char *);
Daniel Stenberg
committed
if(value)
current_form->value = value; /* store for the moment */
else
Daniel Stenberg
committed
return_value = CURL_FORMADD_NULL;
}
break;
case CURLFORM_CONTENTSLENGTH:
Daniel Stenberg
committed
if(current_form->contentslength)
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
current_form->contentslength =
array_state?(size_t)array_value:(size_t)va_arg(params, long);
break;
/* Get contents from a given file name */
case CURLFORM_FILECONTENT:
Daniel Stenberg
committed
if(current_form->flags != 0)
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
const char *filename = array_state?
array_value:va_arg(params, char *);
Daniel Stenberg
committed
if(filename) {
current_form->value = strdup(filename);
if(!current_form->value)
return_value = CURL_FORMADD_MEMORY;
else {
current_form->flags |= HTTPPOST_READFILE;
current_form->value_alloc = TRUE;
}
Daniel Stenberg
committed
return_value = CURL_FORMADD_NULL;
}
break;
/* We upload a file */
case CURLFORM_FILE:
{
const char *filename = array_state?array_value:
va_arg(params, char *);
Daniel Stenberg
committed
if(current_form->value) {
if(current_form->flags & HTTPPOST_FILENAME) {
if(filename) {
if((current_form = AddFormInfo(strdup(filename),
Gisle Vanem
committed
NULL, current_form)) == NULL)
Daniel Stenberg
committed
return_value = CURL_FORMADD_MEMORY;
Daniel Stenberg
committed
return_value = CURL_FORMADD_NULL;
}
else
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
}
else {
Daniel Stenberg
committed
if(filename) {
current_form->value = strdup(filename);
if(!current_form->value)
return_value = CURL_FORMADD_MEMORY;
else {
current_form->flags |= HTTPPOST_FILENAME;
current_form->value_alloc = TRUE;
}
}
Daniel Stenberg
committed
return_value = CURL_FORMADD_NULL;
}
break;
}
Daniel Stenberg
committed
case CURLFORM_BUFFER:
{
const char *filename = array_state?array_value:
Daniel Stenberg
committed
va_arg(params, char *);
Daniel Stenberg
committed
if(current_form->value) {
if(current_form->flags & HTTPPOST_BUFFER) {
if(filename) {
if((current_form = AddFormInfo(strdup(filename),
Gisle Vanem
committed
NULL, current_form)) == NULL)
Daniel Stenberg
committed
return_value = CURL_FORMADD_MEMORY;
}
else
return_value = CURL_FORMADD_NULL;
}
else
return_value = CURL_FORMADD_OPTION_TWICE;
}
else {
Daniel Stenberg
committed
if(filename) {
Daniel Stenberg
committed
current_form->value = strdup(filename);
if(!current_form->value)
return_value = CURL_FORMADD_MEMORY;
}
Daniel Stenberg
committed
else
return_value = CURL_FORMADD_NULL;
current_form->flags |= HTTPPOST_BUFFER;
}
break;
}
Daniel Stenberg
committed
case CURLFORM_BUFFERPTR:
Daniel Stenberg
committed
current_form->flags |= HTTPPOST_PTRBUFFER;
Daniel Stenberg
committed
if(current_form->buffer)
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
else {
char *buffer =
array_state?array_value:va_arg(params, char *);
Daniel Stenberg
committed
if(buffer)
Daniel Stenberg
committed
current_form->buffer = buffer; /* store for the moment */
else
return_value = CURL_FORMADD_NULL;
}
break;
case CURLFORM_BUFFERLENGTH:
Daniel Stenberg
committed
if(current_form->bufferlength)
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
else
current_form->bufferlength =
array_state?(size_t)array_value:(size_t)va_arg(params, long);
Daniel Stenberg
committed
break;
Daniel Stenberg
committed
case CURLFORM_STREAM:
current_form->flags |= HTTPPOST_CALLBACK;
if(current_form->userp)
return_value = CURL_FORMADD_OPTION_TWICE;
else {
char *userp =
array_state?array_value:va_arg(params, char *);
if(userp) {
current_form->userp = userp;
current_form->value = userp; /* this isn't strictly true but we
derive a value from this later on
and we need this non-NULL to be
accepted as a fine form part */
}
else
return_value = CURL_FORMADD_NULL;
}
break;
case CURLFORM_CONTENTTYPE:
{
const char *contenttype =
array_state?array_value:va_arg(params, char *);
Daniel Stenberg
committed
if(current_form->contenttype) {
if(current_form->flags & HTTPPOST_FILENAME) {
if(contenttype) {
if((current_form = AddFormInfo(NULL,
Gisle Vanem
committed
strdup(contenttype),
current_form)) == NULL)
Daniel Stenberg
committed
return_value = CURL_FORMADD_MEMORY;
else
return_value = CURL_FORMADD_NULL;
}
else
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
}
else {
Daniel Stenberg
committed
if(contenttype) {
current_form->contenttype = strdup(contenttype);
if(!current_form->contenttype)
return_value = CURL_FORMADD_MEMORY;
else
current_form->contenttype_alloc = TRUE;
}
else
return_value = CURL_FORMADD_NULL;
}
case CURLFORM_CONTENTHEADER:
{
/* this "cast increases required alignment of target type" but
we consider it OK anyway */
struct curl_slist* list = array_state?
(struct curl_slist*)array_value:
va_arg(params, struct curl_slist*);
if( current_form->contentheader )
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
else
current_form->contentheader = list;
case CURLFORM_FILENAME:
{
const char *filename = array_state?array_value:
va_arg(params, char *);
if( current_form->showfilename )
Daniel Stenberg
committed
return_value = CURL_FORMADD_OPTION_TWICE;
current_form->showfilename = strdup(filename);
if(!current_form->showfilename)
return_value = CURL_FORMADD_MEMORY;
else
current_form->showfilename_alloc = TRUE;
}
break;
}
Daniel Stenberg
committed
return_value = CURL_FORMADD_UNKNOWN_OPTION;
Daniel Stenberg
committed
if(CURL_FORMADD_OK == return_value) {
/* go through the list, check for completeness and if everything is
* alright add the HttpPost item otherwise set return_value accordingly */
post = NULL;
for(form = first_form;
form != NULL;
form = form->more) {
Daniel Stenberg
committed
if( ((!form->name || !form->value) && !post) ||
Daniel Stenberg
committed
( (form->contentslength) &&
(form->flags & HTTPPOST_FILENAME) ) ||
( (form->flags & HTTPPOST_FILENAME) &&
(form->flags & HTTPPOST_PTRCONTENTS) ) ||
( (!form->buffer) &&
(form->flags & HTTPPOST_BUFFER) &&
(form->flags & HTTPPOST_PTRBUFFER) ) ||
( (form->flags & HTTPPOST_READFILE) &&
(form->flags & HTTPPOST_PTRCONTENTS) )
) {
Daniel Stenberg
committed
return_value = CURL_FORMADD_INCOMPLETE;
Daniel Stenberg
committed
if( ((form->flags & HTTPPOST_FILENAME) ||
Daniel Stenberg
committed
(form->flags & HTTPPOST_BUFFER)) &&
!form->contenttype ) {
/* our contenttype is missing */
form->contenttype
= strdup(ContentTypeForFilename(form->value, prevtype));
if(!form->contenttype) {
return_value = CURL_FORMADD_MEMORY;
break;
}
form->contenttype_alloc = TRUE;
Daniel Stenberg
committed
if( !(form->flags & HTTPPOST_PTRNAME) &&
Daniel Stenberg
committed
/* Note that there's small risk that form->name is NULL here if the
app passed in a bad combo, so we better check for that first. */
if(form->name)
/* copy name (without strdup; possibly contains null characters) */
form->name = memdup(form->name, form->namelength);
Daniel Stenberg
committed
if(!form->name) {
Daniel Stenberg
committed
return_value = CURL_FORMADD_MEMORY;
Daniel Stenberg
committed
if( !(form->flags & (HTTPPOST_FILENAME | HTTPPOST_READFILE |
HTTPPOST_PTRCONTENTS | HTTPPOST_PTRBUFFER |
HTTPPOST_CALLBACK)) ) {
/* copy value (without strdup; possibly contains null characters) */
form->value = memdup(form->value, form->contentslength);
Daniel Stenberg
committed
if(!form->value) {
Daniel Stenberg
committed
return_value = CURL_FORMADD_MEMORY;
post = AddHttpPost(form->name, form->namelength,
form->value, form->contentslength,
Daniel Stenberg
committed
form->buffer, form->bufferlength,
form->contenttype, form->flags,
form->contentheader, form->showfilename,
Daniel Stenberg
committed
form->userp,
post, httppost,
last_post);
Daniel Stenberg
committed
return_value = CURL_FORMADD_MEMORY;
Daniel Stenberg
committed
if(form->contenttype)
if(return_value) {
/* we return on error, free possibly allocated fields */
if(!form)
form = current_form;
if(form) {
if(form->name_alloc)
free(form->name);
if(form->value_alloc)
free(form->value);
if(form->contenttype_alloc)
free(form->contenttype);
if(form->showfilename_alloc)
free(form->showfilename);
}
/* always delete the allocated memory before returning */
form = first_form;
Daniel Stenberg
committed
while(form != NULL) {
delete_form = form;
form = form->more;
free (delete_form);
}
return return_value;
Daniel Stenberg
committed
/*
* curl_formadd() is a public API to add a section to the multipart formpost.
*/
Daniel Stenberg
committed
CURLFORMcode curl_formadd(struct curl_httppost **httppost,
Daniel Stenberg
committed
struct curl_httppost **last_post,
...)
{
va_list arg;
Daniel Stenberg
committed
CURLFORMcode result;
va_start(arg, last_post);
result = FormAdd(httppost, last_post, arg);
va_end(arg);
return result;
}
Daniel Stenberg
committed
/*
* AddFormData() adds a chunk of data to the FormData linked list.
*
* size is incremented by the chunk length, unless it is NULL
Daniel Stenberg
committed
*/
static CURLcode AddFormData(struct FormData **formp,
Daniel Stenberg
committed
enum formtype type,
const void *line,
size_t length,
Daniel Stenberg
committed
curl_off_t *size)
struct FormData *newform = malloc(sizeof(struct FormData));
Daniel Stenberg
committed
if(!newform)
return CURLE_OUT_OF_MEMORY;
Daniel Stenberg
committed
if(type <= FORM_CONTENT) {
/* we make it easier for plain strings: */
if(!length)
length = strlen((char *)line);
Daniel Stenberg
committed
if(!newform->line) {
free(newform);
return CURLE_OUT_OF_MEMORY;
}
memcpy(newform->line, line, length);
newform->length = length;
newform->line[length]=0; /* zero terminate for easier debugging */
}
Daniel Stenberg
committed
else
/* For callbacks and files we don't have any actual data so we just keep a
pointer to whatever this points to */
newform->line = (char *)line;
Daniel Stenberg
committed
newform->type = type;
if(*formp) {
(*formp)->next = newform;
*formp = newform;
}
else
*formp = newform;
Daniel Stenberg
committed
if(size) {
Daniel Stenberg
committed
if(type != FORM_FILE)
/* for static content as well as callback data we add the size given
as input argument */
Daniel Stenberg
committed
*size += length;
else {
/* Since this is a file to be uploaded here, add the size of the actual
file */
if(!strequal("-", newform->line)) {
Daniel Stenberg
committed
struct_stat file;
Daniel Stenberg
committed
if(!stat(newform->line, &file)) {
*size += file.st_size;
}
}
}
}
return CURLE_OK;
Daniel Stenberg
committed
/*
* AddFormDataf() adds printf()-style formatted data to the formdata chain.
*/
static CURLcode AddFormDataf(struct FormData **formp,
Daniel Stenberg
committed
curl_off_t *size,
const char *fmt, ...)
vsnprintf(s, sizeof(s), fmt, ap);
Daniel Stenberg
committed
return AddFormData(formp, FORM_DATA, s, 0, size);
Daniel Stenberg
committed
/*
* Curl_formclean() is used from http.c, this cleans a built FormData linked
* list
void Curl_formclean(struct FormData **form_ptr)
struct FormData *next, *form;
form = *form_ptr;
if(!form)
return;
do {
next=form->next; /* the following form line */
Daniel Stenberg
committed
if(form->type <= FORM_CONTENT)
free(form->line); /* free the line */
Daniel Stenberg
committed
} while((form = next) != NULL); /* continue */
*form_ptr = NULL;
#ifdef CURL_DOES_CONVERSIONS
/*
* Curl_formcovert() is used from http.c, this converts any
form items that need to be sent in the network encoding.
Returns CURLE_OK on success.
*/
CURLcode Curl_formconvert(struct SessionHandle *data, struct FormData *form)
{
struct FormData *next;
CURLcode rc;
if(!form)
return CURLE_OK;
if(!data)
return CURLE_BAD_FUNCTION_ARGUMENT;
do {
next=form->next; /* the following form line */
Daniel Stenberg
committed
if(form->type == FORM_DATA) {
rc = Curl_convert_to_network(data, form->line, form->length);
/* Curl_convert_to_network calls failf if unsuccessful */
Daniel Stenberg
committed
if(rc != CURLE_OK)
return rc;
}
Daniel Stenberg
committed
} while((form = next) != NULL); /* continue */
return CURLE_OK;
}
#endif /* CURL_DOES_CONVERSIONS */
Daniel Stenberg
committed
/*
* curl_formget()
* Serialize a curl_httppost struct.
* Returns 0 on success.
*/
int curl_formget(struct curl_httppost *form, void *arg,
curl_formget_callback append)
{
Daniel Stenberg
committed
curl_off_t size;
struct FormData *data, *ptr;
rc = Curl_getFormData(&data, form, NULL, &size);
Daniel Stenberg
committed
if(rc != CURLE_OK)
Daniel Stenberg
committed
return (int)rc;
for (ptr = data; ptr; ptr = ptr->next) {
Daniel Stenberg
committed
if(ptr->type == FORM_FILE) {
Daniel Stenberg
committed
char buffer[8192];
size_t nread;
Daniel Stenberg
committed
struct Form temp;
Curl_FormInit(&temp, ptr);
do {
nread = readfromfile(&temp, buffer, sizeof(buffer));
Daniel Stenberg
committed
if((nread == (size_t) -1) || (nread != append(arg, buffer, nread))) {
if(temp.fp) {
Daniel Stenberg
committed
fclose(temp.fp);
}
Curl_formclean(&data);
Daniel Stenberg
committed
return -1;
}
Daniel Stenberg
committed
} while(nread == sizeof(buffer));