github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-02-13 21:30:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn] Would abort when given invalid progress type.

Browse Source 
Published in <sxsg06kxc9g.fsf@florida.arsdigita.de>.
This commit is contained in:
hniksic 2001-12-09 14:25:34 -08:00
parent e521ee38ff
commit 233fcbc44d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-12-09 Hrvoje Niksic <hniksic@arsdigita.com>
* init.c (cmd_spec_progress): Resurrect. Check whether VAL is a
valid progress type before setting it.
2001-12-09 Hrvoje Niksic <hniksic@arsdigita.com> 2001-12-09 Hrvoje Niksic <hniksic@arsdigita.com>
* main.c (main): Remove stray debugging message. * main.c (main): Remove stray debugging message.

13
src/init.c
View File

@ -54,6 +54,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "recur.h" #include "recur.h"
#include "netrc.h" #include "netrc.h"
#include "cookies.h" /* for cookies_cleanup */ #include "cookies.h" /* for cookies_cleanup */
#include "progress.h"
#ifndef errno #ifndef errno
extern int errno; extern int errno;
@ -85,7 +86,7 @@ CMD_DECLARE (cmd_spec_dirstruct);
CMD_DECLARE (cmd_spec_header); CMD_DECLARE (cmd_spec_header);
CMD_DECLARE (cmd_spec_htmlify); CMD_DECLARE (cmd_spec_htmlify);
CMD_DECLARE (cmd_spec_mirror); CMD_DECLARE (cmd_spec_mirror);
/*CMD_DECLARE (cmd_spec_progress);*/ CMD_DECLARE (cmd_spec_progress);
CMD_DECLARE (cmd_spec_recursive); CMD_DECLARE (cmd_spec_recursive);
CMD_DECLARE (cmd_spec_useragent); CMD_DECLARE (cmd_spec_useragent);
@ -157,7 +158,7 @@ static struct {
{ "pagerequisites", &opt.page_requisites, cmd_boolean }, { "pagerequisites", &opt.page_requisites, cmd_boolean },
{ "passiveftp", &opt.ftp_pasv, cmd_lockable_boolean }, { "passiveftp", &opt.ftp_pasv, cmd_lockable_boolean },
{ "passwd", &opt.ftp_pass, cmd_string }, { "passwd", &opt.ftp_pass, cmd_string },
{ "progress", &opt.progress_type, cmd_string }, { "progress", &opt.progress_type, cmd_spec_progress },
{ "proxypasswd", &opt.proxy_passwd, cmd_string }, { "proxypasswd", &opt.proxy_passwd, cmd_string },
{ "proxyuser", &opt.proxy_user, cmd_string }, { "proxyuser", &opt.proxy_user, cmd_string },
{ "quiet", &opt.quiet, cmd_boolean }, { "quiet", &opt.quiet, cmd_boolean },
@ -940,7 +941,6 @@ cmd_spec_mirror (const char *com, const char *val, void *closure)
return 1; return 1;
} }
#if 0
static int static int
cmd_spec_progress (const char *com, const char *val, void *closure) cmd_spec_progress (const char *com, const char *val, void *closure)
{ {
@ -950,10 +950,13 @@ cmd_spec_progress (const char *com, const char *val, void *closure)
exec_name, com, val); exec_name, com, val);
return 0; return 0;
} }
set_progress_implementation (val); FREE_MAYBE (opt.progress_type);
/* Don't call set_progress_implementation here. It will be called
in main() when it becomes clear what the log output is. */
opt.progress_type = xstrdup (val);
return 1; return 1;
} }
#endif
static int static int
cmd_spec_recursive (const char *com, const char *val, void *closure) cmd_spec_recursive (const char *com, const char *val, void *closure)