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 <daniel@haxx.se>

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 993222b83cc6de85086de56f74630c622f1590a0..4436da3c4d1bf0892355cda8b574e699711ab457 100644 (file)
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -47,11 +47,6 @@
 #include <inet.h>
 #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 3524ada584fbb48447f5d36d6f11e3e410d610af..705f0f612ae7f11b477978c1372437b99820615f 100644 (file)
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -48,11 +48,6 @@
 #  include <pthread.h>
 #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 5404243c9ed3c4ea0b38756a8213a2074e184938..eed30680f181c6434bd3523a2bb546901196b046 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -48,13 +48,6 @@
 #include <arpa/inet.h>
 #endif
 
-#if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE))
-#include <sys/filio.h>
-#endif
-#ifdef NETWARE
-#undef in_addr_t
-#define in_addr_t unsigned long
-#endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 72e778b34e333796a67dfdf57224912096e36d13..bcea8835643d961e694e3fcf952a8ae4325ba0e8 100644 (file)
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -47,11 +47,6 @@
 #  include <inet.h>
 #endif
 
-#if defined(NETWARE) && defined(__NOVELL_LIBC__)
-#  undef  in_addr_t
-#  define in_addr_t unsigned long
-#endif
-
 #include <stddef.h>
 
 #include "curl_addrinfo.h"

diff --git a/lib/ftp.c b/lib/ftp.c
index 42df31252a0f3a30d0afbd624f1597e276e8f08b..f72d803bb1ee38d8bbe6b2c49bc8135f24ba9ca2 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -43,11 +43,6 @@
 #include <inet.h>
 #endif
 
-#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
-#undef in_addr_t
-#define in_addr_t unsigned long
-#endif
-
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"

diff --git a/lib/hostip.h b/lib/hostip.h
index 9d3170737c03cd19fce85f46a43f5ec92ccb7d9c..3b1d814dab47d46295705a002d1856fbb94eaebb 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -34,11 +34,6 @@
 #include <setjmp.h>
 #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 60aa426c8e1fd53272588399b488cec584114f22..76012e02af94a2dfe65049ebed1163056fa87717 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -56,11 +56,6 @@
 #include <inet.h>
 #endif
 
-#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
-#undef in_addr_t
-#define in_addr_t unsigned long
-#endif
-
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"

diff --git a/lib/nonblock.c b/lib/nonblock.c
index ce73af31c195762d6b981f151ab94c75b5466976..8447b6f42342b027600e20c60631bfa7cb2594cc 100644 (file)
--- a/lib/nonblock.c
+++ b/lib/nonblock.c
@@ -31,9 +31,6 @@
 #include <fcntl.h>
 #endif
 
-#if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE))
-#include <sys/filio.h>
-#endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>

diff --git a/lib/pop3.c b/lib/pop3.c
index a75b762c45714b588b9effb5e3600086554482e6..b45f867fbc8446ead46a7450708e907fbe6023b7 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -58,11 +58,6 @@
 #include <inet.h>
 #endif
 
-#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
-#undef in_addr_t
-#define in_addr_t unsigned long
-#endif
-
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"

diff --git a/lib/smtp.c b/lib/smtp.c
index ef59adce4ed370b24268f62c678131a890ab67e4..36f07ebadd4a56150c35e0421453dcbb71410767 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -60,11 +60,6 @@
 #include <inet.h>
 #endif
 
-#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
-#undef in_addr_t
-#define in_addr_t unsigned long
-#endif
-
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"

diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
index c10fa6caafc72412bc3d58529cda304f80c944ee..0141e173fd9a6f3b04a49f941cfb419549ab78cf 100644 (file)
--- 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 4dfda554536774265efeb99b5159af8d00cc7881..14ebba244091caf567bbb21b21758413361480ed 100644 (file)
--- 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 43fb804b0a92d37fdab3e3da82312b26cb7e16e6..d9fa58acf89fe4b26b4de24dd86bd7826c103884 100644 (file)
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -51,11 +51,6 @@
 #include <inet.h>
 #endif
 
-#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
-#undef in_addr_t
-#define in_addr_t unsigned long
-#endif
-
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"

diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index d3d266a4c6710362d232b26f28c4c3156cd7c044..d23926dbc07b281fdc5f60b2765bc70b56b2c4ee 100644 (file)
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -54,11 +54,6 @@
 #include <inet.h>
 #endif
 
-#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
-#undef in_addr_t
-#define in_addr_t unsigned long
-#endif
-
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"

diff --git a/packages/vms/gnv_link_curl.com b/packages/vms/gnv_link_curl.com
index 6e84229b465acf4414f4508f2cd98911085578d8..66cfcfd5eeeb7653227621e56935131f82eabe1a 100644 (file)
--- 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 bdf663f9504fdab17abcbaaabab4a48237fcb4d2..cc5304bc9cee7b0a7b3530965bc365db36effe2d 100644 (file)
--- 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 1b6ac17480f1532f4ac475519224293afdd2b1cc..d80623e25ea58cccdada69ba434b59245cf8c036 100644 (file)
--- 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 c959c5a5258fc39e251dd7c88e131cde393ad290..3778e1f0069b9440a0580302b422078ff93d47e5 100644 (file)
--- a/src/tool_getpass.c
+++ b/src/tool_getpass.c
@@ -50,14 +50,6 @@
 #  include <conio.h>
 #endif
 
-#ifdef NETWARE
-#  ifdef __NOVELL_LIBC__
-#    include <screen.h>
-#  else
-#    include <nwconio.h>
-#  endif
-#endif
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #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 e25917f57a115b08d01c069090da395202093e3b..ae51f635e256951b80cc81b970f70cdf34c1468d 100644 (file)
--- 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 434979dea3de5767f5927de7a3c77331b73bd6d6..4183fd851d342e2527282ab8ac63a76fbdcc6d58 100644 (file)
--- 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 (file)
index 81feaba..0000000
--- a/src/tool_panykey.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, 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 <screen.h>
-#  else
-#    include <nwconio.h>
-#  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 (file)
index c5cc322..0000000
--- 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, <daniel@haxx.se>, 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 */