/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2004, 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.
/***************************************************************************
*
* 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.
*
}
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;
+ parent_post->more = post;
}
else {
/* make the previous point to this */
(*last_post)->next = post;
else
(*httppost) = post;
-
- (*last_post) = post;
+
+ (*last_post) = 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/
}
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;
}
/***************************************************************************
*
* ContentTypeForFilename()
- *
+ *
* Provides content type for filename if one of the known types (else
* (either the prevtype or the default is returned).
*
{".txt", "text/plain"},
{".html", "text/html"}
};
-
+
if(prevtype)
/* default to the previously set/used! */
contenttype = prevtype;
/* 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 +
ctts[i].extension)) {
contenttype = ctts[i].type;
break;
- }
+ }
}
}
/* we have a contenttype by now */
/***************************************************************************
*
* memdup()
- *
+ *
* 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
size_t length;
bool add = FALSE;
char *buffer;
-
+
if (buffer_length)
length = buffer_length;
else {
buffer = (char*)malloc(length+add);
if (!buffer)
return NULL; /* fail */
-
+
memcpy(buffer, src, length);
/* if length unknown do null termination */
/***************************************************************************
*
* FormAdd()
- *
+ *
* Stores a formpost parameter and builds the appropriate linked list.
*
* Has two principal functionalities: using files and byte arrays as
}
break;
}
-
+
case CURLFORM_BUFFERPTR:
current_form->flags |= HTTPPOST_PTRBUFFER;
if (current_form->buffer)
struct curl_slist* list = array_state?
(struct curl_slist*)array_value:
va_arg(params, struct curl_slist*);
-
+
if( current_form->contentheader )
return_value = CURL_FORMADD_OPTION_TWICE;
else
current_form->contentheader = list;
-
+
break;
}
case CURLFORM_FILENAME:
if(CURL_FORMADD_OK == return_value) {
/* go through the list, check for copleteness and if everything is
* alright add the HttpPost item otherwise set return_value accordingly */
-
+
post = NULL;
for(form = first_form;
form != NULL;
form->name_alloc = TRUE;
}
if ( !(form->flags & HTTPPOST_FILENAME) &&
- !(form->flags & HTTPPOST_READFILE) &&
+ !(form->flags & HTTPPOST_READFILE) &&
!(form->flags & HTTPPOST_PTRCONTENTS) &&
!(form->flags & HTTPPOST_PTRBUFFER) ) {
/* copy value (without strdup; possibly contains null characters) */
form->contentheader, form->showfilename,
post, httppost,
last_post);
-
+
if(!post) {
return_value = CURL_FORMADD_MEMORY;
break;
form = first_form;
while (form != NULL) {
FormInfo *delete_form;
-
+
delete_form = form;
form = form->more;
free (delete_form);
memcpy(newform->line, line, length);
newform->length = length;
newform->line[length]=0; /* zero terminate for easier debugging */
-
+
if(*formp) {
(*formp)->next = newform;
*formp = newform;
/*
* Curl_formclean() is used from http.c, this cleans a built FormData linked
* list
- */
+ */
void Curl_formclean(struct FormData *form)
{
struct FormData *next;
next=form->next; /* the following form line */
free(form->line); /* free the line */
free(form); /* free the struct */
-
+
} while((form=next)); /* continue */
}
boundary = Curl_FormBoundary();
if(!boundary)
return CURLE_OUT_OF_MEMORY;
-
+
/* Make the first line of the output */
result = AddFormDataf(&form, NULL,
"Content-Type: multipart/form-data;"
part of the header! */
firstform = form;
-
+
do {
if(size) {
if (result)
break;
}
-
+
if(file->contenttype) {
/* we have a specified type */
result = AddFormDataf(&form, &size,
* should, I can just as well skip this to the benefit of the users who
* are using such confused receivers.
*/
-
+
if(file->contenttype &&
!checkprefix("text/", file->contenttype)) {
/* this is not a text content, mention our binary encoding */
return CURLE_READ_ERROR;
}
- }
+ }
else if (post->flags & HTTPPOST_BUFFER) {
/* include contents of buffer */
result = AddFormData(&form, post->buffer, post->bufferlength,
boundary: */
result = AddFormDataf(&form, &size,
"\r\n--%s--",
- fileboundary);
+ fileboundary);
free(fileboundary);
if (result)
break;
return 0; /* nothing, error, empty */
do {
-
+
if( (form->data->length - form->sent ) > wantedsize - gotsize) {
memcpy(buffer + gotsize , form->data->line + form->sent,
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 */
projects / curl / commitdiff