Description: revert usage of buggy and non-free linenoise-ng
 Revert linenoise-ng usage to readline.
Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Forwarded: not-needed
Last-Update: 2024-10-19

---

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -629,7 +629,7 @@ resid_libs = @RESID_LIBS@
 resid_dtv_libs = @RESID_DTV_LIBS@
 
 # external libraries required for all emulators
-emu_extlibs = @UI_LIBS@ @SDL_EXTRA_LIBS@ @SOUND_LIBS@ @JOY_LIBS@ @GFXOUTPUT_LIBS@ @ZLIB_LIBS@ @DYNLIB_LIBS@ @ARCH_LIBS@ $(archdep_lib) $(linenoise_ng_lib)
+emu_extlibs = @UI_LIBS@ @SDL_EXTRA_LIBS@ @SOUND_LIBS@ @JOY_LIBS@ @GFXOUTPUT_LIBS@ @ZLIB_LIBS@ @DYNLIB_LIBS@ @ARCH_LIBS@ $(archdep_lib)
 
 driver_libs = $(joyport_lib) $(samplerdrv_lib) $(sounddrv_lib) $(mididrv_lib) $(socketdrv_lib) $(hwsiddrv_lib) $(gfxoutputdrv_lib) $(printerdrv_lib) $(rs232drv_lib) $(diskimage_lib) $(fsdevice_lib) $(tape_lib) $(fileio_lib) $(serial_lib) $(core_lib)
 
@@ -1230,7 +1230,6 @@ c1541_libs = \
 	$(tape_lib) \
 	$(serial_lib) \
 	$(socketdrv_lib) \
-	$(linenoise_ng_lib) \
 	$(archdep_lib)
 
 c1541_LDADD = \
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1217,7 +1217,7 @@ resid_libs = @RESID_LIBS@
 resid_dtv_libs = @RESID_DTV_LIBS@
 
 # external libraries required for all emulators
-emu_extlibs = @UI_LIBS@ @SDL_EXTRA_LIBS@ @SOUND_LIBS@ @JOY_LIBS@ @GFXOUTPUT_LIBS@ @ZLIB_LIBS@ @DYNLIB_LIBS@ @ARCH_LIBS@ $(archdep_lib) $(linenoise_ng_lib)
+emu_extlibs = @UI_LIBS@ @SDL_EXTRA_LIBS@ @SOUND_LIBS@ @JOY_LIBS@ @GFXOUTPUT_LIBS@ @ZLIB_LIBS@ @DYNLIB_LIBS@ @ARCH_LIBS@ $(archdep_lib)
 driver_libs = $(joyport_lib) $(samplerdrv_lib) $(sounddrv_lib) $(mididrv_lib) $(socketdrv_lib) $(hwsiddrv_lib) $(gfxoutputdrv_lib) $(printerdrv_lib) $(rs232drv_lib) $(diskimage_lib) $(fsdevice_lib) $(tape_lib) $(fileio_lib) $(serial_lib) $(core_lib)
 @SUPPORT_X64_FALSE@x64_bin = 
 @SUPPORT_X64_TRUE@x64_bin = x64
@@ -1678,7 +1678,6 @@ c1541_libs = \
 	$(tape_lib) \
 	$(serial_lib) \
 	$(socketdrv_lib) \
-	$(linenoise_ng_lib) \
 	$(archdep_lib)
 
 c1541_LDADD = \
--- a/src/arch/shared/console_unix.c
+++ b/src/arch/shared/console_unix.c
@@ -44,8 +44,21 @@
 #include "log.h"
 #include "charset.h"
 
-#include "lib/linenoise-ng/linenoise.h"
+#if !defined(HAVE_READLINE) || !defined(HAVE_READLINE_READLINE_H)
+static FILE *mon_input;
+static FILE *mon_output;
+#endif
 
