generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make -K on a bad file now displays a warning

Browse Source
This commit is contained in:
Daniel Stenberg 2006-06-19 21:39:57 +00:00
parent 3008d8133c
commit 72f80b88f7
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@ -6,6 +6,15 @@
Changelog Changelog
Daniel (19 June 2006)
- Made -K on a file that couldn't be read cause a warning to be displayed.
Daniel (13 June 2006)
- Dan Fandrich implemented --enable-hidden-symbols configure option to enable
-fvisibility=hidden on gcc >= 4.0. This reduces the size of the libcurl
binary and speeds up dynamic linking by hiding all the internal symbols from
the symbol table.
Version 7.15.4 (12 June 2006) Version 7.15.4 (12 June 2006)
Daniel (8 June 2006) Daniel (8 June 2006)

10
RELEASE-NOTES
View File

@ -7,19 +7,19 @@ Curl and libcurl 7.15.5
Number of public functions in libcurl: 49 Number of public functions in libcurl: 49
Amount of public web site mirrors: 33 Amount of public web site mirrors: 33
Number of known libcurl bindings: 32 Number of known libcurl bindings: 32
Number of contributors: 492 Number of contributors: 506
This release includes the following changes: This release includes the following changes:
o o configure --enable-hidden-symbols
This release includes the following bugfixes: This release includes the following bugfixes:
o o Made -K on a file that couldn't be read cause a warning to be displayed.
Other curl-related news: Other curl-related news:
o o pycurl-7.15.4 was released: http://pycurl.sf.net
New curl mirrors: New curl mirrors:
@ -28,6 +28,6 @@ New curl mirrors:
This release would not have looked like this without help, code, reports and This release would not have looked like this without help, code, reports and
advice from friends like these: advice from friends like these:
Dan Fandrich
Thanks! (and sorry if I forgot to mention someone) Thanks! (and sorry if I forgot to mention someone)

19
src/main.c
View File

@ -633,8 +633,8 @@ struct LongShort {
/* global variable to hold info about libcurl */ /* global variable to hold info about libcurl */
static curl_version_info_data *curlinfo; static curl_version_info_data *curlinfo;
static void parseconfig(const 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);
static int create_dir_hierarchy(char *outfile); static int create_dir_hierarchy(char *outfile);
@ -2069,7 +2069,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
config->insecure_ok ^= TRUE; config->insecure_ok ^= TRUE;
break; break;
case 'K': /* parse config file */ case 'K': /* parse config file */
parseconfig(nextarg, config); if(parseconfig(nextarg, config))
warnf(config, "error trying read config from the '%s' file\n",
nextarg);
break; break;
case 'l': case 'l':
config->conf ^= CONF_FTPLISTONLY; /* only list the names of the FTP dir */ config->conf ^= CONF_FTPLISTONLY; /* only list the names of the FTP dir */
@ -2402,9 +2404,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
return PARAM_OK; return PARAM_OK;
} }
/* return 0 on everything-is-fine, and non-zero otherwise */
static void parseconfig(const char *filename, static int parseconfig(const char *filename,
struct Configurable *config) struct Configurable *config)
{ {
int res; int res;
FILE *file; FILE *file;
@ -2613,6 +2615,9 @@ static void parseconfig(const char *filename,
if(file != stdin) if(file != stdin)
fclose(file); fclose(file);
} }
else
return 1; /* couldn't open the file */
return 0;
} }
static void go_sleep(long ms) static void go_sleep(long ms)
@ -3392,7 +3397,7 @@ operate(struct Configurable *config, int argc, char *argv[])
; ;
} }
else { else {
parseconfig(NULL, config); parseconfig(NULL, config); /* ignore possible failure */
} }
if ((argc < 2) && !config->url_list) { if ((argc < 2) && !config->url_list) {