2007-02-17 Brian Dessent <brian@dessent.net>

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

diff --git a/netio.cc b/netio.cc
index ebf9c5a3a68c111720a41cf625eebc7ce039dcb4..37c3a4ed496198ab875b708d0d2f1b49ccccd6c0 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,32 +33,38 @@ 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;
 
-NetIO::NetIO (char const *Purl, BOOL allow_ftp_auth)
+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)
 {
   set_url (Purl);
-  ftp_auth = allow_ftp_auth;
 }
 
 NetIO::~NetIO ()
 {
   if (url)
-    free (url);
+    delete[] url;
   if (proto)
-    free (proto);
+    delete[] proto;
   if (host)
-    free (host);
+    delete[] host;
   if (path)
-    free (path);
+    delete[] path;
 }
 
 void
@@ -64,7 +73,8 @@ NetIO::set_url (char const *Purl)
   char *bp, *ep, c;
 
   file_size = 0;
-  url = _strdup (Purl);
+  url = new char[strlen (Purl) + 1];
+  strcpy (url, Purl);
   proto = 0;
   host = 0;
   port = 0;
@@ -79,14 +89,16 @@ NetIO::set_url (char const *Purl)
     }
 
   *ep = 0;
-  proto = _strdup (bp);
+  proto = new char [strlen (bp)+1];
+  strcpy (proto, bp);
   *ep = ':';
   bp = ep + 3;
 
   ep = bp + strcspn (bp, ":/");
   c = *ep;
   *ep = 0;
-  host = _strdup (bp);
+  host = new char [strlen (bp) + 1];
+  strcpy (host, bp);
   *ep = c;
 
   if (*ep == ':')
@@ -96,7 +108,10 @@ NetIO::set_url (char const *Purl)
     }
 
   if (*ep)
-    path = _strdup (ep);
+    {
+      path = new char [strlen (ep)+1];
+      strcpy (path, ep);
+    }
 }
 
 int
@@ -112,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
@@ -130,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)
@@ -139,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);
@@ -164,7 +179,7 @@ static void
 check_if_enable_ok (HWND h)
 {
   int e = 0;
-  if (*user && *passwd)
+  if (*user)
     e = 1;
   EnableWindow (GetDlgItem (h, IDOK), e);
 }
@@ -184,6 +199,10 @@ save_dialog (HWND h)
 {
   *user = eget (h, IDC_NET_USER, *user);
   *passwd = eget (h, IDC_NET_PASSWD, *passwd);
+  if (! *passwd) {
+    *passwd = new char[1];
+    passwd[0] = '\0';
+  }
 }
 
 static BOOL
@@ -208,7 +227,7 @@ auth_cmd (HWND h, int id, HWND hwndctl, UINT code)
 
     case IDCANCEL:
       EndDialog (h, 1);
-      exit_setup (1);
+      LogSingleton::GetInstance().exit (1);
       break;
     }
   return 0;
@@ -223,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;
 }
@@ -255,12 +275,12 @@ NetIO::get_ftp_auth (HWND owner)
 {
   if (net_ftp_user)
     {
-      free (net_ftp_user);
+      delete[] net_ftp_user;
       net_ftp_user = NULL;
     }
   if (net_ftp_passwd)
     {
-      free (net_ftp_passwd);
+      delete[] net_ftp_passwd;
       net_ftp_passwd = NULL;
     }
   if (!ftp_auth)