From 3d64031fa7a80ac4ae3fd09a5939196268b92f81 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 21 Sep 2020 14:28:40 +0200 Subject: symbian: drop support The OS is deprecated. I see no traces of anyone having actually built curl for Symbian after 2012. The public headers are unmodified. Closes #5989 --- lib/Makefile.am | 2 +- lib/asyn-ares.c | 4 +- lib/config-symbian.h | 793 ------------------------------------ lib/connect.c | 5 - lib/content_encoding.c | 4 - lib/curl_setup.h | 7 +- lib/easy.c | 12 - lib/file.c | 3 +- lib/urldata.h | 7 +- lib/version.c | 8 +- packages/Makefile.am | 10 - packages/Symbian/bwins/libcurlu.def | 60 --- packages/Symbian/eabi/libcurlu.def | 60 --- packages/Symbian/group/bld.inf | 10 - packages/Symbian/group/curl.iby | 15 - packages/Symbian/group/curl.mmp | 64 --- packages/Symbian/group/curl.pkg | 26 -- packages/Symbian/group/libcurl.iby | 14 - packages/Symbian/group/libcurl.mmp | 67 --- packages/Symbian/group/libcurl.pkg | 22 - packages/Symbian/readme.txt | 93 ----- scripts/copyright.pl | 11 - src/tool_getpass.c | 10 +- src/tool_help.c | 4 - src/tool_main.c | 5 - src/tool_panykey.c | 10 +- src/tool_panykey.h | 8 +- tests/libtest/sethostname.h | 2 +- 28 files changed, 18 insertions(+), 1318 deletions(-) delete mode 100644 lib/config-symbian.h delete mode 100644 packages/Symbian/bwins/libcurlu.def delete mode 100644 packages/Symbian/eabi/libcurlu.def delete mode 100644 packages/Symbian/group/bld.inf delete mode 100644 packages/Symbian/group/curl.iby delete mode 100644 packages/Symbian/group/curl.mmp delete mode 100644 packages/Symbian/group/curl.pkg delete mode 100644 packages/Symbian/group/libcurl.iby delete mode 100644 packages/Symbian/group/libcurl.mmp delete mode 100644 packages/Symbian/group/libcurl.pkg delete mode 100644 packages/Symbian/readme.txt diff --git a/lib/Makefile.am b/lib/Makefile.am index e43cdc48f..78b068ffe 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = Makefile.m32 config-win32.h config-win32ce.h \ config-plan9.h config-riscos.h config-mac.h curl_config.h.in \ makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h \ makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \ - config-os400.h setup-os400.h config-symbian.h \ + config-os400.h setup-os400.h \ config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \ firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \ setup-win32.h diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index e65150744..725d6cd5c 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -67,8 +67,8 @@ #include "select.h" #include "progress.h" -# if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \ - (defined(WIN32) || defined(__SYMBIAN32__)) +# if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \ + defined(WIN32) # define CARES_STATICLIB # endif # include diff --git a/lib/config-symbian.h b/lib/config-symbian.h deleted file mode 100644 index 7f17dce25..000000000 --- a/lib/config-symbian.h +++ /dev/null @@ -1,793 +0,0 @@ -#ifndef HEADER_CURL_CONFIG_SYMBIAN_H -#define HEADER_CURL_CONFIG_SYMBIAN_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at https://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -/* ================================================================ */ -/* Hand crafted config file for Symbian */ -/* ================================================================ */ - -/* Location of default ca bundle */ -/* #define CURL_CA_BUNDLE "/etc/pki/tls/certs/ca-bundle.crt"*/ - -/* Location of default ca path */ -/* #undef CURL_CA_PATH */ - -/* to disable cookies support */ -/* #undef CURL_DISABLE_COOKIES */ - -/* to disable cryptographic authentication */ -/* #undef CURL_DISABLE_CRYPTO_AUTH */ - -/* to disable DICT */ -/* #undef CURL_DISABLE_DICT */ - -/* to disable FILE */ -/* #undef CURL_DISABLE_FILE */ - -/* to disable FTP */ -/* #undef CURL_DISABLE_FTP */ - -/* to disable HTTP */ -/* #undef CURL_DISABLE_HTTP */ - -/* to disable LDAP */ -#define CURL_DISABLE_LDAP 1 - -/* to disable LDAPS */ -#define CURL_DISABLE_LDAPS 1 - -/* to disable TELNET */ -/* #undef CURL_DISABLE_TELNET */ - -/* to disable TFTP */ -/* #undef CURL_DISABLE_TFTP */ - -/* to disable verbose strings */ -/* #define CURL_DISABLE_VERBOSE_STRINGS 1*/ - -/* Definition to make a library symbol externally visible. */ -/* #undef CURL_EXTERN_SYMBOL */ - -/* Use Windows LDAP implementation */ -/* #undef USE_WIN32_LDAP */ - -/* your Entropy Gathering Daemon socket pathname */ -/* #undef EGD_SOCKET */ - -/* Define if you want to enable IPv6 support */ -#define ENABLE_IPV6 1 - -/* Define if struct sockaddr_in6 has the sin6_scope_id member */ -#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 - -/* Define to the type qualifier of arg 1 for getnameinfo. */ -#define GETNAMEINFO_QUAL_ARG1 const - -/* Define to the type of arg 1 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * - -/* Define to the type of arg 2 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG2 socklen_t - -/* Define to the type of args 4 and 6 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG46 size_t - -/* Define to the type of arg 7 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG7 int - -/* Define to 1 if you have the header file. */ -/*#define HAVE_ALLOCA_H 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_ARPA_INET_H 1 - -/* Define to 1 if you have the header file. */ -/*#define HAVE_ARPA_TFTP_H 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_ASSERT_H 1 - -/* Define to 1 if you have the `basename' function. */ -/*#define HAVE_BASENAME 1*/ - -/* Define to 1 if bool is an available type. */ -/*#define HAVE_BOOL_T 1*/ - -/* Define to 1 if you have the `closesocket' function. */ -/* #undef HAVE_CLOSESOCKET */ - -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ -/*#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1*/ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_CRYPTO_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ERR_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the fcntl function. */ -#define HAVE_FCNTL 1 - -/* Define to 1 if you have a working fcntl O_NONBLOCK function. */ -#define HAVE_FCNTL_O_NONBLOCK 1 - -/* Define to 1 if you have the `fork' function. */ -/*#define HAVE_FORK 1*/ - -/* Define to 1 if you have the `ftruncate' function. */ -#define HAVE_FTRUNCATE 1 - -/* Define if getaddrinfo exists and works */ -#define HAVE_GETADDRINFO 1 - -/* Define to 1 if you have the `geteuid' function. */ -#define HAVE_GETEUID 1 - -/* Define to 1 if you have the `gethostbyaddr' function. */ -#define HAVE_GETHOSTBYADDR 1 - -/* If you have gethostbyname */ -#define HAVE_GETHOSTBYNAME 1 - -/* Define to 1 if you have the `gethostbyname_r' function. */ -/* #undef HAVE_GETHOSTBYNAME_R */ - -/* gethostbyname_r() takes 3 args */ -/* #undef HAVE_GETHOSTBYNAME_R_3 */ - -/* gethostbyname_r() takes 5 args */ -/* #undef HAVE_GETHOSTBYNAME_R_5 */ - -/* gethostbyname_r() takes 6 args */ -/* #undef HAVE_GETHOSTBYNAME_R_6 */ - -/* Define to 1 if you have the getnameinfo function. */ -#define HAVE_GETNAMEINFO 1 - -/* Define to 1 if you have the `getpass_r' function. */ -/* #undef HAVE_GETPASS_R */ - -/* Define to 1 if you have the `getppid' function. */ -#define HAVE_GETPPID 1 - -/* Define to 1 if you have the `getprotobyname' function. */ -#define HAVE_GETPROTOBYNAME 1 - -/* Define to 1 if you have the `getpwuid' function. */ -#define HAVE_GETPWUID 1 - -/* Define to 1 if you have the `getrlimit' function. */ -/*#define HAVE_GETRLIMIT 1*/ - -/* Define to 1 if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* we have a glibc-style strerror_r() */ -/* #undef HAVE_GLIBC_STRERROR_R */ - -/* Define to 1 if you have the `gmtime_r' function. */ -#define HAVE_GMTIME_R 1 - -/* if you have the gssapi libraries */ -/* #undef HAVE_GSSAPI */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GSSAPI_GSSAPI_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ - -/* if you have the GNU gssapi libraries */ -/* #undef HAVE_GSSGNU */ - -/* if you have the Heimdal gssapi libraries */ -/* #undef HAVE_GSSHEIMDAL */ - -/* if you have the MIT gssapi libraries */ -/* #undef HAVE_GSSMIT */ - -/* Define to 1 if you have the `idna_strerror' function. */ -/*#define HAVE_IDNA_STRERROR 1*/ - -/* Define to 1 if you have the `idn_free' function. */ -/*#define HAVE_IDN_FREE 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_IDN_FREE_H 1*/ - -/* Define to 1 if you have the `inet_addr' function. */ -/*#define HAVE_INET_ADDR 1*/ - -/* Define to 1 if you have a IPv6 capable working inet_ntop function. */ -/*#define HAVE_INET_NTOP 1*/ - -/* Define to 1 if you have a IPv6 capable working inet_pton function. */ -/*#define HAVE_INET_PTON 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the ioctl function. */ -#define HAVE_IOCTL 1 - -/* Define to 1 if you have a working ioctl FIONBIO function. */ -#define HAVE_IOCTL_FIONBIO 1 - -/* Define to 1 if you have the ioctlsocket function. */ -/* #undef HAVE_IOCTLSOCKET */ - -/* Define to 1 if you have a working ioctlsocket FIONBIO function. */ -/* #undef HAVE_IOCTLSOCKET_FIONBIO */ - -/* Define to 1 if you have the IoctlSocket camel case function. */ -/* #undef HAVE_IOCTLSOCKET_CAMEL */ - -/* Define to 1 if you have a working IoctlSocket camel case FIONBIO - function. */ -/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_IO_H */ - -/* if you have the Kerberos4 libraries (including -ldes) */ -/* #undef HAVE_KRB4 */ - -/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */ -/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_KRB_H */ - -/* Define to 1 if you have the lber.h header file. */ -/*#define HAVE_LBER_H 1*/ - -/* Define to 1 if you have the ldapssl.h header file. */ -/* #undef HAVE_LDAPSSL_H */ - -/* Define to 1 if you have the ldap.h header file. */ -/*#define HAVE_LDAP_H 1*/ - -/* Use LDAPS implementation */ -/*#define HAVE_LDAP_SSL 1*/ - -/* Define to 1 if you have the ldap_ssl.h header file. */ -/* #undef HAVE_LDAP_SSL_H */ - -/* Define to 1 if you have the `ldap_url_parse' function. */ -/*#define HAVE_LDAP_URL_PARSE 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_LIBGEN_H 1*/ - -/* Define to 1 if you have the `idn' library (-lidn). */ -/*#define HAVE_LIBIDN 1*/ - -/* Define to 1 if you have the `resolv' library (-lresolv). */ -/* #undef HAVE_LIBRESOLV */ - -/* Define to 1 if you have the `resolve' library (-lresolve). */ -/* #undef HAVE_LIBRESOLVE */ - -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ - -/* Define to 1 if you have the `ssh2' library (-lssh2). */ -/*#define HAVE_LIBSSH2 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_LIBSSH2_H 1*/ - -/* if your compiler supports LL */ -#define HAVE_LL 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if you have the `localtime_r' function. */ -#define HAVE_LOCALTIME_R 1 - -/* Define to 1 if the compiler supports the 'long long' data type. */ -#define HAVE_LONGLONG 1 - -/* Define to 1 if you have the malloc.h header file. */ -/*#define HAVE_MALLOC_H 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the MSG_NOSIGNAL flag. */ -/*#define HAVE_MSG_NOSIGNAL 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_NETDB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_NETINET_IN_H 1 - -/* Define to 1 if you have the header file. */ -/*#define HAVE_NETINET_TCP_H 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_NET_IF_H 1 - -/* Define to 1 if NI_WITHSCOPEID exists and works. */ -/*#define HAVE_NI_WITHSCOPEID 1*/ - -/* we have no strerror_r() proto */ -/* #undef HAVE_NO_STRERROR_R_DECL */ - -/* if you have an old MIT gssapi library, lacking GSS_C_NT_HOSTBASED_SERVICE - */ -/* #undef HAVE_OLD_GSSMIT */ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_OPENSSL_CRYPTO_H 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_OPENSSL_ERR_H 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_OPENSSL_PEM_H 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_OPENSSL_PKCS12_H 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_OPENSSL_RSA_H 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_OPENSSL_SSL_H 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_OPENSSL_X509_H 1*/ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PEM_H */ - -/* Define to 1 if you have the `perror' function. */ -#define HAVE_PERROR 1 - -/* Define to 1 if you have the `pipe' function. */ -#define HAVE_PIPE 1 - -/* Define to 1 if you have the `poll' function. */ -/*#define HAVE_POLL 1*/ - -/* If you have a fine poll */ -/*#define HAVE_POLL_FINE 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_POLL_H 1*/ - -/* we have a POSIX-style strerror_r() */ -#define HAVE_POSIX_STRERROR_R 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_PWD_H 1 - -/* Define to 1 if you have the `RAND_egd' function. */ -#define HAVE_RAND_EGD 1 - -/* Define to 1 if you have the `RAND_screen' function. */ -/* #undef HAVE_RAND_SCREEN */ - -/* Define to 1 if you have the `RAND_status' function. */ -/*#define HAVE_RAND_STATUS 1*/ - -/* Define to 1 if you have the recv function. */ -#define HAVE_RECV 1 - -/* Define to 1 if you have the recvfrom function. */ -#define HAVE_RECVFROM 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_RSA_H */ - -/* Define to 1 if you have the select function. */ -#define HAVE_SELECT 1 - -/* Define to 1 if you have the send function. */ -#define HAVE_SEND 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SETJMP_H 1 - -/* Define to 1 if you have the `setlocale' function. */ -#define HAVE_SETLOCALE 1 - -/* Define to 1 if you have the `setmode' function. */ -/* #undef HAVE_SETMODE */ - -/* Define to 1 if you have the `setrlimit' function. */ -/*#define HAVE_SETRLIMIT 1*/ - -/* Define to 1 if you have the setsockopt function. */ -/* #undef HAVE_SETSOCKOPT */ - -/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */ -/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_SGTTY_H 1*/ - -/* Define to 1 if you have the `sigaction' function. */ -/*#define HAVE_SIGACTION 1*/ - -/* Define to 1 if you have the `siginterrupt' function. */ -/*#define HAVE_SIGINTERRUPT 1*/ - -/* Define to 1 if you have the `signal' function. */ -/*#define HAVE_SIGNAL 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_SIGNAL_H 1 - -/* If you have sigsetjmp */ -/*#define HAVE_SIGSETJMP 1*/ - -/* Define to 1 if sig_atomic_t is an available typedef. */ -/*#define HAVE_SIG_ATOMIC_T 1*/ - -/* Define to 1 if sig_atomic_t is already defined as volatile. */ -/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */ - -/* Define to 1 if you have the `socket' function. */ -#define HAVE_SOCKET 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SSL_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDBOOL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDIO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strcmpi' function. */ -/* #undef HAVE_STRCMPI */ - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror_r' function. */ -#define HAVE_STRERROR_R 1 - -/* Define to 1 if you have the `stricmp' function. */ -/* #undef HAVE_STRICMP */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strlcpy' function. */ -#define HAVE_STRLCPY 1 - -/* Define to 1 if you have the `strstr' function. */ -#define HAVE_STRSTR 1 - -/* Define to 1 if you have the `strtok_r' function. */ -#define HAVE_STRTOK_R 1 - -/* Define to 1 if you have the `strtoll' function. */ -#define HAVE_STRTOLL 1 - -/* if struct sockaddr_storage is defined */ -#define HAVE_STRUCT_SOCKADDR_STORAGE 1 - -/* Define to 1 if you have the timeval struct. */ -#define HAVE_STRUCT_TIMEVAL 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_FILIO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_IOCTL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -/*#define HAVE_SYS_POLL_H 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SELECT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOCKIO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_UTIME_H */ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_TERMIOS_H 1*/ - -/* Define to 1 if you have the header file. */ -/*#define HAVE_TERMIO_H 1*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_TIME_H 1 - -/* Define to 1 if you have the header file. */ -/*#define HAVE_TLD_H 1*/ - -/* Define to 1 if you have the `tld_strerror' function. */ -/*#define HAVE_TLD_STRERROR 1*/ - -/* Define to 1 if you have the `uname' function. */ -#define HAVE_UNAME 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `utime' function. */ -#define HAVE_UTIME 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UTIME_H 1 - -/* Define to 1 if compiler supports C99 variadic macro style. */ -#define HAVE_VARIADIC_MACROS_C99 1 - -/* Define to 1 if compiler supports old gcc variadic macro style. */ -/*#define HAVE_VARIADIC_MACROS_GCC 1*/ - -/* Define to 1 if you have the winber.h header file. */ -/* #undef HAVE_WINBER_H */ - -/* Define to 1 if you have the windows.h header file. */ -/* #undef HAVE_WINDOWS_H */ - -/* Define to 1 if you have the winldap.h header file. */ -/* #undef HAVE_WINLDAP_H */ - -/* Define to 1 if you have the winsock2.h header file. */ -/* #undef HAVE_WINSOCK2_H */ - -/* Define to 1 if you have the winsock.h header file. */ -/* #undef HAVE_WINSOCK_H */ - -/* Define this symbol if your OS supports changing the contents of argv */ -/*#define HAVE_WRITABLE_ARGV 1*/ - -/* Define to 1 if you have the ws2tcpip.h header file. */ -/* #undef HAVE_WS2TCPIP_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_X509_H */ - -/* Define to 1 if you need the lber.h header file even with ldap.h */ -/* #undef NEED_LBER_H */ - -/* Define to 1 if you need the malloc.h header file even with stdlib.h */ -/* #undef NEED_MALLOC_H */ - -/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */ -/* #undef NEED_REENTRANT */ - -/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */ -/* #undef NEED_THREAD_SAFE */ - -/* cpu-machine-OS */ -#ifdef __WINS__ -#define OS "i386-pc-epoc32" -#elif __MARM__ -#define OS "arm-unknown-epoc32" -#else -/* This won't happen on any current Symbian version */ -#define OS "unknown-unknown-epoc32" -#endif - -/* Name of package */ -/*#define PACKAGE "curl"*/ - -/* Define to the address where bug reports for this package should be sent. */ -/*#define PACKAGE_BUGREPORT \ - "a suitable curl mailing list => https://curl.haxx.se/mail/"*/ - -/* Define to the full name of this package. */ -/*#define PACKAGE_NAME "curl"*/ - -/* Define to the full name and version of this package. */ -/*#define PACKAGE_STRING "curl -"*/ - -/* Define to the one symbol short name of this package. */ -/*#define PACKAGE_TARNAME "curl"*/ - -/* Define to the version of this package. */ -/*#define PACKAGE_VERSION "-"*/ - -/* a suitable file to read random data from */ -/*#define RANDOM_FILE "/dev/urandom"*/ - -#define RECV_TYPE_ARG1 int -#define RECV_TYPE_ARG2 void * -#define RECV_TYPE_ARG3 size_t -#define RECV_TYPE_ARG4 int -#define RECV_TYPE_RETV ssize_t - -#define RECVFROM_TYPE_ARG1 int -#define RECVFROM_TYPE_ARG2 void -#define RECVFROM_TYPE_ARG3 size_t -#define RECVFROM_TYPE_ARG4 int -#define RECVFROM_TYPE_ARG5 struct sockaddr -#define RECVFROM_TYPE_ARG6 size_t -#define RECVFROM_TYPE_RETV ssize_t -#define RECVFROM_TYPE_ARG2_IS_VOID 1 - -#define SEND_TYPE_ARG1 int -#define SEND_QUAL_ARG2 const -#define SEND_TYPE_ARG2 void * -#define SEND_TYPE_ARG3 size_t -#define SEND_TYPE_ARG4 int -#define SEND_TYPE_RETV ssize_t - - -/* Define as the return type of signal handlers (`int' or `void'). */ -/*#define RETSIGTYPE void*/ - -/* Define to the type of arg 1 for `select'. */ -#define SELECT_TYPE_ARG1 int - -/* Define to the type of args 2, 3 and 4 for `select'. */ -#define SELECT_TYPE_ARG234 (fd_set *) - -/* Define to the type of arg 5 for `select'. */ -#define SELECT_TYPE_ARG5 (struct timeval *) - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `off_t', as computed by sizeof. */ -#define SIZEOF_OFF_T 8 - -/* The size of `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 - -/* The size of `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T 4 - -/* The size of `time_t', as computed by sizeof. */ -#define SIZEOF_TIME_T 4 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define if you want to enable c-ares support */ -/* #undef USE_ARES */ - -/* Define to disable non-blocking sockets */ -/* #undef USE_BLOCKING_SOCKETS */ - -/* if GnuTLS is enabled */ -/* #undef USE_GNUTLS */ - -/* if libSSH2 is in use */ -/*#define USE_LIBSSH2 1*/ - -/* If you want to build curl with the built-in manual */ -/*#define USE_MANUAL 1*/ - -/* if NSS is enabled */ -/* #undef USE_NSS */ - -/* to enable SSPI support */ -/* #undef USE_WINDOWS_SSPI */ - -/* Define to 1 if using yaSSL in OpenSSL compatibility mode. */ -/* #undef USE_YASSLEMUL */ - -/* Version number of package */ -/*#define VERSION "7.18.2-CVS"*/ - -/* Define to avoid automatic inclusion of winsock.h */ -/* #undef WIN32_LEAN_AND_MEAN */ - -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* # undef _ALL_SOURCE */ -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -#define _FILE_OFFSET_BITS 64 - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* type to use in place of in_addr_t if not defined */ -/* #undef in_addr_t */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ - -/* the signed version of size_t */ -/* #undef ssize_t */ - -/* Enabling curl debug mode when building in Symbian debug mode would work */ -/* except that debug mode introduces new exports that must be frozen. */ -#ifdef _DEBUG -/* #define CURLDEBUG */ -#endif - -/* sys/cdefs.h fails to define this for WINSCW prior to Symbian OS ver. 9.4 */ -#ifndef __LONG_LONG_SUPPORTED -#define __LONG_LONG_SUPPORTED -#endif - -/* Enable appropriate header only when zlib support is enabled */ -#ifdef HAVE_LIBZ -#define HAVE_ZLIB_H 1 -#endif - -#endif /* HEADER_CURL_CONFIG_SYMBIAN_H */ diff --git a/lib/connect.c b/lib/connect.c index 79a08e29a..5f23b79ca 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -83,11 +83,6 @@ #include "curl_memory.h" #include "memdebug.h" -#ifdef __SYMBIAN32__ -/* This isn't actually supported under Symbian OS */ -#undef SO_NOSIGPIPE -#endif - static bool verifyconnect(curl_socket_t sockfd, int *error); #if defined(__DragonFly__) || defined(HAVE_WINSOCK_H) diff --git a/lib/content_encoding.c b/lib/content_encoding.c index 2fc3d43c4..a6dce4880 100644 --- a/lib/content_encoding.c +++ b/lib/content_encoding.c @@ -28,10 +28,6 @@ #ifdef HAVE_ZLIB_H #include -#ifdef __SYMBIAN32__ -/* zlib pollutes the namespace with this definition */ -#undef WIN32 -#endif #endif #ifdef HAVE_BROTLI diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 276caaa26..3872dbb65 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -38,8 +38,7 @@ * Define WIN32 when build target is Win32 API */ -#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) && \ - !defined(__SYMBIAN32__) +#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) #define WIN32 #endif @@ -88,10 +87,6 @@ # include "config-amigaos.h" #endif -#ifdef __SYMBIAN32__ -# include "config-symbian.h" -#endif - #ifdef __OS400__ # include "config-os400.h" #endif diff --git a/lib/easy.c b/lib/easy.c index 87f9b0d99..453859d44 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -106,7 +106,6 @@ static long init_flags; # pragma warning(disable:4232) /* MSVC extension, dllimport identity */ #endif -#ifndef __SYMBIAN32__ /* * If a memory-using function (like curl_getenv) is used before * curl_global_init() is called, we need to have these pointers set already. @@ -119,17 +118,6 @@ curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc; #if defined(WIN32) && defined(UNICODE) curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)_wcsdup; #endif -#else -/* - * Symbian OS doesn't support initialization to code in writable static data. - * Initialization will occur in the curl_global_init() call. - */ -curl_malloc_callback Curl_cmalloc; -curl_free_callback Curl_cfree; -curl_realloc_callback Curl_crealloc; -curl_strdup_callback Curl_cstrdup; -curl_calloc_callback Curl_ccalloc; -#endif #if defined(_MSC_VER) && defined(_DLL) && !defined(__POCC__) # pragma warning(default:4232) /* MSVC extension, dllimport identity */ diff --git a/lib/file.c b/lib/file.c index c5ef6a195..1872dfef0 100644 --- a/lib/file.c +++ b/lib/file.c @@ -67,8 +67,7 @@ #include "curl_memory.h" #include "memdebug.h" -#if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || \ - defined(__SYMBIAN32__) +#if defined(WIN32) || defined(MSDOS) || defined(__EMX__) #define DOS_FILESYSTEM 1 #endif diff --git a/lib/urldata.h b/lib/urldata.h index 7bb172493..d0a0625cd 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -76,9 +76,7 @@ /* length of longest IPv6 address string including the trailing null */ #define MAX_IPADR_LEN sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") -/* Default FTP/IMAP etc response timeout in milliseconds. - Symbian OS panics when given a timeout much greater than 1/2 hour. -*/ +/* Default FTP/IMAP etc response timeout in milliseconds */ #define RESP_TIMEOUT (120*1000) /* Max string input length is a precaution against abuse and to detect junk @@ -1349,8 +1347,7 @@ struct UrlState { int httpversion; /* the lowest HTTP version*10 reported by any server involved in this request */ -#if !defined(WIN32) && !defined(MSDOS) && !defined(__EMX__) && \ - !defined(__SYMBIAN32__) +#if !defined(WIN32) && !defined(MSDOS) && !defined(__EMX__) /* do FTP line-end conversions on most platforms */ #define CURL_DO_LINEEND_CONV /* for FTP downloads: track CRLF sequences that span blocks */ diff --git a/lib/version.c b/lib/version.c index 0d68b2c4a..1214efa58 100644 --- a/lib/version.c +++ b/lib/version.c @@ -31,8 +31,8 @@ #include "curl_printf.h" #ifdef USE_ARES -# if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \ - (defined(WIN32) || defined(__SYMBIAN32__)) +# if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \ + defined(WIN32) # define CARES_STATICLIB # endif # include @@ -56,10 +56,6 @@ #ifdef HAVE_ZLIB_H #include -#ifdef __SYMBIAN32__ -/* zlib pollutes the namespace with this definition */ -#undef WIN32 -#endif #endif #ifdef HAVE_BROTLI diff --git a/packages/Makefile.am b/packages/Makefile.am index d8a92abbb..0fc585629 100644 --- a/packages/Makefile.am +++ b/packages/Makefile.am @@ -37,16 +37,6 @@ EXTRA_DIST = README \ OS400/makefile.sh \ OS400/os400sys.c \ OS400/os400sys.h \ - Symbian/bwins/libcurlu.def \ - Symbian/eabi/libcurlu.def \ - Symbian/group/bld.inf \ - Symbian/group/curl.iby \ - Symbian/group/curl.mmp \ - Symbian/group/curl.pkg \ - Symbian/group/libcurl.iby \ - Symbian/group/libcurl.mmp \ - Symbian/group/libcurl.pkg \ - Symbian/readme.txt \ TPF/curl.mak \ TPF/maketpf.env_curl \ TPF/maketpf.env_curllib \ diff --git a/packages/Symbian/bwins/libcurlu.def b/packages/Symbian/bwins/libcurlu.def deleted file mode 100644 index 7f30b7feb..000000000 --- a/packages/Symbian/bwins/libcurlu.def +++ /dev/null @@ -1,60 +0,0 @@ -EXPORTS - curl_easy_cleanup @ 1 NONAME - curl_easy_duphandle @ 2 NONAME - curl_easy_escape @ 3 NONAME - curl_easy_getinfo @ 4 NONAME - curl_easy_init @ 5 NONAME - curl_easy_pause @ 6 NONAME - curl_easy_perform @ 7 NONAME - curl_easy_reset @ 8 NONAME - curl_easy_setopt @ 9 NONAME - curl_easy_strerror @ 10 NONAME - curl_easy_unescape @ 11 NONAME - curl_escape @ 12 NONAME - curl_formadd @ 13 NONAME - curl_formfree @ 14 NONAME - curl_formget @ 15 NONAME - curl_free @ 16 NONAME - curl_getdate @ 17 NONAME - curl_getenv @ 18 NONAME - curl_global_cleanup @ 19 NONAME - curl_global_init @ 20 NONAME - curl_global_init_mem @ 21 NONAME - curl_maprintf @ 22 NONAME - curl_mfprintf @ 23 NONAME - curl_mprintf @ 24 NONAME - curl_msnprintf @ 25 NONAME - curl_msprintf @ 26 NONAME - curl_multi_add_handle @ 27 NONAME - curl_multi_assign @ 28 NONAME - curl_multi_cleanup @ 29 NONAME - curl_multi_fdset @ 30 NONAME - curl_multi_info_read @ 31 NONAME - curl_multi_init @ 32 NONAME - curl_multi_perform @ 33 NONAME - curl_multi_remove_handle @ 34 NONAME - curl_multi_setopt @ 35 NONAME - curl_multi_socket @ 36 NONAME - curl_multi_socket_action @ 37 NONAME - curl_multi_socket_all @ 38 NONAME - curl_multi_strerror @ 39 NONAME - curl_multi_timeout @ 40 NONAME - curl_mvaprintf @ 41 NONAME - curl_mvfprintf @ 42 NONAME - curl_mvprintf @ 43 NONAME - curl_mvsnprintf @ 44 NONAME - curl_mvsprintf @ 45 NONAME - curl_share_cleanup @ 46 NONAME - curl_share_init @ 47 NONAME - curl_share_setopt @ 48 NONAME - curl_share_strerror @ 49 NONAME - curl_slist_append @ 50 NONAME - curl_slist_free_all @ 51 NONAME - curl_strequal @ 52 NONAME - curl_strnequal @ 53 NONAME - curl_unescape @ 54 NONAME - curl_version @ 55 NONAME - curl_version_info @ 56 NONAME - curl_easy_recv @ 57 NONAME - curl_easy_send @ 58 NONAME - curl_multi_wait @ 59 NONAME diff --git a/packages/Symbian/eabi/libcurlu.def b/packages/Symbian/eabi/libcurlu.def deleted file mode 100644 index 7f30b7feb..000000000 --- a/packages/Symbian/eabi/libcurlu.def +++ /dev/null @@ -1,60 +0,0 @@ -EXPORTS - curl_easy_cleanup @ 1 NONAME - curl_easy_duphandle @ 2 NONAME - curl_easy_escape @ 3 NONAME - curl_easy_getinfo @ 4 NONAME - curl_easy_init @ 5 NONAME - curl_easy_pause @ 6 NONAME - curl_easy_perform @ 7 NONAME - curl_easy_reset @ 8 NONAME - curl_easy_setopt @ 9 NONAME - curl_easy_strerror @ 10 NONAME - curl_easy_unescape @ 11 NONAME - curl_escape @ 12 NONAME - curl_formadd @ 13 NONAME - curl_formfree @ 14 NONAME - curl_formget @ 15 NONAME - curl_free @ 16 NONAME - curl_getdate @ 17 NONAME - curl_getenv @ 18 NONAME - curl_global_cleanup @ 19 NONAME - curl_global_init @ 20 NONAME - curl_global_init_mem @ 21 NONAME - curl_maprintf @ 22 NONAME - curl_mfprintf @ 23 NONAME - curl_mprintf @ 24 NONAME - curl_msnprintf @ 25 NONAME - curl_msprintf @ 26 NONAME - curl_multi_add_handle @ 27 NONAME - curl_multi_assign @ 28 NONAME - curl_multi_cleanup @ 29 NONAME - curl_multi_fdset @ 30 NONAME - curl_multi_info_read @ 31 NONAME - curl_multi_init @ 32 NONAME - curl_multi_perform @ 33 NONAME - curl_multi_remove_handle @ 34 NONAME - curl_multi_setopt @ 35 NONAME - curl_multi_socket @ 36 NONAME - curl_multi_socket_action @ 37 NONAME - curl_multi_socket_all @ 38 NONAME - curl_multi_strerror @ 39 NONAME - curl_multi_timeout @ 40 NONAME - curl_mvaprintf @ 41 NONAME - curl_mvfprintf @ 42 NONAME - curl_mvprintf @ 43 NONAME - curl_mvsnprintf @ 44 NONAME - curl_mvsprintf @ 45 NONAME - curl_share_cleanup @ 46 NONAME - curl_share_init @ 47 NONAME - curl_share_setopt @ 48 NONAME - curl_share_strerror @ 49 NONAME - curl_slist_append @ 50 NONAME - curl_slist_free_all @ 51 NONAME - curl_strequal @ 52 NONAME - curl_strnequal @ 53 NONAME - curl_unescape @ 54 NONAME - curl_version @ 55 NONAME - curl_version_info @ 56 NONAME - curl_easy_recv @ 57 NONAME - curl_easy_send @ 58 NONAME - curl_multi_wait @ 59 NONAME diff --git a/packages/Symbian/group/bld.inf b/packages/Symbian/group/bld.inf deleted file mode 100644 index 354a84382..000000000 --- a/packages/Symbian/group/bld.inf +++ /dev/null @@ -1,10 +0,0 @@ -// -// libcurl and curl bld.inf file for Symbian OS -// -PRJ_EXPORTS - libcurl.iby /epoc32/rom/include/libcurl.iby - curl.iby /epoc32/rom/include/curl.iby - -PRJ_MMPFILES - libcurl.mmp - curl.mmp diff --git a/packages/Symbian/group/curl.iby b/packages/Symbian/group/curl.iby deleted file mode 100644 index 7921aaa07..000000000 --- a/packages/Symbian/group/curl.iby +++ /dev/null @@ -1,15 +0,0 @@ -// -// curl file transfer utility command-line utility -// -// Use this file with buildrom to add curl to a device ROM -// - -#ifndef CURL_IBY -#define CURL_IBY - -#include -#include - -file=ABI_DIR\BUILD_DIR\curl.exe \sys\bin\curl.exe - -#endif // CURL_IBY diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp deleted file mode 100644 index 361e0a620..000000000 --- a/packages/Symbian/group/curl.mmp +++ /dev/null @@ -1,64 +0,0 @@ -// -// curl network retrieval client -// - -TARGET curl.exe -TARGETTYPE exe -UID 0x00000000 0xF0206442 - -SOURCEPATH ../../../src -SOURCE \ - tool_binmode.c \ - tool_bname.c \ - tool_cb_dbg.c \ - tool_cb_hdr.c \ - tool_cb_prg.c \ - tool_cb_rea.c \ - tool_cb_see.c \ - tool_cb_wrt.c \ - tool_cfgable.c \ - tool_convert.c \ - tool_dirhie.c \ - tool_doswin.c \ - tool_easysrc.c \ - tool_formparse.c \ - tool_getparam.c \ - tool_getpass.c \ - tool_help.c \ - tool_helpers.c \ - tool_homedir.c \ - tool_hugehelp.c \ - tool_libinfo.c \ - tool_main.c \ - tool_metalink.c \ - tool_mfiles.c \ - tool_msgs.c \ - tool_operate.c \ - tool_operhlp.c \ - tool_panykey.c \ - tool_paramhlp.c \ - tool_parsecfg.c \ - tool_setopt.c \ - tool_sleep.c \ - tool_urlglob.c \ - tool_util.c \ - tool_vms.c \ - tool_writeenv.c \ - tool_writeout.c \ - tool_writeout_json.c \ - tool_xattr.c - -SOURCEPATH ../../../lib -SOURCE \ - strcase.c nonblock.c - -USERINCLUDE ../../../src ../../../lib ../../../include/curl - -SYSTEMINCLUDE ../../../include /epoc32/include /epoc32/include/stdapis - -LIBRARY euser.lib libc.lib libcurl.lib -STATICLIBRARY libcrt0.lib - -CAPABILITY NetworkServices - -EPOCSTACKSIZE 0x8000 diff --git a/packages/Symbian/group/curl.pkg b/packages/Symbian/group/curl.pkg deleted file mode 100644 index 17c64f1e0..000000000 --- a/packages/Symbian/group/curl.pkg +++ /dev/null @@ -1,26 +0,0 @@ -; curl package definition file -; Use with makesis to create a Symbian .sis package - -;Language - standard language definitions -&EN - -;Header - standard sis file header including version number -;Version scheme: curl's major, curl's minor, curl's subminor*100 + build number -; e.g. The third Symbian package of curl ver. 7.20.1 would have a SIS package -; version of 7, 20, 103 -#{"curl"}, (0xF0206442), 7, 20, , TYPE=SA - -; Vendor name -%{"curl project"} -:"curl project" - -; Embedded component -@"libcurl.sis",(0xF0206D00) - -; A dependency on P.I.P.S. and the stdio server are probably good to have here -;(0x20009A80), *, *, *, {"Open C Standard Libraries"} -;(0x20009A81), *, *, *, {"P.I.P.S. for UIQ 3"} -;(0x20009AA2), *, *, *, {"Symbian OS STDIOSERVER"} - -;Files - standard file specifications -"\epoc32\release\armv5\urel\curl.exe" - "$:\sys\bin\curl.exe" diff --git a/packages/Symbian/group/libcurl.iby b/packages/Symbian/group/libcurl.iby deleted file mode 100644 index 373f5b37d..000000000 --- a/packages/Symbian/group/libcurl.iby +++ /dev/null @@ -1,14 +0,0 @@ -// -// libcurl file transfer DLL -// -// Use this file with buildrom to add libcurl to a device ROM -// - -#ifndef LIBCURL_IBY -#define LIBCURL_IBY - -#include - -file=ABI_DIR\BUILD_DIR\libcurl.dll \sys\bin\libcurl.dll - -#endif // LIBCURL_IBY diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp deleted file mode 100644 index 19eeb69b3..000000000 --- a/packages/Symbian/group/libcurl.mmp +++ /dev/null @@ -1,67 +0,0 @@ -// -// libcurl.dll curl network retrieval client library -// - -// Build-time options (uncomment these to enable) -#define ENABLE_ZLIB // Enable gzip/deflate decompression -//#define ENABLE_SSL // Enable SSL for HTTPS/FTPS (requires S60 Open C SDK) - -TARGET libcurl.dll -TARGETTYPE dll -UID 0x1000008d 0xF0206D00 - -MACRO BUILDING_LIBCURL - -#ifdef ENABLE_ZLIB -MACRO HAVE_LIBZ -#endif -#ifdef ENABLE_SSL -MACRO USE_OPENSSL -#endif - -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 vtls/openssl.c version.c getenv.c escape.c mprintf.c telnet.c \ - netrc.c getinfo.c transfer.c strequal.c easy.c krb4.c \ - curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.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 md4.c md5.c curl_rand.c \ - http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \ - hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \ - select.c vtls/gtls.c vtls/vtls.c tftp.c splay.c strdup.c socks.c \ - ssh.c vtls/nss.c strcase.c curl_addrinfo.c socks_gssapi.c \ - socks_sspi.c curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c \ - pop3.c smtp.c pingpong.c rtsp.c curl_threads.c warnless.c hmac.c \ - curl_rtmp.c openldap.c curl_gethostname.c gopher.c \ - idn_win32.c vtls/cyassl.c http_proxy.c non-ascii.c \ - asyn-ares.c asyn-thread.c curl_gssapi.c http_ntlm.c curl_ntlm_wb.c \ - curl_ntlm_core.c curl_sasl.c vtls/schannel.c curl_multibyte.c \ - conncache.c curl_sasl_sspi.c smb.c curl_endian.c \ - curl_des.c curl_range.c system_win32.c sha256.c \ - vauth/vauth.c vauth/cleartext.c vauth/cram.c vauth/digest.c \ - vauth/digest_sspi.c vauth/krb5_gssapi.c vauth/krb5_sspi.c \ - vauth/ntlm.c vauth/ntlm_sspi.c vauth/oauth2.c vauth/spnego_gssapi.c \ - vauth/spnego_sspi.c - -USERINCLUDE ../../../lib ../../../include/curl -#ifdef ENABLE_SSL -SYSTEMINCLUDE /epoc32/include/osextensions/stdapis -// Older versions of the SDK need this instead: -//USERINCLUDE /epoc32/include/stdapis/openssl -#endif - -SYSTEMINCLUDE ../../../include /epoc32/include/stdapis /epoc32/include - -LIBRARY euser.lib libc.lib -#ifdef ENABLE_ZLIB -LIBRARY ezlib.lib -#endif -#ifdef ENABLE_SSL -LIBRARY libssl.lib libcrypto.lib -#endif - -CAPABILITY NetworkServices - -EPOCALLOWDLLDATA diff --git a/packages/Symbian/group/libcurl.pkg b/packages/Symbian/group/libcurl.pkg deleted file mode 100644 index 6b0479753..000000000 --- a/packages/Symbian/group/libcurl.pkg +++ /dev/null @@ -1,22 +0,0 @@ -; libcurl package definition file -; Use with makesis to create a Symbian .sis package - -;Language - standard language definitions -&EN - -;Header - standard sis file header including version number -;Version scheme: curl's major, curl's minor, curl's subminor*100 + build number -; e.g. The third Symbian package of curl ver. 7.20.1 would have a SIS package -; version of 7, 20, 103 -#{"libcurl"}, (0xF0206D00), 7, 20, , TYPE=SA - -; Vendor name -%{"curl project"} -:"curl project" - -; A dependency on P.I.P.S. is probably a good idea to add here -;(0x20009A80), *, *, *, {"Open C Standard Libraries"} -;(0x20009A81), *, *, *, {"P.I.P.S. for UIQ 3"} - -;Files - standard file specifications -"\epoc32\release\armv5\urel\libcurl.dll" - "$:\sys\bin\libcurl.dll" diff --git a/packages/Symbian/readme.txt b/packages/Symbian/readme.txt deleted file mode 100644 index d6312fbe3..000000000 --- a/packages/Symbian/readme.txt +++ /dev/null @@ -1,93 +0,0 @@ -Curl on Symbian OS -================== -This is a basic port of curl and libcurl to Symbian OS. The port is -a straightforward one using Symbian's P.I.P.S. POSIX compatibility -layer, which was first available for OS version 9.1. A more complete -port would involve writing a Symbian C++ binding, or wrapping libcurl -as a Symbian application server with a C++ API to handle requests -from client applications as well as creating a GUI application to allow -file transfers. The author has no current plans to do so. - -This means that integration with standard Symbian OS programs can be -tricky, since libcurl isn't designed with Symbian's native asynchronous -message passing idioms in mind. However, it may be possible to use libcurl -in an active object-based application through libcurl's multi interface. -The port is most easily used when porting POSIX applications to Symbian -OS using P.I.P.S. (a.k.a. Open C). - -libcurl is built as a standard Symbian ordinal-linked DLL, and curl is -built as a text mode EXE application. They have not been Symbian -Signed, which is required in order to install them on most phones. - -Following are some things to keep in mind when using this port. - - -curl notes ----------- -When starting curl in the Windows emulator from the Windows command-line, -place a double-dash -- before the first curl command-line option. -e.g. \epoc32\release\winscw\udeb\curl -- -v http://localhost/ -Failure to do so may mean that some of your options won't be correctly -processed. - -Symbian's ESHELL allows for redirecting stdin and stdout to files, but -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 from -the shell, so relative path names are always relative to -C:\Private\f0206442\. - -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. It also -line buffers keyboard input so interactive telnet sessions are not very -feasible. - -All screen output disappears after curl exits, so after a command completes, -curl waits by default for Enter to be pressed before exiting. This behaviour -is suppressed when the -s option is given. - -curl's "home directory" in Symbian is C:\Private\f0206442\. The .curlrc file -is read from this directory on startup. - - -libcurl notes -------------- -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 (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. This should not be -an issue once support for CURLRES_THREADED is added for Symbian. - -P.I.P.S. causes a USER:87 panic if certain timeouts much longer than -half an hour are selected. - -LDAP, SCP or SFTP methods are not supported due to lack of support for -the dependent libraries on Symbian. - -gzip and deflate decompression is supported when the appropriate macro -is uncommented in the libcurl.mmp file. - -SSL/TLS encryption is not enabled by default, but it is possible to add -when the OpenSSL libraries included in the S60 Open C SDK are available. -The appropriate macro in the libcurl.mmp file must be uncommented to -enable support. - -NTLM authentication may not work on some servers due to the lack of -MD4 support in the OpenSSL libraries included with Open C. - -Debug builds are not supported (i.e. --enable-debug) because they cause -additional symbol exports in the library which are not frozen in the .def -files. - - -Dan Fandrich -dan@coneharvesters.com -March 2010 diff --git a/scripts/copyright.pl b/scripts/copyright.pl index c8a4a3895..3a3075c40 100755 --- a/scripts/copyright.pl +++ b/scripts/copyright.pl @@ -63,17 +63,6 @@ my @skiplist=( '^lib\/libcurl.plist', '^lib\/libcurl.vers.in', - # symbian build files we know little about - '^packages\/Symbian\/bwins\/libcurlu.def', - '^packages\/Symbian\/eabi\/libcurlu.def', - '^packages\/Symbian\/group\/bld.inf', - '^packages\/Symbian\/group\/curl.iby', - '^packages\/Symbian\/group\/curl.mmp', - '^packages\/Symbian\/group\/curl.pkg', - '^packages\/Symbian\/group\/libcurl.iby', - '^packages\/Symbian\/group\/libcurl.mmp', - '^packages\/Symbian\/group\/libcurl.pkg', - # vms files '^packages\/vms\/build_vms.com', '^packages\/vms\/curl_release_note_start.txt', diff --git a/src/tool_getpass.c b/src/tool_getpass.c index d3bd4e688..35e7c73b3 100644 --- a/src/tool_getpass.c +++ b/src/tool_getpass.c @@ -100,11 +100,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) #define DONE #endif /* __VMS */ -#ifdef __SYMBIAN32__ -# define getch() getchar() -#endif - -#if defined(WIN32) || defined(__SYMBIAN32__) +#if defined(WIN32) char *getpass_r(const char *prompt, char *buffer, size_t buflen) { @@ -123,10 +119,8 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) previous one as well */ i = i - (i >= 1 ? 2 : 1); } -#ifndef __SYMBIAN32__ /* since echo is disabled, print a newline */ fputs("\n", stderr); -#endif /* if user didn't hit ENTER, terminate buffer */ if(i == buflen) buffer[buflen-1] = '\0'; @@ -134,7 +128,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) return buffer; /* we always return success */ } #define DONE -#endif /* WIN32 || __SYMBIAN32__ */ +#endif /* WIN32 */ #ifdef NETWARE /* NetWare implementation */ diff --git a/src/tool_help.c b/src/tool_help.c index a67e4bc85..4955a52c3 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -830,10 +830,6 @@ static const struct helptxt helptext[] = { # define PRINT_LINES_PAUSE 23 #endif -#ifdef __SYMBIAN32__ -# define PRINT_LINES_PAUSE 16 -#endif - struct feat { const char *name; int bitmask; diff --git a/src/tool_main.c b/src/tool_main.c index ccf098e94..b60454675 100644 --- a/src/tool_main.c +++ b/src/tool_main.c @@ -322,11 +322,6 @@ int main(int argc, char *argv[]) /* Start our curl operation */ result = operate(&global, argc, argv); -#ifdef __SYMBIAN32__ - if(global.showerror) - tool_pressanykey(); -#endif - /* Perform the main cleanup */ main_free(&global); } diff --git a/src/tool_panykey.c b/src/tool_panykey.c index 7c519028a..e7ee99518 100644 --- a/src/tool_panykey.c +++ b/src/tool_panykey.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#if defined(__SYMBIAN32__) || defined(NETWARE) +#if defined(NETWARE) #ifdef NETWARE # ifdef __NOVELL_LIBC__ @@ -37,11 +37,9 @@ void tool_pressanykey(void) { -#if defined(__SYMBIAN32__) - getchar(); -#elif defined(NETWARE) +#if defined(NETWARE) pressanykey(); #endif } -#endif /* __SYMBIAN32__ || NETWARE */ +#endif /* NETWARE */ diff --git a/src/tool_panykey.h b/src/tool_panykey.h index e5c6f3930..2e8846ced 100644 --- a/src/tool_panykey.h +++ b/src/tool_panykey.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -23,14 +23,10 @@ ***************************************************************************/ #include "tool_setup.h" -#if defined(__SYMBIAN32__) || defined(NETWARE) - +#if defined(NETWARE) void tool_pressanykey(void); - #else - #define tool_pressanykey() Curl_nop_stmt - #endif #endif /* HEADER_CURL_TOOL_PANYKEY_H */ diff --git a/tests/libtest/sethostname.h b/tests/libtest/sethostname.h index 64624e846..c61e4100e 100644 --- a/tests/libtest/sethostname.h +++ b/tests/libtest/sethostname.h @@ -22,7 +22,7 @@ #ifdef CURL_STATICLIB # define LIBHOSTNAME_EXTERN -#elif defined(WIN32) || defined(__SYMBIAN32__) +#elif defined(WIN32) # define LIBHOSTNAME_EXTERN __declspec(dllexport) #elif defined(CURL_HIDDEN_SYMBOLS) # define LIBHOSTNAME_EXTERN CURL_EXTERN_SYMBOL -- cgit v1.2.1