romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 20:03:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_homedir: Change GetEnv() to use libcurl's curl_getenv()

Browse source 
- Deduplicate GetEnv() code.

- On Windows change ultimate call to use Windows API
  GetEnvironmentVariable() instead of C runtime getenv().

Prior to this change both libcurl and the tool had their own GetEnv
which over time diverged. Now the tool's GetEnv is a wrapper around
curl_getenv (libcurl API function which is itself a wrapper around
libcurl's GetEnv).

Furthermore this change fixes a bug in that Windows API
GetEnvironmentVariable() is called instead of C runtime getenv() to get
the environment variable since some changes aren't always visible to the
latter.

Reported-by: Christoph M. Becker

Fixes https://github.com/curl/curl/issues/4774
Closes https://github.com/curl/curl/pull/4863
This commit is contained in:
Jay Satiro 2020-01-29 03:23:55 -05:00
parent 39d5621cbd
commit 9dc350b60c
2 changed files with 58 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/tool_homedir.c
View file

@ -25,38 +25,23 @@
# include <pwd.h>
#endif
#include <curl/mprintf.h>
#include "tool_homedir.h"
#include "memdebug.h" /* keep this as LAST include */
static char *GetEnv(const char *variable, char do_expand)
static char *GetEnv(const char *variable)
{
char *env = NULL;
#ifdef WIN32
char buf1[1024], buf2[1024];
DWORD rc;
char *dupe, *env;
/* Don't use getenv(); it doesn't find variable added after program was
* started. Don't accept truncated results (i.e. rc >= sizeof(buf1)). */
env = curl_getenv(variable);
if(!env)
return NULL;
rc = GetEnvironmentVariableA(variable, buf1, sizeof(buf1));
if(rc > 0 && rc < sizeof(buf1)) {
env = buf1;
variable = buf1;
}
if(do_expand && strchr(variable, '%')) {
/* buf2 == variable if not expanded */
rc = ExpandEnvironmentStringsA(variable, buf2, sizeof(buf2));
if(rc > 0 && rc < sizeof(buf2) &&
!strchr(buf2, '%')) /* no vars still unexpanded */
env = buf2;
}
#else
(void)do_expand;
/* no length control */
env = getenv(variable);
#endif
return (env && env[0]) ? strdup(env) : NULL;
dupe = strdup(env);
curl_free(env);
return dupe;
}
/* return the home directory of the current user as an allocated string */
@ -64,11 +49,11 @@ char *homedir(void)
{
char *home;
home = GetEnv("CURL_HOME", FALSE);
home = GetEnv("CURL_HOME");
if(home)
return home;
home = GetEnv("HOME", FALSE);
home = GetEnv("HOME");
if(home)
return home;
@ -86,10 +71,18 @@ char *homedir(void)
}
#endif /* PWD-stuff */
#ifdef WIN32
home = GetEnv("APPDATA", TRUE);
if(!home)
home = GetEnv("%USERPROFILE%\\Application Data", TRUE); /* Normally only
on Win-2K/XP */
home = GetEnv("APPDATA");
if(!home) {
char *env = GetEnv("USERPROFILE");
if(env) {
char *path = curl_maprintf("%s\\Application Data", env);
if(path) {
home = strdup(path);
curl_free(path);
}
free(env);
}
}
#endif /* WIN32 */
return home;
}