curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-13 07:32:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added the --environment support by Michael Curtis

Browse Source
This commit is contained in:
Daniel Stenberg 2002-04-08 22:48:25 +00:00
parent c1a57591ee
commit 540e5ffa90
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.c
View File

@ -39,6 +39,9 @@
#include "urlglob.h" #include "urlglob.h"
#include "writeout.h" #include "writeout.h"
#ifdef USE_ENVIRONMENT
#include "writeenv.h"
#endif
#define CURLseparator "--_curl_--" #define CURLseparator "--_curl_--"
@ -328,6 +331,9 @@ static void help(void)
" --disable-epsv Prevents curl from using EPSV (F)\n" " --disable-epsv Prevents curl from using EPSV (F)\n"
" -D/--dump-header <file> Write the headers to this file\n" " -D/--dump-header <file> Write the headers to this file\n"
" --egd-file <file> EGD socket path for random data (SSL)\n" " --egd-file <file> EGD socket path for random data (SSL)\n"
#ifdef USE_ENVIRONMENT
" --environment Write result codes to environment variables (RISC OS)\n"
#endif
" -e/--referer Referer page (H)"); " -e/--referer Referer page (H)");
puts(" -E/--cert <cert[:passwd]> Specifies your certificate file and password (HTTPS)\n" puts(" -E/--cert <cert[:passwd]> Specifies your certificate file and password (HTTPS)\n"
" --cert-type <type> Specifies your certificate file type (DER/PEM/ENG) (HTTPS)\n" " --cert-type <type> Specifies your certificate file type (DER/PEM/ENG) (HTTPS)\n"
@ -453,6 +459,7 @@ struct Configurable {
bool use_httpget; bool use_httpget;
char *writeout; /* %-styled format string to output */ char *writeout; /* %-styled format string to output */
bool writeenv; /* write results to environment, if available */
FILE *errors; /* if stderr redirect is requested */ FILE *errors; /* if stderr redirect is requested */
bool errors_fopened; bool errors_fopened;
@ -475,7 +482,7 @@ struct Configurable {
HttpReq httpreq; HttpReq httpreq;
}; };
static int parseconfig(char *filename, static int parseconfig(const char *filename,
struct Configurable *config); struct Configurable *config);
static char *my_get_line(FILE *fp); static char *my_get_line(FILE *fp);
@ -942,13 +949,17 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
{"8", "stderr", TRUE}, {"8", "stderr", TRUE},
{"7", "interface", TRUE}, {"7", "interface", TRUE},
{"6", "krb4", TRUE}, {"6", "krb4", TRUE},
/* all these ones, starting with 5 as a short-option have *no* short
option to mention. */
{"5", "url", TRUE}, {"5", "url", TRUE},
{"5a", "random-file", TRUE}, {"5a", "random-file", TRUE},
{"5b", "egd-file", TRUE}, {"5b", "egd-file", TRUE},
{"5c", "connect-timeout", TRUE}, {"5c", "connect-timeout", TRUE},
{"5d", "ciphers", TRUE}, {"5d", "ciphers", TRUE},
{"5e", "disable-epsv", FALSE}, {"5e", "disable-epsv", FALSE},
#ifdef USE_ENVIRONMENT
{"5f", "environment", FALSE},
#endif
{"0", "http1.0", FALSE}, {"0", "http1.0", FALSE},
{"1", "tlsv1", FALSE}, {"1", "tlsv1", FALSE},
{"2", "sslv2", FALSE}, {"2", "sslv2", FALSE},
@ -1124,6 +1135,11 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
case 'e': /* --disable-epsv */ case 'e': /* --disable-epsv */
config->disable_epsv ^= TRUE; config->disable_epsv ^= TRUE;
break; break;
#ifdef USE_ENVIRONMENT
case 'f':
config->writeenv ^= TRUE;
break;
#endif
default: /* the URL! */ default: /* the URL! */
{ {
struct getout *url; struct getout *url;
@ -1599,7 +1615,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
} }
static int parseconfig(char *filename, static int parseconfig(const char *filename,
struct Configurable *config) struct Configurable *config)
{ {
int res; int res;
@ -2482,6 +2498,10 @@ operate(struct Configurable *config, int argc, char *argv[])
if(config->writeout) { if(config->writeout) {
ourWriteOut(curl, config->writeout); ourWriteOut(curl, config->writeout);
} }
#ifdef USE_ENVIRONMENT
if (config->writeenv)
ourWriteEnv(curl);
#endif
#ifdef VMS #ifdef VMS
if (!config->showerror) { if (!config->showerror) {