Restoring authorship annotation for <[email protected]>. Commit 2 of 2.

1 files changed, 95 insertions, 95 deletions

diff --git a/contrib/libs/curl/lib/netrc.c b/contrib/libs/curl/lib/netrc.c
index 416b39fc63f..13610bb070e 100644
--- a/contrib/libs/curl/lib/netrc.c
+++ b/contrib/libs/curl/lib/netrc.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#ifndef CURL_DISABLE_NETRC 
+#ifndef CURL_DISABLE_NETRC
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
@@ -45,22 +45,22 @@ enum host_lookup_state {
   HOSTVALID     /* this is "our" machine! */
 };
 
-#define NETRC_FILE_MISSING 1 
-#define NETRC_FAILED -1 
-#define NETRC_SUCCESS 0 
- 
+#define NETRC_FILE_MISSING 1
+#define NETRC_FAILED -1
+#define NETRC_SUCCESS 0
+
 /*
- * Returns zero on success. 
+ * Returns zero on success.
  */
-static int parsenetrc(const char *host, 
-                      char **loginp, 
-                      char **passwordp, 
-                      bool *login_changed, 
-                      bool *password_changed, 
-                      char *netrcfile) 
+static int parsenetrc(const char *host,
+                      char **loginp,
+                      char **passwordp,
+                      bool *login_changed,
+                      bool *password_changed,
+                      char *netrcfile)
 {
   FILE *file;
-  int retcode = NETRC_FILE_MISSING; 
+  int retcode = NETRC_FILE_MISSING;
   char *login = *loginp;
   char *password = *passwordp;
   bool specific_login = (login && *login != 0);
@@ -73,7 +73,7 @@ static int parsenetrc(const char *host,
   int state_our_login = FALSE;  /* With specific_login, found *our* login
                                    name */
 
-  DEBUGASSERT(netrcfile); 
+  DEBUGASSERT(netrcfile);
 
   file = fopen(netrcfile, FOPEN_READTEXT);
   if(file) {
@@ -106,14 +106,14 @@ static int parsenetrc(const char *host,
           }
           else if(strcasecompare("default", tok)) {
             state = HOSTVALID;
-            retcode = NETRC_SUCCESS; /* we did find our host */ 
+            retcode = NETRC_SUCCESS; /* we did find our host */
           }
           break;
         case HOSTFOUND:
           if(strcasecompare(host, tok)) {
             /* and yes, this is our host! */
             state = HOSTVALID;
-            retcode = NETRC_SUCCESS; /* we did find our host */ 
+            retcode = NETRC_SUCCESS; /* we did find our host */
           }
           else
             /* not our host */
@@ -132,7 +132,7 @@ static int parsenetrc(const char *host,
               }
               login = strdup(tok);
               if(!login) {
-                retcode = NETRC_FAILED; /* allocation failed */ 
+                retcode = NETRC_FAILED; /* allocation failed */
                 goto out;
               }
               login_alloc = TRUE;
@@ -148,7 +148,7 @@ static int parsenetrc(const char *host,
               }
               password = strdup(tok);
               if(!password) {
-                retcode = NETRC_FAILED; /* allocation failed */ 
+                retcode = NETRC_FAILED; /* allocation failed */
                 goto out;
               }
               password_alloc = TRUE;
@@ -173,7 +173,7 @@ static int parsenetrc(const char *host,
 
     out:
     if(!retcode) {
-      /* success */ 
+      /* success */
       *login_changed = FALSE;
       *password_changed = FALSE;
       if(login_alloc) {
@@ -200,79 +200,79 @@ static int parsenetrc(const char *host,
 
   return retcode;
 }
- 
-/* 
- * @unittest: 1304 
- * 
- * *loginp and *passwordp MUST be allocated if they aren't NULL when passed 
- * in. 
- */ 
-int Curl_parsenetrc(const char *host, 
-                    char **loginp, 
-                    char **passwordp, 
-                    bool *login_changed, 
-                    bool *password_changed, 
-                    char *netrcfile) 
-{ 
-  int retcode = 1; 
-  char *filealloc = NULL; 
- 
-  if(!netrcfile) { 
-    char *home = NULL; 
-    char *homea = curl_getenv("HOME"); /* portable environment reader */ 
-    if(homea) { 
-      home = homea; 
-#if defined(HAVE_GETPWUID_R) && defined(HAVE_GETEUID) 
-    } 
-    else { 
-      struct passwd pw, *pw_res; 
-      char pwbuf[1024]; 
-      if(!getpwuid_r(geteuid(), &pw, pwbuf, sizeof(pwbuf), &pw_res) 
-         && pw_res) { 
-        home = pw.pw_dir; 
-      } 
-#elif defined(HAVE_GETPWUID) && defined(HAVE_GETEUID) 
-    } 
-    else { 
-      struct passwd *pw; 
-      pw = getpwuid(geteuid()); 
-      if(pw) { 
-        home = pw->pw_dir; 
-      } 
-#endif 
-    } 
- 
-    if(!home) 
-      return retcode; /* no home directory found (or possibly out of 
-                         memory) */ 
- 
-    filealloc = curl_maprintf("%s%s.netrc", home, DIR_CHAR); 
-    if(!filealloc) { 
-      free(homea); 
-      return -1; 
-    } 
-    retcode = parsenetrc(host, loginp, passwordp, login_changed, 
-                         password_changed, filealloc); 
-    free(filealloc); 
-#ifdef WIN32 
-    if(retcode == NETRC_FILE_MISSING) { 
-      /* fallback to the old-style "_netrc" file */ 
-      filealloc = curl_maprintf("%s%s_netrc", home, DIR_CHAR); 
-      if(!filealloc) { 
-        free(homea); 
-        return -1; 
-      } 
-      retcode = parsenetrc(host, loginp, passwordp, login_changed, 
-                           password_changed, filealloc); 
-      free(filealloc); 
-    } 
-#endif 
-    free(homea); 
-  } 
-  else 
-    retcode = parsenetrc(host, loginp, passwordp, login_changed, 
-                         password_changed, netrcfile); 
-  return retcode; 
-} 
- 
-#endif 
+
+/*
+ * @unittest: 1304
+ *
+ * *loginp and *passwordp MUST be allocated if they aren't NULL when passed
+ * in.
+ */
+int Curl_parsenetrc(const char *host,
+                    char **loginp,
+                    char **passwordp,
+                    bool *login_changed,
+                    bool *password_changed,
+                    char *netrcfile)
+{
+  int retcode = 1;
+  char *filealloc = NULL;
+
+  if(!netrcfile) {
+    char *home = NULL;
+    char *homea = curl_getenv("HOME"); /* portable environment reader */
+    if(homea) {
+      home = homea;
+#if defined(HAVE_GETPWUID_R) && defined(HAVE_GETEUID)
+    }
+    else {
+      struct passwd pw, *pw_res;
+      char pwbuf[1024];
+      if(!getpwuid_r(geteuid(), &pw, pwbuf, sizeof(pwbuf), &pw_res)
+         && pw_res) {
+        home = pw.pw_dir;
+      }
+#elif defined(HAVE_GETPWUID) && defined(HAVE_GETEUID)
+    }
+    else {
+      struct passwd *pw;
+      pw = getpwuid(geteuid());
+      if(pw) {
+        home = pw->pw_dir;
+      }
+#endif
+    }
+
+    if(!home)
+      return retcode; /* no home directory found (or possibly out of
+                         memory) */
+
+    filealloc = curl_maprintf("%s%s.netrc", home, DIR_CHAR);
+    if(!filealloc) {
+      free(homea);
+      return -1;
+    }
+    retcode = parsenetrc(host, loginp, passwordp, login_changed,
+                         password_changed, filealloc);
+    free(filealloc);
+#ifdef WIN32
+    if(retcode == NETRC_FILE_MISSING) {
+      /* fallback to the old-style "_netrc" file */
+      filealloc = curl_maprintf("%s%s_netrc", home, DIR_CHAR);
+      if(!filealloc) {
+        free(homea);
+        return -1;
+      }
+      retcode = parsenetrc(host, loginp, passwordp, login_changed,
+                           password_changed, filealloc);
+      free(filealloc);
+    }
+#endif
+    free(homea);
+  }
+  else
+    retcode = parsenetrc(host, loginp, passwordp, login_changed,
+                         password_changed, netrcfile);
+  return retcode;
+}
+
+#endif