summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Gustafsson <daniel@yesql.se>2022-11-23 11:56:52 +0100
committerDaniel Gustafsson <daniel@yesql.se>2022-11-23 11:56:52 +0100
commit2d9fee450427bf20284278022f829f7cf3c05d21 (patch)
tree48c7ddef546edf0965cfa093e6e4aeff40541460 /src
parente007ace30de6e6f29cf887aa389cf5220a3f588e (diff)
downloadcurl-2d9fee450427bf20284278022f829f7cf3c05d21.tar.gz
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>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.inc2
-rw-r--r--src/tool_dirhie.c6
-rw-r--r--src/tool_getpass.c47
-rw-r--r--src/tool_help.c1
-rw-r--r--src/tool_main.c6
-rw-r--r--src/tool_panykey.c47
-rw-r--r--src/tool_panykey.h34
7 files changed, 0 insertions, 143 deletions
diff --git a/src/Makefile.inc b/src/Makefile.inc
index bdf663f95..cc5304bc9 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 1b6ac1748..d80623e25 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 c959c5a52..3778e1f00 100644
--- 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 e25917f57..ae51f635e 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 434979dea..4183fd851 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 81feaba7e..000000000
--- 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
index c5cc32260..000000000
--- 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 */