Make this source code use our internal *printf(). (5c592f7d) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/formdata.c

+50 −50

Original line number	Diff line number	Diff line
		@@ -107,18 +107,17 @@ Content-Disposition: form-data; name="FILECONTENT"
		#include <stdlib.h>
		#include <string.h>
		#include <stdarg.h>

		#include <time.h>

		#include <curl/curl.h>
		#include "formdata.h"

		#include "strequal.h"
		#include "memory.h"

		#define _MPRINTF_REPLACE /* use our functions only */
		#include <curl/mprintf.h>

		/* The last #include file should be: */
		#ifdef CURLDEBUG
		#include "memdebug.h"
		#endif

		/* Length of the random boundary string. */
		#define BOUNDARY_LENGTH 40
		@@ -900,15 +899,16 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		boundary = Curl_FormBoundary();

		/* Make the first line of the output */
		result = AddFormDataf(&form, 0,
		result = AddFormDataf(&form, NULL,
		"Content-Type: multipart/form-data;"
		" boundary=%s\r\n",
		boundary);
		if (result != CURLE_OK) {
		if (result) {
		free(boundary);
		return result;
		}
		/* we DO NOT count that line since that'll be part of the header! */
		/* we DO NOT include that line in the total size of the POST, since it'll be
		part of the header! */

		firstform = form;

		@@ -916,26 +916,26 @@ CURLcode Curl_getFormData(struct FormData **finalform,

		if(size) {
		result = AddFormDataf(&form, &size, "\r\n");
		if (result != CURLE_OK)
		if (result)
		break;
		}

		/* boundary */
		result = AddFormDataf(&form, &size, "--%s\r\n", boundary);
		if (result != CURLE_OK)
		if (result)
		break;

		result = AddFormData(&form,
		"Content-Disposition: form-data; name=\"", 0, &size);
		if (result != CURLE_OK)
		if (result)
		break;

		result = AddFormData(&form, post->name, post->namelength, &size);
		if (result != CURLE_OK)
		if (result)
		break;

		size += AddFormData(&form, "\"", 0, &size);
		if (result != CURLE_OK)
		if (result)
		break;

		if(post->more) {
		@@ -948,7 +948,7 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		"\r\nContent-Type: multipart/mixed,"
		" boundary=%s\r\n",
		fileboundary);
		if (result != CURLE_OK)
		if (result)
		break;
		}

		@@ -968,7 +968,7 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		fileboundary,
		(file->showfilename?file->showfilename:
		file->contents));
		if (result != CURLE_OK)
		if (result)
		break;
		}
		else if((post->flags & HTTPPOST_FILENAME) \|\|
		@@ -978,7 +978,7 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		"; filename=\"%s\"",
		(post->showfilename?post->showfilename:
		post->contents));
		if (result != CURLE_OK)
		if (result)
		break;
		}

		@@ -987,7 +987,7 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		result = AddFormDataf(&form, &size,
		"\r\nContent-Type: %s",
		file->contenttype);
		if (result != CURLE_OK)
		if (result)
		break;
		}

		@@ -995,11 +995,11 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		while( curList ) {
		/* Process the additional headers specified for this form */
		result = AddFormDataf( &form, &size, "\r\n%s", curList->data );
		if (result != CURLE_OK)
		if (result)
		break;
		curList = curList->next;
		}
		if (result != CURLE_OK) {
		if (result) {
		Curl_formclean(firstform);
		free(boundary);
		return result;
		@@ -1020,7 +1020,7 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		#endif

		result = AddFormData(&form, "\r\n\r\n", 0, &size);
		if (result != CURLE_OK)
		if (result)
		break;

		if((post->flags & HTTPPOST_FILENAME) \|\|
		@@ -1041,10 +1041,10 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		if(fileread) {
		while((nread = fread(buffer, 1, 1024, fileread))) {
		result = AddFormData(&form, buffer, nread, &size);
		if (result != CURLE_OK)
		if (result)
		break;
		}
		if (result != CURLE_OK) {
		if (result) {
		Curl_formclean(firstform);
		free(boundary);
		return result;
		@@ -1065,7 +1065,7 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		/* include contents of buffer */
		result = AddFormData(&form, post->buffer, post->bufferlength,
		&size);
		if (result != CURLE_OK)
		if (result)
		break;
		}

		@@ -1073,11 +1073,11 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		/* include the contents we got */
		result = AddFormData(&form, post->contents, post->contentslength,
		&size);
		if (result != CURLE_OK)
		if (result)
		break;
		}
		} while((file = file->more)); /* for each specified file for this field */
		if (result != CURLE_OK) {
		if (result) {
		Curl_formclean(firstform);
		free(boundary);
		return result;
		@@ -1090,12 +1090,12 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		"\r\n--%s--",
		fileboundary);
		free(fileboundary);
		if (result != CURLE_OK)
		if (result)
		break;
		}

		} while((post=post->next)); /* for each field */
		if (result != CURLE_OK) {
		if (result) {
		Curl_formclean(firstform);
		free(boundary);
		return result;
		@@ -1105,7 +1105,7 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		result = AddFormDataf(&form, &size,
		"\r\n--%s--\r\n",
		boundary);
		if (result != CURLE_OK) {
		if (result) {
		Curl_formclean(firstform);
		free(boundary);
		return result;