v1.17

mikeduglas · Jul 12, 2017 · e34ef12 · e34ef12
1 parent 705afd4
commit e34ef12
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,10 @@ libcurl for Clarion
 
 ## Required C6.3 and newer.
 
+v1.17
+- FIX: in TCurlClass methods .SetUrl, .SetUserPwd, .SetCAInfo now accept unlimited string arguments.
+- FIX: in TCurlDropboxClass size of some local string variables were increased.
+
 
 v1.16
 - FIX: TCurlClass.AddHttpHeader(STRING pHeader) now accepts unlimited HTTP header string (it was 255 characters).

diff --git a/libsrc/libcurl.clw b/libsrc/libcurl.clw
@@ -1,5 +1,5 @@
-!** libcurl for Clarion v1.16
-!** 28.06.2017
+!** libcurl for Clarion v1.17
+!** 12.07.2017
 !** mikeduglas66@gmail.com
 
 
@@ -205,7 +205,7 @@ cs                              CSTRING(LEN(s) + LEN(prefix) + 1)
 
 curl::GetFileContents         PROCEDURE(STRING pFile)
 OS_INVALID_HANDLE_VALUE         EQUATE(-1)
-szFile                          CSTRING(256)
+szFile                          CSTRING(LEN(pFile) + 1)
 sData                           &STRING
 hFile                           HANDLE
 dwFileSize                      LONG
@@ -704,7 +704,7 @@ TCurlClass.SetOpt             PROCEDURE(CURLoption option, TCurlSList plist)
   RETURN curl_easy_setopt(SELF.curl, option, plist.GetList())
 
 TCurlClass.SetUrl             PROCEDURE(STRING pUrl)
-url                             CSTRING(256)
+url                             CSTRING(LEN(pUrl) + 1)
   CODE
   url = CLIP(pUrl)
   RETURN SELF.SetOpt(CURLOPT_URL, ADDRESS(url))
@@ -728,7 +728,7 @@ TCurlClass.StrError           PROCEDURE(CURLcode errcode)
   RETURN curl_easy_strerror(errcode)
 
 TCurlClass.SetUserPwd         PROCEDURE(STRING pUser, STRING pPwd)
-userpwd                         CSTRING(256)
+userpwd                         CSTRING(LEN(pUser) + LEN(pPwd) + 1 + 1)
   CODE
   IF pUser AND pPwd
     userpwd = CLIP(pUser) &':'& CLIP(pPwd)
@@ -1117,7 +1117,7 @@ TCurlClass.SetSSLVerifyPeer   PROCEDURE(BOOL pValue)
   RETURN SELF.SetOpt(CURLOPT_SSL_VERIFYPEER, pValue)
 
 TCurlClass.SetCAInfo          PROCEDURE(STRING pCert)
-szcert                          CSTRING(256)
+szcert                          CSTRING(LEN(pCert) + 1)
   CODE
   szcert = CLIP(pCert)
   RETURN SELF.SetOpt(CURLOPT_CAINFO, ADDRESS(szcert))

diff --git a/libsrc/libcurl.inc b/libsrc/libcurl.inc
@@ -1,5 +1,5 @@
-!** libcurl for Clarion v1.16
-!** 29.06.2017
+!** libcurl for Clarion v1.17
+!** 12.07.2017
 !** mikeduglas66@gmail.com
 
   INCLUDE('DynStr.inc'), ONCE

diff --git a/libsrc/libcurldropbox.clw b/libsrc/libcurldropbox.clw
@@ -1,5 +1,5 @@
-!** libcurl for Clarion v1.14
-!** 11.01.2017
+!** libcurl for Clarion v1.17
+!** 12.07.2017
 !** mikeduglas66@gmail.com
 
   MEMBER
@@ -55,7 +55,7 @@ TCurlDropboxClass.AccessToken PROCEDURE()
 
 TCurlDropboxClass.Authorize   PROCEDURE(STRING pAppKey)
 szAction                        CSTRING('open')
-szUrl                           CSTRING(256)
+szUrl                           CSTRING(512)
   CODE
   szUrl = 'https://www.dropbox.com/oauth2/authorize?response_type=code&client_id='& CLIP(pAppKey)
   winapi::ShellExecute(0, szAction, szUrl, , , SW_SHOWNORMAL)
