/* Reading/parsing the initialization file.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+ Inc.
This file is part of GNU Wget.
#include <stdio.h>
#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <stdbool.h>
+#include <unistd.h>
#include <string.h>
#include <errno.h>
+#include <limits.h>
+/* not all systems provide PATH_MAX in limits.h */
+#ifndef PATH_MAX
+# include <sys/param.h>
+# ifndef PATH_MAX
+# define PATH_MAX MAXPATHLEN
+# endif
+#endif
+
#ifdef HAVE_PWD_H
# include <pwd.h>
{ "certificatetype", &opt.cert_type, cmd_cert_type },
{ "checkcertificate", &opt.check_cert, cmd_boolean },
#endif
+ { "chooseconfig", &opt.choose_config, cmd_file },
{ "connecttimeout", &opt.connect_timeout, cmd_time },
{ "contentdisposition", &opt.content_disposition, cmd_boolean },
{ "continue", &opt.always_rest, cmd_boolean },
{ "timeout", NULL, cmd_spec_timeout },
{ "timestamping", &opt.timestamping, cmd_boolean },
{ "tries", &opt.ntry, cmd_number_inf },
+ { "trustservernames", &opt.trustservernames, cmd_boolean },
+ { "unlink", &opt.unlink, cmd_boolean },
{ "useproxy", &opt.use_proxy, cmd_boolean },
{ "user", &opt.user, cmd_string },
{ "useragent", NULL, cmd_spec_useragent },
+ { "useservertimestamps", &opt.useservertimestamps, cmd_boolean },
{ "verbose", NULL, cmd_spec_verbose },
{ "wait", &opt.wait, cmd_time },
{ "waitretry", &opt.waitretry, cmd_time },
}
\f
/* Reset the variables to default values. */
-static void
+void
defaults (void)
{
char *tmp;
#endif
opt.locale = NULL;
opt.encoding_remote = NULL;
+
+ opt.useservertimestamps = true;
}
\f
/* Return the user's home directory (strdup-ed), or NULL if none is
return home ? xstrdup (home) : NULL;
}
-/* Check the 'WGETRC' environment variable and return the file name
- if 'WGETRC' is set and is a valid file.
+/* Check the 'WGETRC' environment variable and return the file name
+ if 'WGETRC' is set and is a valid file.
If the `WGETRC' variable exists but the file does not exist, the
function will exit(). */
char *
-wgetrc_env_file_name (void)
+wgetrc_env_file_name (void)
{
char *env = getenv ("WGETRC");
if (env && *env)
/* Check for the existance of '$HOME/.wgetrc' and return it's path
if it exists and is set. */
char *
-wgetrc_user_file_name (void)
+wgetrc_user_file_name (void)
{
- char *home = home_dir ();
+ char *home;
char *file = NULL;
/* If that failed, try $HOME/.wgetrc (or equivalent). */
/* Return the path to the user's .wgetrc. This is either the value of
`WGETRC' environment variable, or `$HOME/.wgetrc'.
- Additionally, for windows, look in the directory where wget.exe
+ Additionally, for windows, look in the directory where wget.exe
resides. */
char *
wgetrc_file_name (void)
char *file = wgetrc_env_file_name ();
if (file && *file)
return file;
-
+
file = wgetrc_user_file_name ();
#ifdef WINDOWS
/* Initialize variables from a wgetrc file. Returns zero (failure) if
there were errors in the file. */
-static bool
+bool
run_wgetrc (const char *file)
{
FILE *fp;
initialize (void)
{
char *file, *env_sysrc;
- int ok = true;
+ bool ok = true;
- /* Load the hard-coded defaults. */
- defaults ();
-
- /* Run a non-standard system rc file when the according environment
+ /* Run a non-standard system rc file when the according environment
variable has been set. For internal testing purposes only! */
env_sysrc = getenv ("SYSTEM_WGETRC");
if (env_sysrc && file_exists_p (env_sysrc))
else if (file_exists_p (SYSTEM_WGETRC))
ok &= run_wgetrc (SYSTEM_WGETRC);
#endif
+ /* If there are any problems parsing the system wgetrc file, tell
+ the user and exit */
+ if (! ok)
+ {
+ fprintf (stderr, _("\
+Parsing system wgetrc file failed, please check '%s'. \
+Or specify a different file using --config\n"), SYSTEM_WGETRC);
+ exit (2);
+ }
/* Override it with your own, if one exists. */
file = wgetrc_file_name ();
if (!file)
return false;
}
- if (*end)
+ if (*end)
val = end + 1;
}
while (*val && *end);
opt.restrict_files_ctrl = restrict_ctrl;
opt.restrict_files_case = restrict_case;
opt.restrict_files_nonascii = restrict_nonascii;
-
+
return true;
}
extern acc_t *netrc_list;
free_netrc (netrc_list);
}
+ xfree_null (opt.choose_config);
xfree_null (opt.lfilename);
xfree_null (opt.dir_prefix);
xfree_null (opt.input_filename);
xfree_null (opt.user);
xfree_null (opt.passwd);
xfree_null (opt.base_href);
-
+
#endif /* DEBUG_MALLOC */
}
\f
{
mu_assert ("FAILED", false);
break;
- }
+ }
else
- {
+ {
prev_idx ++;
next_idx ++;
}
{ "windows,lowercase", restrict_windows, true, restrict_lowercase, true },
{ "unix,nocontrol,lowercase,", restrict_unix, false, restrict_lowercase, true },
};
-
- for (i = 0; i < sizeof(test_array)/sizeof(test_array[0]); ++i)
+
+ for (i = 0; i < sizeof(test_array)/sizeof(test_array[0]); ++i)
{
bool res;
-
+
defaults();
res = cmd_spec_restrict_file_names ("dummy", test_array[i].val, NULL);
fprintf (stderr, "opt.restrict_files_ctrl: %d\n", opt.restrict_files_ctrl); fflush (stderr);
fprintf (stderr, "opt.restrict_files_case: %d\n", opt.restrict_files_case); fflush (stderr);
*/
- mu_assert ("test_cmd_spec_restrict_file_names: wrong result",
+ mu_assert ("test_cmd_spec_restrict_file_names: wrong result",
res == test_array[i].result
- && opt.restrict_files_os == test_array[i].expected_restrict_files_os
- && opt.restrict_files_ctrl == test_array[i].expected_restrict_files_ctrl
+ && opt.restrict_files_os == test_array[i].expected_restrict_files_os
+ && opt.restrict_files_ctrl == test_array[i].expected_restrict_files_ctrl
&& opt.restrict_files_case == test_array[i].expected_restrict_files_case);
}
projects / wget / blobdiff