Mac fixes

Author: timhall

specs/VBA-Web - Specs.xlsm

@@ -54,7 +54,7 @@ Public Function Execute(Request As WebRequest) As WebResponse
 
 #If Mac Then
     Dim web_Curl As String
-    Dim web_Result As WebShellResult
+    Dim web_Result As web_ShellResult
 
     web_Curl = Me.PrepareCURLRequest(Request)
     web_Result = WebHelpers.ExecuteInShell(web_Curl)

src/WebClient.cls

@@ -933,30 +933,30 @@ End Sub
 ' @param {String} Command
 ' @return {WebShellResult}
 ' --------------------------------------------- '
-Public Function ExecuteInShell(Command As String) As WebShellResult
+Public Function ExecuteInShell(Command As String) As web_ShellResult
     Dim web_File As Long
     Dim web_Chunk As String
     Dim web_Read As Long
 
     On Error GoTo ErrorHandling
-    web_File = popen(Command, "r")
+    web_File = web_popen(Command, "r")
 
     If web_File = 0 Then
         ' TODO
         Exit Function
     End If
 
-    Do While feof(web_File) = 0
+    Do While web_feof(web_File) = 0
         web_Chunk = VBA.Space$(50)
-        web_Read = fread(web_Chunk, 1, Len(web_Chunk) - 1, web_File)
+        web_Read = web_fread(web_Chunk, 1, Len(web_Chunk) - 1, web_File)
         If web_Read > 0 Then
             web_Chunk = VBA.Left$(web_Chunk, web_Read)
             ExecuteInShell.web_Output = ExecuteInShell.web_Output & web_Chunk
         End If
     Loop
 
 ErrorHandling:
-    ExecuteInShell.web_ExitCode = pclose(web_File)
+    ExecuteInShell.web_ExitCode = web_pclose(web_File)
 End Function
 
 ''

src/WebHelpers.bas

@@ -84,23 +84,24 @@ End Sub
 ' @param {String} Result
 ' --------------------------------------------- '
 Public Sub CreateFromCURL(Client As WebClient, Request As WebRequest, Result As String)
-    Dim web_StatusCode As Long
-    Dim web_StatusText As String
-    Dim web_Headers As String
-    Dim web_Body As Variant
-    Dim web_ResponseText As String
-    
     Dim web_Lines() As String
     web_Lines = Split(Result, vbCrLf)
 
     ' Extract status code and text from status line
     Dim web_StatusLine As String
     Dim web_StatusLineParts() As String
+    Dim web_i As Long
     web_StatusLine = web_Lines(0)
     web_StatusLineParts = Split(web_StatusLine)
 
     Me.StatusCode = CLng(web_StatusLineParts(1))
-    Me.StatusDescription = Mid$(web_StatusLine, InStr(1, web_StatusLine, web_StatusCode) + 4)
+    For web_i = 2 To UBound(web_StatusLineParts)
+        If web_i > 2 Then
+            Me.StatusDescription = Me.StatusDescription & " "
+        End If
+        
+        Me.StatusDescription = Me.StatusDescription & web_StatusLineParts(web_i)
+    Next web_i
 
     ' Find blank line before body
     Dim web_Line As Variant