nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sequence of log messages when starting on win32 with no config file more reasonable.

Browse Source 
svn:r3275
This commit is contained in:
Nick Mathewson 2005-01-04 02:25:36 +00:00
parent 1f3e77bf92
commit 4d30e2f4b8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/config.c
View File

@ -1669,6 +1669,7 @@ init_from_config(int argc, char **argv)
fname = fn;
} else {
tor_free(fn);
#ifndef MS_WINDOWS
fn = expand_filename("~/.torrc");
if (fn && file_status(fn) == FN_FILE) {
fname = fn;
@ -1676,13 +1677,16 @@ init_from_config(int argc, char **argv)
tor_free(fn);
fname = get_default_conf_file();
}
#else
fname = get_default_conf_file();
#endif
}
}
tor_assert(fname);
log(LOG_DEBUG, "Opening config file '%s'", fname);
cf = read_file_to_str(fname, 0);
if (!cf) {
if (file_status(fname) != FN_FILE ||
!(cf = read_file_to_str(fname,0))) {
if (using_default_torrc == 1) {
log(LOG_NOTICE, "Configuration file '%s' not present, "
"using reasonable defaults.", fname);