* apt-inst/deb/debfile.h:

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

diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 34f472ee1b619c1bc85e860c1d1148126c492f45..56e59d84b89b64635158e6a74db0156260c753a2 100644 (file)
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -11,9 +11,12 @@
 
    ##################################################################### */
                                                                        /*}}}*/
 
    ##################################################################### */
                                                                        /*}}}*/

+#include <config.h>

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

+#include <apt-pkg/strutl.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 +26,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 */
 


@@ -47,10 +51,7 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
   int specific_login = (login[0] != 0);
   char *home = NULL;
   bool netrc_alloc = false;
   int specific_login = (login[0] != 0);
   char *home = NULL;
   bool netrc_alloc = false;

-  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 */
 
   int state_our_login = false;  /* With specific_login,
                                    found *our* login name */
 


@@ -67,8 +68,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;


@@ -81,6 +81,10 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
     bool done = false;
     char netrcbuffer[256];
 
     bool done = false;
     char netrcbuffer[256];
 

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

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