/***************************************************************************
- * _ _ ____ _
- * 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.
return newstr;
}
-#endif
+#endif
#ifdef WIN32
#include <direct.h>
char *cookiefile; /* read from this file */
bool cookiesession; /* new session? */
bool encoding; /* Accept-Encoding please */
- long authtype; /* auth bitmask */
+ long authtype; /* auth bitmask */
bool use_resume;
bool resume_from_current;
bool disable_epsv;
struct curl_httppost *last_post;
struct curl_slist *telnet_options;
-
+
HttpReq httpreq;
/* for bandwidth limiting features: */
if(node) {
/* clear the struct */
memset(node, 0, sizeof(struct getout));
-
+
/* append this new node last in the list */
if(last)
last->next = node;
else
config->url_list = node; /* first node */
-
+
/* move the last pointer */
config->url_last = node;
}
/***************************************************************************
*
* formparse()
- *
+ *
* Reads a 'name=value' paramter and builds the appropriate linked list.
*
* Specify files to upload with 'name=@filename'. Supports specified
if((1 == sscanf(input, "%255[^=]=", name)) &&
(contp = strchr(input, '='))) {
/* the input was using the correct format */
-
+
/* Allocate the contents */
contents = strdup(contp+1);
if(!contents) {
/* set type pointer */
type = &ptr[5];
-
+
/* verify that this is a fine type specifier */
if(2 != sscanf(type, "%127[^/]/%127[^;,\n]",
major, minor)) {
PARAM_OK,
PARAM_OPTION_AMBIGUOUS,
PARAM_OPTION_UNKNOWN,
- PARAM_REQUIRES_PARAMETER,
+ PARAM_REQUIRES_PARAMETER,
PARAM_BAD_USE,
PARAM_HELP_REQUESTED,
PARAM_GOT_EXTRA_PARAMETER,
*val = atoi(str);
else
retcode = 1; /* badness */
- return retcode;
+ return retcode;
}
/**
}
if(hit < 0) {
return PARAM_OPTION_UNKNOWN;
- }
+ }
}
else {
flag++; /* prefixed with one dash, pass it */
}
if(hit < 0) {
return PARAM_OPTION_UNKNOWN;
- }
+ }
if(!longopt && aliases[hit].extraparam && parse[1]) {
nextarg=(char *)&parse[1]; /* this is the actual extra parameter */
singleopt=TRUE; /* don't loop anymore after this */
if(curlinfo->features & CURL_VERSION_NTLM)
config->proxyntlm ^= TRUE;
else
- return PARAM_LIBCURL_DOESNT_SUPPORT;
+ return PARAM_LIBCURL_DOESNT_SUPPORT;
break;
case 'u': /* --crlf */
else
/* there was no free node, create one! */
url=new_getout(config);
-
+
if(url) {
/* fill in the URL */
GetStr(&url->url, nextarg);
case '#': /* added 19990617 larsa */
config->progressmode ^= CURL_PROGRESS_BAR;
break;
- case '0':
+ case '0':
/* HTTP version 1.0 */
config->httpversion = CURL_HTTP_VERSION_1_0;
break;
/* TLS version 1 */
config->ssl_version = CURL_SSLVERSION_TLSv1;
break;
- case '2':
+ case '2':
/* SSL version 2 */
config->ssl_version = CURL_SSLVERSION_SSLv2;
break;
- case '3':
+ case '3':
/* SSL version 3 */
config->ssl_version = CURL_SSLVERSION_SSLv3;
break;
- case '4':
+ case '4':
/* IPv4 */
config->ip_version = 4;
break;
- case '6':
+ case '6':
/* IPv6 */
config->ip_version = 6;
break;
if(curlx_strequal("-", nextarg))
file = stdin;
- else
+ else
file = fopen(nextarg, "rb");
if(subletter == 'b') /* forced binary */
nextarg++; /* pass the @ */
if(curlx_strequal("-", nextarg))
file = stdin;
- else
+ else
file = fopen(nextarg, "r");
config->writeout = file2string(file);
if(file && (file != stdin))
fclose(file);
}
- else
+ else
GetStr(&config->writeout, nextarg);
break;
case 'x':
char filebuffer[512];
bool usedarg;
char *home;
-
+
if(!filename || !*filename) {
/* NULL or no file name attempts to load .curlrc from the homedir! */
}
free(home); /* we've used it, now free it */
}
-
+
# else /* AmigaOS */
/* On AmigaOS all the config files are into env:
*/
file = fopen(filename, "r");
else
file = stdin;
-
+
if(file) {
char *line;
char *aline;
/* pass spaces and separator(s) */
while(*line && (isspace((int)*line) || isseparator(*line)))
line++;
-
+
/* the parameter starts here (unless quoted) */
if(*line == '\"') {
char *ptr;
*/
if (config->low_speed_time > 0)
sleep_time = MIN(sleep_time,(config->low_speed_time * 1000) / 2);
-
+
if(sleep_time > 0) {
go_sleep(sleep_time);
now = curlx_tvnow();
}
rc = fwrite(buffer, sz, nmemb, out->stream);
-
+
if(config->nobuffer)
/* disable output buffering */
fflush(out->stream);
-
+
return rc;
}
}
}
config->lastsendtime = now;
-
+
if(size > config->sendpersecond) {
/* lower the size to actually read */
nmemb = (size_t)config->sendpersecond;
{
/* The original progress-bar source code was written for curl by Lars Aas,
and this new edition inherits some of his concepts. */
-
+
char line[256];
char outline[256];
char format[40];
* one from what we got in order to avoid a problem with the cursor
* advancing to the next line if we print a string that is as long as
* the screen is wide. */
-
+
_scrsize(scr_size);
bar->width = scr_size[0] - 1;
#endif
* 4. Windows Directory (e.g. C:\windows)
* 5. all directories along %PATH%
*/
-static void FindWin32CACert(struct Configurable *config,
+static void FindWin32CACert(struct Configurable *config,
const char *bundle_file)
{
/* only check for cert file if "we" support SSL */
#endif
-static int
+static int
operate(struct Configurable *config, int argc, char *argv[])
{
char errorbuffer[CURL_ERROR_SIZE];
char *uploadfile=NULL; /* a single file, never a glob */
int separator = 0;
-
+
FILE *infd = stdin;
bool infdfopen;
FILE *headerfilep = NULL;
char *nextarg;
bool passarg;
char *origopt=argv[i];
-
+
char *flag = argv[i];
if(curlx_strequal("--", argv[i]))
/* This node had no URL, skip it and continue to the next */
if(urlnode->outfile)
free(urlnode->outfile);
-
+
/* move on to the next URL */
nextnode=urlnode->next;
free(urlnode); /* free the node */
i++) {
char *outfile;
outfile = outfiles?strdup(outfiles):NULL;
-
+
if((urlnode->flags&GETOUT_USEREMOTE) ||
(outfile && !curlx_strequal("-", outfile)) ) {
-
- /*
+
+ /*
* We have specified a file name to store the result in, or we have
* decided we want to use the remote file name.
*/
-
+
if(!outfile) {
/* Find and get the remote file name */
char * pc =strstr(url, "://");
}
#if defined(__DJGPP__)
{
- /* This is for DOS, and then we do some major replacing of
+ /* This is for DOS, and then we do some major replacing of
bad characters in the file name before using it */
char file1 [PATH_MAX];
break;
}
}
-
+
/* Create the directory hierarchy, if not pre-existant to a multiple
file output call */
-
+
if(config->create_dirs &&
(-1 == create_dir_hierarchy(outfile)))
return CURLE_WRITE_ERROR;
-
+
if(config->resume_from_current) {
/* We're told to continue from where we are now. Get the
size of the file as it is now and open it for append instead */
-
+
struct stat fileinfo;
/* VMS -- Danger, the filesize is only valid for stream files */
/* let offset be 0 */
config->resume_from = 0;
}
-
+
outs.filename = outfile;
if(config->resume_from) {
else
/* thers is no trailing slash on the URL */
sprintf(urlbuffer, "%s/%s", url, filep);
-
+
curl_free(filep);
free(url);
}
}
/* VMS Note:
- *
+ *
* Reading binary from files can be a problem... Only FIXED, VAR
* etc WITHOUT implied CC will work Others need a \n appended to a
* line
}
infdfopen=TRUE;
uploadfilesize=fileinfo.st_size;
-
+
}
else if(uploadfile && curlx_strequal(uploadfile, "-")) {
infd = stdin;
if the url contains a hostname only
*/
sprintf(urlbuffer, "%s/?%s", url, httpgetfields);
-
+
free(url); /* free previous URL */
url = urlbuffer; /* use our new URL instead! */
}
/* new in libcurl 7.2: */
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, config->postfieldsize);
-
+
curl_easy_setopt(curl, CURLOPT_REFERER, config->referer);
curl_easy_setopt(curl, CURLOPT_AUTOREFERER,
config->conf&CONF_AUTO_REFERER);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1);
}
-
+
if((config->conf&CONF_NOBODY) ||
config->remote_time) {
/* no body or use remote time */
curl_easy_setopt(curl, CURLOPT_FILETIME, TRUE);
}
-
- if (config->maxredirs)
- curl_easy_setopt(curl, CURLOPT_MAXREDIRS, config->maxredirs);
- else
- curl_easy_setopt(curl, CURLOPT_MAXREDIRS, DEFAULT_MAXREDIRS);
-
+
+ if (config->maxredirs)
+ curl_easy_setopt(curl, CURLOPT_MAXREDIRS, config->maxredirs);
+ else
+ curl_easy_setopt(curl, CURLOPT_MAXREDIRS, DEFAULT_MAXREDIRS);
+
curl_easy_setopt(curl, CURLOPT_CRLF, config->crlf);
curl_easy_setopt(curl, CURLOPT_QUOTE, config->quote);
curl_easy_setopt(curl, CURLOPT_POSTQUOTE, config->postquote);
curl_easy_setopt(curl, CURLOPT_TIMEVALUE, config->condtime);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, config->customrequest);
curl_easy_setopt(curl, CURLOPT_STDERR, config->errors);
-
+
/* three new ones in libcurl 7.3: */
curl_easy_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, config->proxytunnel);
curl_easy_setopt(curl, CURLOPT_INTERFACE, config->iface);
curl_easy_setopt(curl, CURLOPT_KRB4LEVEL, config->krb4level);
-
+
progressbarinit(&progressbar, config);
if((config->progressmode == CURL_PROGRESS_BAR) &&
!(config->conf&(CONF_NOPROGRESS|CONF_MUTE))) {
curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, myprogress);
curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &progressbar);
}
-
+
/* new in libcurl 7.6.2: */
curl_easy_setopt(curl, CURLOPT_TELNETOPTIONS, config->telnet_options);
/* new in libcurl 7.10.6 (default is Basic) */
if(config->authtype)
curl_easy_setopt(curl, CURLOPT_HTTPAUTH, config->authtype);
-
+
/* new in curl 7.9.7 */
if(config->trace_dump) {
curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, my_trace);
curl_easy_setopt(curl, CURLOPT_VERBOSE, config->conf&CONF_VERBOSE);
/* new in curl 7.10 */
- curl_easy_setopt(curl, CURLOPT_ENCODING,
+ curl_easy_setopt(curl, CURLOPT_ENCODING,
(config->encoding) ? "" : NULL);
/* new in curl 7.10.7 */
}
res = curl_easy_perform(curl);
-
+
if((config->progressmode == CURL_PROGRESS_BAR) &&
progressbar.calls) {
/* if the custom progress bar has been displayed, we output a
fclose(outs.stream);
#ifdef HAVE_UTIME
- /* Important that we set the time _after_ the file has been
+ /* Important that we set the time _after_ the file has been
closed, as is done above here */
if(config->remote_time && outs.filename) {
/* as libcurl if we got a time. Pretty please */
*/
if( strlen(url) > 78 )
url[79] = '\0';
-
+
SetComment( outs.filename, url);
#endif
if(headerfilep)
fclose(headerfilep);
-
+
if (httpgetfields)
free(httpgetfields);
if(urls)
/* cleanup memory used for URL globbing patterns */
glob_cleanup(urls);
-
+
if(uploadfile)
free(uploadfile);
-
+
} /* loop to the next globbed upload file */
if(inglob)
free(urlnode->outfile);
if(urlnode->infile)
free(urlnode->infile);
-
+
/* move on to the next URL */
nextnode=urlnode->next;
free(urlnode); /* free the node */
char *outdup;
char *dirbuildup;
int result=0;
-
+
outdup = strdup(outfile);
dirbuildup = malloc(sizeof(char) * strlen(outfile));
if(!dirbuildup)
illegal_aliens = illegal_chars_w95;
len -= (illegal_chars_w95 - illegal_chars_dos);
}
-
+
/* Get past the drive letter, if any. */
if (s[0] >= 'A' && s[0] <= 'z' && s[1] == ':') {
*d++ = *s++;
projects / platform / upstream / curl.git / commitdiff