Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index c5f9630c4b7c2ca7e4e1fd7a184f77bb191ab923..1e3778f4540821f248a326a8f70792764bbfb499 100644 (file)
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -15,13 +15,13 @@
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>

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

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

+#include <stddef.h>

 #include <pwd.h>
 
 #include "netrc.h"
 #include <pwd.h>
 
 #include "netrc.h"


@@ -39,8 +39,8 @@ 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 */


@@ -49,14 +49,10 @@ static int parsenetrc_string (char *host, std::string &login, std::string &passw
   FILE *file;
   int retcode = 1;
   int specific_login = (login.empty() == false);
   FILE *file;
   int retcode = 1;
   int specific_login = (login.empty() == false);

-  char *home = NULL;

   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;


@@ -85,6 +81,8 @@ static int parsenetrc_string (char *host, std::string &login, std::string &passw
     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 && getline(&netrcbuffer, &netrcbuffer_size, file) != -1) {
       tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
 
     while (!done && getline(&netrcbuffer, &netrcbuffer_size, file) != -1) {
       tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);


@@ -154,18 +152,6 @@ static int parsenetrc_string (char *host, std::string &login, std::string &passw
 
   return retcode;
 }
 
   return retcode;
 }

-// for some unknown reason this method is exported so keep a compatible interface for now …
-int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
-{
-   std::string login_string, password_string;
-   int const ret = parsenetrc_string(host, login_string, password_string, netrcfile);
-   if (ret < 0)
-      return ret;
-   strncpy(login, login_string.c_str(), LOGINSIZE - 1);
-   strncpy(password, password_string.c_str(), PASSWORDSIZE - 1);
-   return ret;
-}
-

 
 void maybe_add_auth (URI &Uri, string NetRCFile)
 {
 
 void maybe_add_auth (URI &Uri, string NetRCFile)
 {


@@ -199,7 +185,7 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
       // if host did not work, try Host+Path next, this will trigger
       // a lookup uri.startswith(host) in the netrc file parser (because
       // of the "/"
       // if host did not work, try Host+Path next, this will trigger
       // a lookup uri.startswith(host) in the netrc file parser (because
       // of the "/"

-      char *hostpath = strdup(string(Uri.Host+Uri.Path).c_str());
+      char *hostpath = strdup((Uri.Host + Uri.Path).c_str());

       if (hostpath && parsenetrc_string(hostpath, login, password, netrcfile) == 0)
       {
         if (_config->FindB("Debug::Acquire::netrc", false) == true)
       if (hostpath && parsenetrc_string(hostpath, login, password, netrcfile) == 0)
       {
         if (_config->FindB("Debug::Acquire::netrc", false) == true)