@@ -202,7 +202,7 @@ rc                                              CURLcode, AUTO
 
 TCurlDropboxClass.Copy        PROCEDURE(STRING pFromPath, STRING pToPath)
 func                            STRING('copy')
-args                            CSTRING(256)
+args                            CSTRING(1024)
   CODE
   args = '{{"from_path": "'& CLIP(pFromPath) &'","to_path": "'& CLIP(pToPath) &'"}'
   SELF._lastCurlCode = SELF.SetRPCEndpoint(args)
@@ -219,7 +219,7 @@ args                            CSTRING(256)
 
 TCurlDropboxClass.Move        PROCEDURE(STRING pFromPath, STRING pToPath)
 func                            STRING('move')
-args                            CSTRING(256)
+args                            CSTRING(1024)
   CODE
   args = '{{"from_path": "'& CLIP(pFromPath) &'","to_path": "'& CLIP(pToPath) &'"}'
   SELF._lastCurlCode = SELF.SetRPCEndpoint(args)
@@ -236,7 +236,7 @@ args                            CSTRING(256)
 
 TCurlDropboxClass.CreateFolder    PROCEDURE(STRING pPath)
 func                                STRING('create_folder')
-args                                CSTRING(256)
+args                                CSTRING(512)
   CODE
   args = '{{"path": "'& CLIP(pPath) &'"}'
   SELF._lastCurlCode = SELF.SetRPCEndpoint(args)
@@ -253,7 +253,7 @@ args                                CSTRING(256)
 
 TCurlDropboxClass.Delete      PROCEDURE(STRING pPath)
 func                            STRING('delete')
-args                            CSTRING(256)
+args                            CSTRING(512)
   CODE
   args = '{{"path": "'& CLIP(pPath) &'"}'
   SELF._lastCurlCode = SELF.SetRPCEndpoint(args)
@@ -270,7 +270,7 @@ args                            CSTRING(256)
 
 TCurlDropboxClass.Download    PROCEDURE(STRING pRemotePath, STRING pLocalPath)
 func                            STRING('download')
-args                            CSTRING(256)
+args                            CSTRING(512)
 fs                              TCurlFileStruct
 dwBytes                         LONG, AUTO
   CODE
@@ -337,7 +337,7 @@ fileContent                     &STRING
 
 TCurlDropboxClass.ListFolder  PROCEDURE(STRING pPath, BOOL pRecursive = FALSE)
 func                            STRING('list_folder')
-args                            CSTRING(256)
+args                            CSTRING(512)
   CODE
   args = '{{"path": "'& CLIP(pPath) &'"'
   IF pRecursive
@@ -359,7 +359,7 @@ args                            CSTRING(256)
 
 TCurlDropboxClass.Get_Copy_Reference  PROCEDURE(STRING pPath)
 func                                    STRING('copy_reference/get')
-args                                    CSTRING(256)
+args                                    CSTRING(512)
   CODE
   args = '{{"path": "'& CLIP(pPath) &'"}'
   SELF._lastCurlCode = SELF.SetRPCEndpoint(args)
@@ -393,7 +393,7 @@ args                                    CSTRING(512)
 
 TCurlDropboxClass.Preview     PROCEDURE(STRING pPath, *STRING pTmpFile)
 func                            STRING('get_preview')
-args                            CSTRING(256)
+args                            CSTRING(512)
 htmlDocTypeStr                  STRING('<<!DOCTYPE html>')
 pdfDocTypeStr                   STRING('%PDF')
 fs                              TCurlFileStruct
@@ -431,7 +431,7 @@ rc                              BOOL(FALSE)
 
 TCurlDropboxClass.Thumbnail   PROCEDURE(STRING pPath, TDbxThumbnailFormat pFormat, TDbxThumbnailSize pSize, *STRING pTmpFile)
 func                            STRING('get_thumbnail')
-args                            CSTRING(256)
+args                            CSTRING(1024)
 fs                              TCurlFileStruct
 dwBytes                         LONG, AUTO
 rc                              BOOL(FALSE)