File tftp-hpa-0.46_libedit.patch of Package tftp

Overview Repositories Revisions Requests Users Attributes Meta

File tftp-hpa-0.46_libedit.patch of Package tftp (Revision 1bc51fd93511fe3e520e7ad7fb6d9da5)

Currently displaying revision 1bc51fd93511fe3e520e7ad7fb6d9da5 , Show latest

Index: configure.in
===================================================================
--- configure.in.orig	2007-01-09 12:13:42.000000000 +0100
+++ configure.in	2007-01-09 12:42:14.414597628 +0100
@@ -245,6 +245,29 @@ PA_WITH_BOOL(readline, 1,
 TFTP_LIBS="$LIBS $XTRALIBS"
 LIBS="$common_libs"
 
+AH_TEMPLATE([WITH_EDITLINE],
+[Define if we are compiling with editline command-line editing.])
+
+PA_WITH_BOOL(editline, 1,
+[  --without-editline      disable the use of readline command-line editing],
+[
+	AC_CHECK_HEADER(editline/readline.h,
+	[
+		dnl readline may need libtermcap or somesuch...
+		AC_SEARCH_LIBS(tputs, [termcap terminfo])
+
+		AC_SEARCH_LIBS(readline, [edit],
+		[
+			AC_DEFINE(WITH_EDITLINE)
+		],
+		[],
+		[])
+	])
+],:)
+
+TFTP_LIBS="$LIBS $XTRALIBS"
+LIBS="$common_libs"
+
 AC_SUBST(SRCROOT)
 AC_SUBST(OBJROOT)
 
Index: tftp/main.c
===================================================================
--- tftp/main.c.orig	2007-01-09 12:13:42.000000000 +0100
+++ tftp/main.c	2007-01-09 12:42:02.617911079 +0100
@@ -61,6 +61,9 @@ static const char *rcsid UNUSED =
 #include <readline/history.h>
 #endif
 #endif
+#ifdef WITH_EDITLINE
+#include <editline/readline.h>
+#endif
 
 #include "extern.h"
 
@@ -93,7 +96,7 @@ int	verbose;
 int	literal;
 int	connected;
 const struct modes *mode;
-#ifdef WITH_READLINE
+#if defined(WITH_READLINE) || defined(WITH_EDITLINE)
 char   *line = NULL;
 #else
 char	line[LBUFLEN];
@@ -327,8 +330,8 @@ main(int argc, char *argv[])
     exit(0);
   }
   
-#ifdef WITH_READLINE
-#ifdef HAVE_READLINE_HISTORY_H
+#if defined(WITH_READLINE) || defined(WITH_EDITLINE)
+#if defined(HAVE_READLINE_HISTORY_H) || defined(WITH_EDITLINE)
   using_history();
 #endif
 #endif
@@ -347,7 +350,7 @@ char    *hostname;
 static void
 getmoreargs(const char *partial, const char *mprompt)
 {
-#ifdef WITH_READLINE
+#if defined(WITH_READLINE) || defined(WITH_EDITLINE)
   char *eline;
   int len, elen;
   
@@ -367,7 +370,7 @@ getmoreargs(const char *partial, const c
   strcpy(line+len, eline);
   free(eline);
 
-#ifdef HAVE_READLINE_HISTORY_H
+#if defined(HAVE_READLINE_HISTORY_H) || defined(WITH_EDITLINE)
   add_history(line);
 #endif
 #else
@@ -770,7 +773,7 @@ command(void)
 	struct cmd *c;
 
 	for (;;) {
-#ifdef WITH_READLINE
+#if defined(WITH_READLINE) || defined(WITH_EDITLINE)
 	        if ( line ) {
 			free(line);
 			line = NULL;
@@ -790,8 +793,8 @@ command(void)
 #endif
 		if ((line[0] == 0) || (line[0] == '\n'))
 			continue;
-#ifdef WITH_READLINE
-#ifdef HAVE_READLINE_HISTORY_H
+#if defined(WITH_READLINE) || defined(WITH_EDITLINE)
+#if defined(HAVE_READLINE_HISTORY_H) || defined(WITH_EDITLINE)
 		add_history(line);
 #endif
 #endif
Index: config.h
===================================================================
--- config.h.orig	2007-01-09 01:54:30.000000000 +0100
+++ config.h	2007-01-09 12:35:10.521926648 +0100
@@ -291,7 +291,7 @@ typedef int socklen_t;
 
 #include "version.h"
 
-#ifdef WITH_READLINE
+#if defined(WITH_READLINE) || defined(WITH_EDITLINE)
 #define WITH_READLINE_STR ", with readline"
 #else
 #define WITH_READLINE_STR ", without readline"

Places

File tftp-hpa-0.46_libedit.patch of Package tftp (Revision 1bc51fd93511fe3e520e7ad7fb6d9da5)

Places