+#ifdef HAVE_READLINE
+#define _FUNCTION_DEF
+#define USE_VARARGS
+#define PREFER_STDARG
+#include <readline/readline.h>
+#include <readline/history.h>
+#undef _FUNCTION_DEF
+#undef USE_VARARGS
+#undef PREFER_STDARG
+#endif
 
 typedef struct console_private_s {
     FILE *input;
@@ -81,7 +94,10 @@ console_t *native_console_open(const cha
         printf("\033]2;VICE monitor console (%d)\007", (int)getpid());
     }
 
-    linenoiseHistorySetMaxLen(100);
+#if !defined(HAVE_READLINE) || !defined(HAVE_READLINE_READLINE_H)
+    mon_input = conpriv->input = stdin;
+    mon_output = conpriv->output = stdout;
+#endif
 
 #ifdef HAVE_SYS_IOCTL_H
     if (ioctl(fileno(stdin), TIOCGWINSZ, &w)) {
@@ -108,9 +124,7 @@ exitnull:
 
 int native_console_close(console_t *log)
 {
-    lib_free(log->private);
     lib_free(log);
-    linenoiseHistoryFree();
     return 0;
 }
 
@@ -164,23 +178,54 @@ int native_console_petscii_out(console_t
     return 0;
 }
 
+#ifndef HAVE_READLINE
+char *readline(const char *prompt)
+{
+    char *p = lib_malloc(1024);
+    size_t len;
+
+    native_console_out(NULL, "%s", prompt);
+
+    fflush(mon_output);
+    if (fgets(p, 1024, mon_input) == NULL) {
+        lib_free(p);
+        return NULL;
+    }
+
+    /* Remove trailing newlines.  */
+    for (len = strlen(p);
+            len > 0 && (p[len - 1] == '\r' || p[len - 1] == '\n');
+            len--) {
+        p[len - 1] = '\0';
+    }
+    return p;
+}
+#endif
+
 char *native_console_in(console_t *log, const char *prompt)
 {
-    char *p;
-    char *ret_string;
+    char *p, *ret_string;
 
-    p = linenoise(prompt);
-    if (p != NULL && *p != '\0') {
-        linenoiseHistoryAdd(p);
+    p = readline(prompt);
+#ifdef HAVE_READLINE
+    if (p && *p) {
+        add_history(p);
     }
+#endif
     ret_string = lib_strdup(p);
+#if 0
+    /* Don't free this, add_history() seems to take ownership */
     free(p);
+#endif
 
     return ret_string;
 }
 
 int native_console_init(void)
 {
+#if defined(HAVE_READLINE) && defined(HAVE_RLNAME)
+    rl_readline_name = "VICE";
+#endif
     return 0;
 }
 
--- a/src/c1541.c
+++ b/src/c1541.c
@@ -101,9 +101,6 @@
 #include "p64.h"
 #include "fileio/p00.h"
 
-/* we want the NG header, not the old one in arch/gtk3: */
-#include "lib/linenoise-ng/linenoise.h"
-
 #ifdef UNIX_COMPILE
 #include <unistd.h>
 #endif
@@ -537,6 +534,52 @@ const command_t command_list[] = {
 
 /* ------------------------------------------------------------------------- */
 
+#if defined(HAVE_READLINE) && defined(HAVE_READLINE_READLINE_H)
+#include <readline/readline.h>
+#include <readline/history.h>
+
+/** \brief  Read a line of input from stdin
+ *
+ * \param[in]   prompt  prompt to display to the user
+ *
+ * \return  line read from stdin
+ */
+static char *read_line(const char *prompt)
+{
+    static char *line = NULL;
+
+    if (line != NULL) {
+        free(line);
+    }
+    line = readline(prompt);
+    if (line != NULL && *line != 0) {
+        add_history(line);
+    }
+    return line;
+}
+
+#else
+
+/** \brief  Read a line of input from stdin
+ *
+ * \param[in]   prompt  prompt to display to the user
+ *
+ * \return  line read from stdin
+ */
+static char *read_line(const char *prompt)
+{
+    static char line[1024];
+
+    /* Make sure there is a 0 at the end of the string */
+    line[sizeof(line) - 1] = 0;
+
+    fputs(prompt, stdout);
+    fflush(stdout);
+    return fgets(line, sizeof(line) - 1, stdin);
+}
+
+#endif
+
 
 /** \brief  Split \a line into a list of arguments
  *
@@ -3642,7 +3685,9 @@ static int quit_cmd(int nargs, char **ar
     if (interactive_mode) {
         archdep_shutdown();
         log_close_all();    /* do we need this? */
-        linenoiseHistoryFree();
+#ifdef HAVE_READLINE_READLINE_H
+        clear_history();
+#endif
     }
     exit(0);
     return 0;   /* OSF1 cc complains */
@@ -5644,10 +5689,11 @@ int main(int argc, char **argv)
 
         /* Interactive mode.  */
         interactive_mode = 1;
-        /* init linenoise-ng */
-        linenoiseHistorySetMaxLen(100);
 
-        /* TODO: Add completions on Windows, somehow, or perhaps not */
+        /* properly init GNU readline, if available */
+#ifdef HAVE_READLINE_READLINE_H
+        using_history();
+#endif
 
         version_cmd(0, NULL);
         printf("Copyright 1995-" VICEDATE_YEAR_STR " The VICE Development Team.\n"
@@ -5664,7 +5710,7 @@ int main(int argc, char **argv)
             lib_free(buf);
             buf = lib_msprintf("c1541 #%d> ", drive_index | 8);
 
-            line = linenoise(buf);
+            line = read_line(buf);
 
             if (line == NULL) {
                 putchar('\n');
@@ -5698,7 +5744,6 @@ int main(int argc, char **argv)
                     lookup_and_execute_command(nargs, args);
                }
             }
-            linenoiseHistoryAdd(line);
         }
         lib_free(buf);
         /* free memory used by the argument 'parser' */
@@ -5708,7 +5753,9 @@ int main(int argc, char **argv)
             }
         }
         /* properly clean up GNU readline's history, if used */
-        linenoiseHistoryFree();
+#ifdef HAVE_READLINE_READLINE_H
+        clear_history();
+#endif
     } else {
         while (i < argc) {
             int match = 0, minargs = 0/*, maxargs = 0*/;