diff options
Diffstat (limited to 'lib/getenv.c')
| -rw-r--r-- | lib/getenv.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/lib/getenv.c b/lib/getenv.c index 4f955f8..36215aa 100644 --- a/lib/getenv.c +++ b/lib/getenv.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,21 +18,12 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ -#include "setup.h" - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#ifdef VMS -#include <unixlib.h> -#endif +#include "curl_setup.h" #include <curl/curl.h> -#include "memory.h" +#include "curl_memory.h" #include "memdebug.h" @@ -46,21 +37,14 @@ char *GetEnv(const char *variable) char env[MAX_PATH]; /* MAX_PATH is from windef.h */ char *temp = getenv(variable); env[0] = '\0'; - if (temp != NULL) - ExpandEnvironmentStrings(temp, env, sizeof(env)); -#else -#ifdef VMS - char *env = getenv(variable); - if (env && strcmp("HOME",variable) == 0) { - env = decc$translate_vms(env); - } + if(temp != NULL) + ExpandEnvironmentStringsA(temp, env, sizeof(env)); + return (env[0] != '\0')?strdup(env):NULL; #else - /* no length control */ char *env = getenv(variable); -#endif -#endif return (env && env[0])?strdup(env):NULL; #endif +#endif } char *curl_getenv(const char *v) |