WebSVN – SvarDOS – Diff – /pkgnet/pkgnet.c

+    }
     if (byteread > 0) {
       buffer[byteread] = 0;
       lastactivity = time(NULL);
-      /* do I know the http code yet? */
+      /* are headers done already? */
-      if (httpcode < 0) {
+      if (headersdone == 0) {
+        if (httpcode < 0) { /* do I know the http code yet? */
-        int spc;
+          int spc;
-        /* find the first space (HTTP/1.1 200 OK) */
+          /* find the first space (HTTP/1.1 200 OK) */
-        for (spc = 0; spc < 16; spc++) {
+          for (spc = 0; spc < 16; spc++) {
-          if (buffer[spc] == ' ') break;
+            if (buffer[spc] == ' ') break;
-          if (buffer[spc] == 0) break;
+            if (buffer[spc] == 0) break;
-        }
+          }
-        if (buffer[spc] == 0) continue; /* not enough data received */
+          if (buffer[spc] == 0) continue; /* not enough data received */
-        if (buffer[spc] != ' ') {
+          if (buffer[spc] != ' ') {
-          puts("ERROR: server answered with invalid HTTP");
+            puts("ERROR: server answered with invalid HTTP");
-          goto SHITQUIT;
-        }
-        httpcode = atoi((char *)(buffer + spc + 1));
-        /* on error, the answer should be always printed on screen */
-        if ((httpcode == 200) && (*outfname != 0)) {
-          fd = fopen(outfname, "wb");
-          if (fd == NULL) {
-            printf("ERROR: failed to create file %s", outfname);
-            puts("");
             goto SHITQUIT;
+          }
+          httpcode = atoi((char *)(buffer + spc + 1));
+          /* on error, the answer should be always printed on screen */
+          if ((httpcode == 200) && (*outfname != 0)) {
+            fd = fopen(outfname, "wb");
+            if (fd == NULL) {
+              printf("ERROR: failed to create file %s", outfname);
+              puts("");
+              goto SHITQUIT;
+            }
+          }
+        }
-      }
-      /* skip headers: look for \r\n\r\n or \n\n within the stream */
+        /* skip headers: look for \r\n\r\n or \n\n within the stream */
-      if (headersdone == 0) {
         byteread = detecthttpheadersend(buffer, byteread);
-        headersdone = 1;
+        headersdone = 1; /* assumes ALL headers are contained in the first packet TODO FIXME */
         if (byteread == 0) continue;
+      }
       /* if downloading to file, write stuff to disk */
       if (fd != NULL) {
         int i;

Subversion Repositories SvarDOS

(root)/pkgnet/pkgnet.c – Rev 333 → 336