Merged across diffs between setup_crypto_branch_branchpoint and

[cygwin-apps/setup.git] / netio.cc

diff --git a/netio.cc b/netio.cc
index 0fe6ddf4b8a770bd018e2c2e81f020df70c7ef21..e78724185445bfc0a784a32d801019717d2e4ab4 100644 (file)
--- a/netio.cc
+++ b/netio.cc
@@ -22,7 +22,10 @@ static const char *cvsid =
   "\n%%% $Id$\n";
 #endif
 
-#include "win32.h"
+#include "netio.h"
+
+#include "LogSingleton.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,20 +33,26 @@ static const char *cvsid =
 #include "resource.h"
 #include "state.h"
 #include "msg.h"
-#include "netio.h"
 #include "nio-file.h"
 #include "nio-ie5.h"
 #include "nio-http.h"
 #include "nio-ftp.h"
 #include "dialog.h"
-#include "log.h"
 
-#include "port.h"
+int NetIO::net_method;
+char *NetIO::net_proxy_host;
+int NetIO::net_proxy_port;
+
+char *NetIO::net_user;
+char *NetIO::net_passwd;
+char *NetIO::net_proxy_user;
+char *NetIO::net_proxy_passwd;
+char *NetIO::net_ftp_user;
+char *NetIO::net_ftp_passwd;
 
-NetIO::NetIO (char const *Purl, BOOL allow_ftp_auth)
+NetIO::NetIO (char const *Purl)
 {
   set_url (Purl);
-  ftp_auth = allow_ftp_auth;
 }
 
 NetIO::~NetIO ()
@@ -75,7 +84,7 @@ NetIO::set_url (char const *Purl)
   ep = strstr (bp, "://");
   if (!ep)
     {
-      path = url;
+      path = strdup (url);
       return;
     }
 
@@ -118,7 +127,7 @@ NetIO::read (char *buf, int nbytes)
 }
 
 NetIO *
-NetIO::open (char const *url, BOOL allow_ftp_auth)
+NetIO::open (char const *url)
 {
   NetIO *rv = 0;
   enum
@@ -136,7 +145,7 @@ NetIO::open (char const *url, BOOL allow_ftp_auth)
   else if (net_method == IDC_NET_IE5)
     rv = new NetIO_IE5 (url);
   else if (net_method == IDC_NET_PROXY)
-    rv = new NetIO_HTTP (url, allow_ftp_auth);
+    rv = new NetIO_HTTP (url);
   else if (net_method == IDC_NET_DIRECT)
     {
       switch (proto)
@@ -145,7 +154,7 @@ NetIO::open (char const *url, BOOL allow_ftp_auth)
          rv = new NetIO_HTTP (url);
          break;
        case ftp:
-         rv = new NetIO_FTP (url, allow_ftp_auth);
+         rv = new NetIO_FTP (url);
          break;
        case file:
          rv = new NetIO_File (url);
@@ -233,7 +242,8 @@ auth_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam)
       load_dialog (h);
       return FALSE;
     case WM_COMMAND:
-      return HANDLE_WM_COMMAND (h, wParam, lParam, auth_cmd);
+      auth_cmd (h, LOWORD(wParam), (HWND)lParam, HIWORD(wParam));
+      return 0;
     }
   return FALSE;
 }