From 178da63b8e3bc6264e6750894f6bcdce31ed3a97 Mon Sep 17 00:00:00 2001
From: Norayr Chilingarian <norayr@arnet.am>
Date: Wed, 24 Jan 2024 04:32:27 +0400
Subject: [PATCH] makefile fix.

---
 GNUmakefile     |  7 -------
 src/vpkHttp.Mod | 27 +++++++++++++++------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 4bc8c8a..7906bc9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -43,13 +43,6 @@ build_deps:
 		fi; \
 	done
 
-#build_deps:
-#	mkdir -p $(BUILD)
-#	cd $(BUILD);
-#	@for i in $(DEPEND); do \
-#		make -f "$(DPS)/$${i}/GNUmakefile" BUILD=$(BUILD); \
-#	done
-
 buildThis:
 	cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/vpkSettings.Mod
 	cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/unix/vpkLinuxFiles.Mod
diff --git a/src/vpkHttp.Mod b/src/vpkHttp.Mod
index 5a6a12b..560a283 100644
--- a/src/vpkHttp.Mod
+++ b/src/vpkHttp.Mod
@@ -166,8 +166,8 @@ END readHeader;
 
 PROCEDURE processHeader(VAR http: httpClient; VAR hdr: ARRAY OF CHAR);
 VAR
-  len, i, j: LONGINT;
-  ok: ARRAY 32 OF CHAR;
+  len, i, j: INTEGER;
+  pkey: strTypes.pstring;
   key, val: ARRAY 64 OF CHAR;
 
 BEGIN
@@ -175,19 +175,22 @@ BEGIN
   Out.String("header length is "); Out.Int(len, 0); Out.Ln;
 
   (* getting string like 'HTTP/1.1 200 OK', hopefully *)
-(*  i := 0; j := 0;
-  REPEAT
-    ok[j] := hdr[i];
-    INC(i); INC(j);
-  UNTIL ok[i] = 0DX;
-  ok[i] := 0X;
-*)
   http^.rspnPstrings := strUtils.string2pstrings(hdr);
-  COPY(http^.rspnPstrings^[0]^, ok);
-strUtils.string2pstring(ok, http^.rspnFirstLine);
+strUtils.string2pstring(http^.rspnPstrings^[0]^, http^.rspnFirstLine);
            Out.String("first line: '"); Out.String(http^.rspnFirstLine^);
            Out.Char("'"); Out.Ln;
-
+  i := 1;
+  REPEAT
+          Out.Int(i, 0); Out.String(": ");
+          Out.String(http^.rspnPstrings^[i]^); Out.Ln;
+    pkey := strUtils.ExtractWord(0, http^.rspnPstrings^[i]^, ':');
+    strUtils.getNextWord(http^.rspnPstrings^[i]^, 0, key);
+          Out.String("key: '"); Out.String(key); Out.Char("'"); Out.Ln;
+    j := strUtils.Pos(':', http^.rspnPstrings^[i]^, 0);
+    strUtils.getTillEOL(http^.rspnPstrings^[i]^, j+1, val);
+          Out.String("val: '"); Out.String(val); Out.Char("'"); Out.Ln;
+    INC(i)
+  UNTIL i = LEN(http^.rspnPstrings^)-1;
 END processHeader;
 
 PROCEDURE get*(VAR http: httpClient): strTypes.pstring;