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 b3d30fd4af5466ef3732099b87061fb5f3d01019..e61a82f8c2b01a41b8e2210e9000f1a55dcf1202 100644 (file)
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -50,14 +50,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;


@@ -86,6 +82,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);