From: Daniel Gustafsson Date: Wed, 23 Nov 2022 10:56:52 +0000 (+0100) Subject: netware: remove leftover traces X-Git-Tag: curl-7_87_0~120 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d9fee450427bf20284278022f829f7cf3c05d21;p=thirdparty%2Fcurl.git netware: remove leftover traces Commit 3b16575ae938dec2a29454631a12aa52b6ab9c67 removed support for building on Novell Netware, but a few leftover traces remained. This removes the last bits. Closes: #9966 Reviewed-by: Daniel Stenberg --- diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index 993222b83c..4436da3c4d 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -47,11 +47,6 @@ #include #endif -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long -#endif - #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c index 3524ada584..705f0f612a 100644 --- a/lib/asyn-thread.c +++ b/lib/asyn-thread.c @@ -48,11 +48,6 @@ # include #endif -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long -#endif - #ifdef HAVE_GETADDRINFO # define RESOLVER_ENOMEM EAI_MEMORY #else diff --git a/lib/connect.c b/lib/connect.c index 5404243c9e..eed30680f1 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -48,13 +48,6 @@ #include #endif -#if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE)) -#include -#endif -#ifdef NETWARE -#undef in_addr_t -#define in_addr_t unsigned long -#endif #ifdef __VMS #include #include diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index 72e778b34e..bcea883564 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -47,11 +47,6 @@ # include #endif -#if defined(NETWARE) && defined(__NOVELL_LIBC__) -# undef in_addr_t -# define in_addr_t unsigned long -#endif - #include #include "curl_addrinfo.h" diff --git a/lib/ftp.c b/lib/ftp.c index 42df31252a..f72d803bb1 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -43,11 +43,6 @@ #include #endif -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long -#endif - #include #include "urldata.h" #include "sendf.h" diff --git a/lib/hostip.h b/lib/hostip.h index 9d3170737c..3b1d814dab 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -34,11 +34,6 @@ #include #endif -#ifdef NETWARE -#undef in_addr_t -#define in_addr_t unsigned long -#endif - /* Allocate enough memory to hold the full name information structs and * everything. OSF1 is known to require at least 8872 bytes. The buffer * required for storing all possible aliases and IP numbers is according to diff --git a/lib/imap.c b/lib/imap.c index 60aa426c8e..76012e02af 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -56,11 +56,6 @@ #include #endif -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long -#endif - #include #include "urldata.h" #include "sendf.h" diff --git a/lib/nonblock.c b/lib/nonblock.c index ce73af31c1..8447b6f423 100644 --- a/lib/nonblock.c +++ b/lib/nonblock.c @@ -31,9 +31,6 @@ #include #endif -#if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE)) -#include -#endif #ifdef __VMS #include #include diff --git a/lib/pop3.c b/lib/pop3.c index a75b762c45..b45f867fbc 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -58,11 +58,6 @@ #include #endif -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long -#endif - #include #include "urldata.h" #include "sendf.h" diff --git a/lib/smtp.c b/lib/smtp.c index ef59adce4e..36f07ebadd 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -60,11 +60,6 @@ #include #endif -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long -#endif - #include #include "urldata.h" #include "sendf.h" diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c index c10fa6caaf..0141e173fd 100644 --- a/lib/vauth/ntlm.c +++ b/lib/vauth/ntlm.c @@ -88,8 +88,6 @@ static void ntlm_print_flags(FILE *handle, unsigned long flags) fprintf(handle, "NTLMFLAG_NEGOTIATE_DATAGRAM_STYLE "); if(flags & NTLMFLAG_NEGOTIATE_LM_KEY) fprintf(handle, "NTLMFLAG_NEGOTIATE_LM_KEY "); - if(flags & NTLMFLAG_NEGOTIATE_NETWARE) - fprintf(handle, "NTLMFLAG_NEGOTIATE_NETWARE "); if(flags & NTLMFLAG_NEGOTIATE_NTLM_KEY) fprintf(handle, "NTLMFLAG_NEGOTIATE_NTLM_KEY "); if(flags & (1<<10)) diff --git a/lib/vauth/ntlm.h b/lib/vauth/ntlm.h index 4dfda55453..14ebba2440 100644 --- a/lib/vauth/ntlm.h +++ b/lib/vauth/ntlm.h @@ -64,9 +64,6 @@ /* Indicates that the LAN Manager session key should be used for signing and sealing authenticated communications. */ -#define NTLMFLAG_NEGOTIATE_NETWARE (1<<8) -/* unknown purpose */ - #define NTLMFLAG_NEGOTIATE_NTLM_KEY (1<<9) /* Indicates that NTLM authentication is being used. */ diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c index 43fb804b0a..d9fa58acf8 100644 --- a/lib/vssh/libssh.c +++ b/lib/vssh/libssh.c @@ -51,11 +51,6 @@ #include #endif -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long -#endif - #include #include "urldata.h" #include "sendf.h" diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c index d3d266a4c6..d23926dbc0 100644 --- a/lib/vssh/libssh2.c +++ b/lib/vssh/libssh2.c @@ -54,11 +54,6 @@ #include #endif -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long -#endif - #include #include "urldata.h" #include "sendf.h" diff --git a/packages/vms/gnv_link_curl.com b/packages/vms/gnv_link_curl.com index 6e84229b46..66cfcfd5ee 100644 --- a/packages/vms/gnv_link_curl.com +++ b/packages/vms/gnv_link_curl.com @@ -412,7 +412,7 @@ $ link'ldebug'/exe=[.src]curl.exe/dsf=[.src]curl.dsf - [.src]curl-tool_hugehelp.o, [.src]curl-tool_libinfo.o, - [.src]curl-tool_mfiles.o, - [.src]curl-tool_msgs.o, [.src]curl-tool_operate.o, - - [.src]curl-tool_operhlp.o, [.src]curl-tool_panykey.o, - + [.src]curl-tool_operhlp.o, - [.src]curl-tool_paramhlp.o, [.src]curl-tool_parsecfg.o, - [.src]curl-tool_setopt.o, [.src]curl-tool_sleep.o, - [.src]curl-tool_urlglob.o, [.src]curl-tool_util.o, - diff --git a/src/Makefile.inc b/src/Makefile.inc index bdf663f950..cc5304bc9c 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -79,7 +79,6 @@ CURL_CFILES = \ tool_msgs.c \ tool_operate.c \ tool_operhlp.c \ - tool_panykey.c \ tool_paramhlp.c \ tool_parsecfg.c \ tool_progress.c \ @@ -120,7 +119,6 @@ CURL_HFILES = \ tool_msgs.h \ tool_operate.h \ tool_operhlp.h \ - tool_panykey.h \ tool_paramhlp.h \ tool_parsecfg.h \ tool_progress.h \ diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c index 1b6ac17480..d80623e25e 100644 --- a/src/tool_dirhie.c +++ b/src/tool_dirhie.c @@ -37,12 +37,6 @@ #include "memdebug.h" /* keep this as LAST include */ -#ifdef NETWARE -# ifndef __NOVELL_LIBC__ -# define mkdir mkdir_510 -# endif -#endif - #if defined(WIN32) || (defined(MSDOS) && !defined(__DJGPP__)) # define mkdir(x,y) (mkdir)((x)) # ifndef F_OK diff --git a/src/tool_getpass.c b/src/tool_getpass.c index c959c5a525..3778e1f006 100644 --- a/src/tool_getpass.c +++ b/src/tool_getpass.c @@ -50,14 +50,6 @@ # include #endif -#ifdef NETWARE -# ifdef __NOVELL_LIBC__ -# include -# else -# include -# endif -#endif - #ifdef HAVE_UNISTD_H #include #endif @@ -132,45 +124,6 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) #define DONE #endif /* WIN32 */ -#ifdef NETWARE -/* NetWare implementation */ -#ifdef __NOVELL_LIBC__ -char *getpass_r(const char *prompt, char *buffer, size_t buflen) -{ - return getpassword(prompt, buffer, buflen); -} -#else -char *getpass_r(const char *prompt, char *buffer, size_t buflen) -{ - size_t i = 0; - - printf("%s", prompt); - do { - buffer[i++] = getch(); - if(buffer[i-1] == '\b') { - /* remove this letter and if this is not the first key, - remove the previous one as well */ - if(i > 1) { - printf("\b \b"); - i = i - 2; - } - else { - RingTheBell(); - i = i - 1; - } - } - else if(buffer[i-1] != 13) - putchar('*'); - - } while((buffer[i-1] != 13) && (i < buflen)); - buffer[i-1] = '\0'; - printf("\r\n"); - return buffer; -} -#endif /* __NOVELL_LIBC__ */ -#define DONE -#endif /* NETWARE */ - #ifndef DONE /* not previously provided */ #ifdef HAVE_TERMIOS_H diff --git a/src/tool_help.c b/src/tool_help.c index e25917f57a..ae51f635e2 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -26,7 +26,6 @@ /* use our own printf() functions */ #include "curlx.h" -#include "tool_panykey.h" #include "tool_help.h" #include "tool_libinfo.h" #include "tool_util.h" diff --git a/src/tool_main.c b/src/tool_main.c index 434979dea3..4183fd851d 100644 --- a/src/tool_main.c +++ b/src/tool_main.c @@ -50,7 +50,6 @@ #include "tool_doswin.h" #include "tool_msgs.h" #include "tool_operate.h" -#include "tool_panykey.h" #include "tool_vms.h" #include "tool_main.h" #include "tool_libinfo.h" @@ -292,11 +291,6 @@ int main(int argc, char *argv[]) fflush(NULL); #endif -#ifdef __NOVELL_LIBC__ - if(!getenv("_IN_NETWARE_BASH_")) - tool_pressanykey(); -#endif - #ifdef __VMS vms_special_exit(result, vms_show); #else diff --git a/src/tool_panykey.c b/src/tool_panykey.c deleted file mode 100644 index 81feaba7e8..0000000000 --- a/src/tool_panykey.c +++ /dev/null @@ -1,47 +0,0 @@ -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2022, 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.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. - * - * SPDX-License-Identifier: curl - * - ***************************************************************************/ -#include "tool_setup.h" - -#if defined(NETWARE) - -#ifdef NETWARE -# ifdef __NOVELL_LIBC__ -# include -# else -# include -# endif -#endif - -#include "tool_panykey.h" - -#include "memdebug.h" /* keep this as LAST include */ - -void tool_pressanykey(void) -{ -#if defined(NETWARE) - pressanykey(); -#endif -} - -#endif /* NETWARE */ diff --git a/src/tool_panykey.h b/src/tool_panykey.h deleted file mode 100644 index c5cc322606..0000000000 --- a/src/tool_panykey.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef HEADER_CURL_TOOL_PANYKEY_H -#define HEADER_CURL_TOOL_PANYKEY_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2022, 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.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. - * - * SPDX-License-Identifier: curl - * - ***************************************************************************/ -#include "tool_setup.h" - -#if defined(NETWARE) -void tool_pressanykey(void); -#else -#define tool_pressanykey() Curl_nop_stmt -#endif - -#endif /* HEADER_CURL_TOOL_PANYKEY_H */