diff --git a/packages/Symbian/bwins/libcurlu.def b/packages/Symbian/bwins/libcurlu.def index 0536096e9..4d693a9b4 100644 --- a/packages/Symbian/bwins/libcurlu.def +++ b/packages/Symbian/bwins/libcurlu.def @@ -55,4 +55,6 @@ EXPORTS curl_unescape @ 54 NONAME curl_version @ 55 NONAME curl_version_info @ 56 NONAME + curl_easy_recv @ 57 NONAME + curl_easy_send @ 58 NONAME diff --git a/packages/Symbian/eabi/libcurlu.def b/packages/Symbian/eabi/libcurlu.def index 0536096e9..4d693a9b4 100644 --- a/packages/Symbian/eabi/libcurlu.def +++ b/packages/Symbian/eabi/libcurlu.def @@ -55,4 +55,6 @@ EXPORTS curl_unescape @ 54 NONAME curl_version @ 55 NONAME curl_version_info @ 56 NONAME + curl_easy_recv @ 57 NONAME + curl_easy_send @ 58 NONAME diff --git a/packages/Symbian/group/bld.inf b/packages/Symbian/group/bld.inf index efba26b3b..3b6993e33 100644 --- a/packages/Symbian/group/bld.inf +++ b/packages/Symbian/group/bld.inf @@ -3,5 +3,5 @@ // PRJ_MMPFILES - libcurl.mmp - curl.mmp + libcurl.mmp + curl.mmp diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp index b00937ef1..a24c16281 100644 --- a/packages/Symbian/group/curl.mmp +++ b/packages/Symbian/group/curl.mmp @@ -6,13 +6,13 @@ TARGET curl.exe TARGETTYPE exe UID 0x00000000 0xF0206442 -SOURCEPATH ..\..\..\src +SOURCEPATH ../../../src SOURCE \ main.c hugehelp.c urlglob.c writeout.c writeenv.c \ - getpass.c homedir.c curlutil.c + getpass.c homedir.c curlutil.c -SYSTEMINCLUDE ..\..\..\include ..\..\..\lib ..\..\..\include\curl \ - \epoc32\include \epoc32\include\stdapis +SYSTEMINCLUDE ../../../include ../../../lib ../../../include/curl \ + /epoc32/include /epoc32/include/stdapis LIBRARY euser.lib libc.lib libcurl.lib STATICLIBRARY libcrt0.lib diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index 22a58fc49..ef2aa0f1f 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -6,25 +6,25 @@ TARGET libcurl.dll TARGETTYPE dll UID 0x1000008d 0xF0206D00 -MACRO BUILDING_LIBCURL=1 +MACRO BUILDING_LIBCURL=1 -SOURCEPATH ..\..\..\lib +SOURCEPATH ../../../lib SOURCE \ - file.c timeval.c base64.c hostip.c progress.c formdata.c \ - cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ - ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \ - netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \ - krb5.c memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c \ - multi.c content_encoding.c share.c http_digest.c md5.c \ - http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c \ - hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c \ - inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \ + file.c timeval.c base64.c hostip.c progress.c formdata.c \ + cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ + ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \ + netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \ + krb5.c memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c \ + multi.c content_encoding.c share.c http_digest.c md5.c \ + http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c \ + hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c \ + inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \ strdup.c socks.c ssh.c nss.c qssl.c -USERINCLUDE ..\..\..\lib +USERINCLUDE ../../../lib -SYSTEMINCLUDE ..\..\..\include ..\..\..\include\curl \ - \epoc32\include\stdapis \epoc32\include +SYSTEMINCLUDE ../../../include ../../../include/curl \ + /epoc32/include/stdapis /epoc32/include LIBRARY euser.lib libc.lib diff --git a/packages/Symbian/readme.txt b/packages/Symbian/readme.txt index f7fec1017..dfae00a54 100644 --- a/packages/Symbian/readme.txt +++ b/packages/Symbian/readme.txt @@ -34,38 +34,39 @@ console, and stderr goes to the epocwind.out file (on the emulator). The standard curl options -o, --stderr and --trace-ascii can be used to redirect output to a file (or stdout) instead. -P.I.P.S. doesn't inherit the current working directory at startup, so you -may need to use the -o option to specify a specific location to store a -downloaded file. +P.I.P.S. doesn't inherit the current working directory at startup, so the +-O option probably won't work as expected, and giving the complete paths +to files will be necessary. P.I.P.S. provides no way to disable echoing of characters as they are entered, so passwords typed in on the console will be visible. All screen output disappears after curl exits, so after a transfer completes, -curl waits by default for Enter to pressed before exiting. This behaviour +curl waits by default for Enter to be pressed before exiting. This behaviour is suppressed when the -s option is given. -The "home directory" in Symbian is C:\Private\f0206442\. The .curlrc is read -from this directory on startup. +curl's "home directory" in Symbian is C:\Private\f0206442\. The .curlrc file +is read from this directory on startup. libcurl notes ------------- -libcurl uses writeable static data, so the EPOCALLOWDLLDATA option is +libcurl uses writable static data, so the EPOCALLOWDLLDATA option is used in its MMP file, with the corresponding additional memory usage and limitations on the Windows emulator. -curl_global_init() *must* be called before any libcurl functions that could -allocate memory (like curl_getenv()). +curl_global_init() *must* be called (either explicitly or implicitly through +calling certain other libcurl functions) before any libcurl functions +that could allocate memory (like curl_getenv()). P.I.P.S. doesn't support signals or the alarm() call, so some timeouts (such as the connect timeout) are not honoured. -P.I.P.S. causes a USER:87 panic if a timeout much longer than half an hour -is selected. +P.I.P.S. causes a USER:87 panic if certain timeouts much longer than +half an hour are selected. -SSL/TLS encryption is not supported. +SSL/TLS encryption is not supported, nor are LDAP, SCP or SFTP URLs. Dan Fandrich dan@coneharvesters.com -April 2008 +May 2008