From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 24 Nov 2003 11:41:26 +0000 (+0000)
Subject: windows build fix based on a patch by Gisle Vanem
X-Git-Tag: curl-7_11_0~216
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96d7a95ce4f0b5c61a5f56ad615f38c2774da422;p=thirdparty%2Fcurl.git

windows build fix based on a patch by Gisle Vanem
---

diff --git a/lib/netrc.c b/lib/netrc.c
index c6443608ef..5c7a8792ae 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -92,6 +92,8 @@ int Curl_parsenetrc(char *host,
   char state_password=0;   /* Found a password keyword */
   char state_our_login=0;  /* With specific_login, found *our* login name */
 
+#define NETRC DOT_CHAR "netrc"
+
 #ifdef CURLDEBUG
   {
     /* This is a hack to allow testing.
@@ -101,14 +103,13 @@ int Curl_parsenetrc(char *host,
     char *override = curl_getenv("CURL_DEBUG_NETRC");
 
     if (override) {
-      printf("NETRC: overridden .netrc file: %s\n", home);
+      printf("NETRC: overridden " NETRC " file: %s\n", home);
       netrcfile = override;
       netrc_alloc = TRUE;
     }
   }
 #endif /* CURLDEBUG */
   if(!netrcfile) {
-#define NETRC DOT_CHAR "netrc"
 #if defined(HAVE_GETPWUID) && defined(HAVE_GETEUID)
     struct passwd *pw;
     pw= getpwuid(geteuid());
@@ -121,7 +122,7 @@ int Curl_parsenetrc(char *host,
     }
 #endif
   
-    if(NULL == pw) {
+    if(!home) {
       home = curl_getenv("HOME"); /* portable environment reader */
       if(!home)
         return -1;