nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make windows fall back to CWD if SHGetSpecialFolderLocation is borked

Browse Source 
svn:r2578
This commit is contained in:
Nick Mathewson 2004-10-24 00:52:10 +00:00
parent 54c432bd93
commit 78a2c3aa39
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/config.c
View File

@ -538,7 +538,10 @@ static char *get_windows_conf_root(void)
*/
if (!SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_APPDATA,
&idl))) {
return NULL;
GetCurrentDirectory(MAX_PATH, path);
is_set = 1;
log_fn(LOG_WARN, "I couldn't find your application data folder: are you running an ancient version of Windows 95? Defaulting to '%s'", path);
return path;
}
/* Convert the path from an "ID List" (whatever that is!) to a path. */
result = SHGetPathFromIDList(idl, path);
@ -551,6 +554,7 @@ static char *get_windows_conf_root(void)
if (!SUCCEEDED(result)) {
return NULL;
}
strlcat(p,"\\tor",MAX_PATH);
is_set = 1;
return path;
}
@ -562,7 +566,7 @@ get_default_conf_file(void)
#ifdef MS_WINDOWS
char *path = tor_malloc(MAX_PATH);
strlcpy(path, get_windows_conf_root(), MAX_PATH);
strlcat(path,"\\tor\\torrc",MAX_PATH);
strlcat(path,"\\torrc",MAX_PATH);
return path;
#else
return tor_strdup(CONFDIR "/torrc");
@ -1199,7 +1203,6 @@ get_data_directory(or_options_t *options)
char *p;
p = tor_malloc(MAX_PATH);
strlcpy(p,get_windows_conf_root(),MAX_PATH);
strlcat(p,"\\tor",MAX_PATH);
options->DataDirectory = p;
return p;
#else