2001-11-08 Pavel Tsekov <ptsekov@syntrex.com>

[cygwin-apps/setup.git] / nio-http.cc

diff --git a/nio-http.cc b/nio-http.cc
index 962dcfda4458e87a0a956a1c9782b8674b7c3c71..7f17aa50c305fb463df3d9aa342b663e5da6c36e 100644 (file)
--- a/nio-http.cc
+++ b/nio-http.cc
@@ -123,11 +123,12 @@ NetIO_HTTP::NetIO_HTTP (char *Purl, BOOL allow_ftp_auth)
 
   char *l = s->gets ();
   int code;
+  if (!l)
+    return;
   sscanf (l, "%*s %d", &code);
   if (code >= 300 && code < 400)
     {
-      do {
-       l = s->gets ();
+      while ((l = s->gets ()) != 0) {
        if (_strnicmp (l, "Location:", 9) == 0)
          {
            char *u = l + 9;
@@ -137,7 +138,7 @@ NetIO_HTTP::NetIO_HTTP (char *Purl, BOOL allow_ftp_auth)
            delete s;
            goto retry_get;
          }
-      } while (*l);
+      }
     }
   if (code == 401) /* authorization required */
     {
@@ -171,11 +172,10 @@ NetIO_HTTP::NetIO_HTTP (char *Purl, BOOL allow_ftp_auth)
       s = 0;
       return;
     }
-  do {
-    l = s->gets ();
+  while ((l = s->gets ()) != 0) {
     if (_strnicmp (l, "Content-Length:", 15) == 0)
       sscanf (l, "%*s %d", &file_size);
-  } while (*l);
+  }
 }
 
 NetIO_HTTP::~NetIO_HTTP ()
@@ -187,7 +187,7 @@ NetIO_HTTP::~NetIO_HTTP ()
 int
 NetIO_HTTP::ok ()
 {
-  if (s)
+  if (s && s->ok ())
     return 1;
   return 0;
 }