merged debian-sid branch and resolved conflicts

[apt.git] / apt-pkg / contrib / netrc.cc

diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 9ff5796c53dde219d961e5884a1f3eb57bc2ac51..e61a82f8c2b01a41b8e2210e9000f1a55dcf1202 100644 (file)
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -11,9 +11,13 @@
 
    ##################################################################### */
                                                                        /*}}}*/
 
    ##################################################################### */
                                                                        /*}}}*/

+#include <config.h>

 
 #include <apt-pkg/configuration.h>
 
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

+

 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>


@@ -23,6 +27,7 @@
 
 #include "netrc.h"
 
 
 #include "netrc.h"
 

+using std::string;

 
 /* Get user and password from .netrc when given a machine name */
 
 
 /* Get user and password from .netrc when given a machine name */
 


@@ -35,24 +40,20 @@ enum {
 };
 
 /* make sure we have room for at least this size: */
 };
 
 /* make sure we have room for at least this size: */

-#define LOGINSIZE 64
-#define PASSWORDSIZE 64
+#define LOGINSIZE 256
+#define PASSWORDSIZE 256

 #define NETRC DOT_CHAR "netrc"
 
 /* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
 #define NETRC DOT_CHAR "netrc"
 
 /* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */

-int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
+static int parsenetrc_string (char *host, std::string &login, std::string &password, char *netrcfile = NULL)

 {
   FILE *file;
   int retcode = 1;
 {
   FILE *file;
   int retcode = 1;

-  int specific_login = (login[0] != 0);
-  char *home = NULL;
+  int specific_login = (login.empty() == false);

   bool netrc_alloc = false;
 
   bool netrc_alloc = false;
 

-  int state_our_login = false;  /* With specific_login,
-                                   found *our* login name */
-

   if (!netrcfile) {
   if (!netrcfile) {

-    home = getenv ("HOME"); /* portable environment reader */
+    char const * home = getenv ("HOME"); /* portable environment reader */

 
     if (!home) {
       struct passwd *pw;
 
     if (!home) {
       struct passwd *pw;


@@ -64,8 +65,7 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
     if (!home)
       return -1;
 
     if (!home)
       return -1;
 

-    asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC);
-    if(!netrcfile)
+    if (asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC) == -1 || netrcfile == NULL)

       return -1;
     else
       netrc_alloc = true;
       return -1;
     else
       netrc_alloc = true;


@@ -76,16 +76,19 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
     char *tok;
     char *tok_buf;
     bool done = false;
     char *tok;
     char *tok_buf;
     bool done = false;

-    char netrcbuffer[256];
+    char *netrcbuffer = NULL;
+    size_t netrcbuffer_size = 0;

 
     int state = NOTHING;
     char state_login = 0;        /* Found a login keyword */
     char state_password = 0;     /* Found a password keyword */
 
     int state = NOTHING;
     char state_login = 0;        /* Found a login keyword */
     char state_password = 0;     /* Found a password keyword */

+    int state_our_login = false;  /* With specific_login,
+                                    found *our* login name */

 
 

-    while (!done && fgets(netrcbuffer, sizeof (netrcbuffer), file)) {
+    while (!done && getline(&netrcbuffer, &netrcbuffer_size, file) != -1) {

       tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
       while (!done && tok) {
       tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
       while (!done && tok) {

-        if(login[0] && password[0]) {
+        if(login.empty() == false && password.empty() == false) {

           done = true;
           break;
         }
           done = true;
           break;
         }


@@ -117,13 +120,13 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
           /* we are now parsing sub-keywords concerning "our" host */
           if (state_login) {
             if (specific_login)
           /* we are now parsing sub-keywords concerning "our" host */
           if (state_login) {
             if (specific_login)

-              state_our_login = !strcasecmp (login, tok);
+              state_our_login = !strcasecmp (login.c_str(), tok);

             else
             else

-              strncpy (login, tok, LOGINSIZE - 1);
+              login = tok;

             state_login = 0;
           } else if (state_password) {
             if (state_our_login || !specific_login)
             state_login = 0;
           } else if (state_password) {
             if (state_our_login || !specific_login)

-              strncpy (password, tok, PASSWORDSIZE - 1);
+              password = tok;

             state_password = 0;
           } else if (!strcasecmp ("login", tok))
             state_login = 1;
             state_password = 0;
           } else if (!strcasecmp ("login", tok))
             state_login = 1;


@@ -139,8 +142,9 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
 
         tok = strtok_r (NULL, " \t\n", &tok_buf);
       } /* while(tok) */
 
         tok = strtok_r (NULL, " \t\n", &tok_buf);
       } /* while(tok) */

-    } /* while fgets() */
+    } /* while getline() */

 
 

+    free(netrcbuffer);

     fclose(file);
   }
 
     fclose(file);
   }
 


@@ -159,21 +163,20 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
   {
     if (NetRCFile.empty () == false)
     {
   {
     if (NetRCFile.empty () == false)
     {

-      char login[64] = "";
-      char password[64] = "";
+       std::string login, password;

       char *netrcfile = strdup(NetRCFile.c_str());
 
       // first check for a generic host based netrc entry
       char *host = strdup(Uri.Host.c_str());
       char *netrcfile = strdup(NetRCFile.c_str());
 
       // first check for a generic host based netrc entry
       char *host = strdup(Uri.Host.c_str());

-      if (host && parsenetrc (host, login, password, netrcfile) == 0)
+      if (host && parsenetrc_string(host, login, password, netrcfile) == 0)

       {
         if (_config->FindB("Debug::Acquire::netrc", false) == true)
            std::clog << "host: " << host 
                      << " user: " << login
       {
         if (_config->FindB("Debug::Acquire::netrc", false) == true)
            std::clog << "host: " << host 
                      << " user: " << login

-                     << " pass-size: " << strlen(password)
+                     << " pass-size: " << password.size()

                      << std::endl;
                      << std::endl;

-        Uri.User = string (login);
-        Uri.Password = string (password);
+        Uri.User = login;
+        Uri.Password = password;

        free(netrcfile);
        free(host);
        return;
        free(netrcfile);
        free(host);
        return;


@@ -184,15 +187,15 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
       // a lookup uri.startswith(host) in the netrc file parser (because
       // of the "/"
       char *hostpath = strdup(string(Uri.Host+Uri.Path).c_str());
       // a lookup uri.startswith(host) in the netrc file parser (because
       // of the "/"
       char *hostpath = strdup(string(Uri.Host+Uri.Path).c_str());

-      if (hostpath && parsenetrc (hostpath, login, password, netrcfile) == 0)
+      if (hostpath && parsenetrc_string(hostpath, login, password, netrcfile) == 0)

       {
         if (_config->FindB("Debug::Acquire::netrc", false) == true)
            std::clog << "hostpath: " << hostpath
                      << " user: " << login
       {
         if (_config->FindB("Debug::Acquire::netrc", false) == true)
            std::clog << "hostpath: " << hostpath
                      << " user: " << login

-                     << " pass-size: " << strlen(password)
+                     << " pass-size: " << password.size()

                      << std::endl;
                      << std::endl;

-        Uri.User = string (login);
-        Uri.Password = string (password);
+        Uri.User = login;
+        Uri.Password = password;

       }
       free(netrcfile);
       free(hostpath);
       }
       free(netrcfile);
       free(hostpath);