[Pinfo-devel] r37 - in pinfo/branches/cxx: . macros src

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-08-23 17:02:46 +0000 (Tue, 23 Aug 2005)
New Revision: 37

Removed:
   pinfo/branches/cxx/src/readlinewrapper.cxx
   pinfo/branches/cxx/src/readlinewrapper.h
Modified:
   pinfo/branches/cxx/configure.ac
   pinfo/branches/cxx/macros/Makefile.in
   pinfo/branches/cxx/src/Makefile.am
   pinfo/branches/cxx/src/utils.cxx
Log:
Remove support for operating without libreadline.  Pinfo's readlinewrapper
was full of potential buffer overflows and not worth fixing.



Modified: pinfo/branches/cxx/configure.ac
===================================================================
--- pinfo/branches/cxx/configure.ac	2005-08-23 01:21:43 UTC (rev 36)
+++ pinfo/branches/cxx/configure.ac	2005-08-23 17:02:46 UTC (rev 37)
@@ -103,7 +103,9 @@
 ####################################################
 # readline
 AC_CHECK_READLINE
-AM_CONDITIONAL(HAS_READLINE, test "$has_readline" = true)
+if test "$has_readline" = false; then
+  AC_MSG_ERROR([Readline not found.  You need readline to compile pinfo])
+fi
 
 # curses
 AC_CHECK_CURSES

Modified: pinfo/branches/cxx/macros/Makefile.in
===================================================================
--- pinfo/branches/cxx/macros/Makefile.in	2005-08-23 01:21:43 UTC (rev 36)
+++ pinfo/branches/cxx/macros/Makefile.in	2005-08-23 17:02:46 UTC (rev 37)
@@ -105,8 +105,6 @@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
-HAS_READLINE_FALSE = @HAS_READLINE_FALSE@
-HAS_READLINE_TRUE = @HAS_READLINE_TRUE@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SIGBLOCK_FALSE = @HAVE_SIGBLOCK_FALSE@

Modified: pinfo/branches/cxx/src/Makefile.am
===================================================================
--- pinfo/branches/cxx/src/Makefile.am	2005-08-23 01:21:43 UTC (rev 36)
+++ pinfo/branches/cxx/src/Makefile.am	2005-08-23 17:02:46 UTC (rev 37)
@@ -37,16 +37,9 @@
 		localestuff.h \
 		rcsid.h
 
-pinfo_READLINE = readlinewrapper.cxx readlinewrapper.h 
 pinfo_SNPRINTF = snprintf.cxx # snprintf.h
 pinfo_SIGBLOCK = sigblock.cxx sigblock.h
 
-if HAS_READLINE
-pinfo_READLINE_OBJ = 
-else
-pinfo_READLINE_OBJ = readlinewrapper.o
-endif	
-
 if HAVE_SNPRINTF
 pinfo_SNPRINTF_OBJ =
 else
@@ -63,20 +56,13 @@
 
 INCLUDES = @READLINE_INCLUDES@
 
-pinfo_LDADD = $(pinfo_READLINE_OBJ) $(pinfo_SNPRINTF_OBJ)\
+pinfo_LDADD = $(pinfo_SNPRINTF_OBJ)\
               $(pinfo_SIGBLOCK_OBJ) @READLINE_LIBS@ $(INTLLIBS)
 
-pinfo_DEPENDENCIES = $(pinfo_READLINE_OBJ)\
-                     $(pinfo_SNPRINTF_OBJ)\
+pinfo_DEPENDENCIES = $(pinfo_SNPRINTF_OBJ)\
                      $(pinfo_SIGBLOCK_OBJ)\
 		     $(INTLDEPS)
 
-
-if HAS_READLINE
-else
-readlinewrapper.o: $(pinfo_READLINE)
-endif	
-
 if HAVE_SNPRINTF
 else
 snprintf.o: $(pinfo_SNPRINTF)
@@ -97,5 +83,5 @@
 		echo "WARNING! Old pinforc detected. I'm not installing the new file"; \
         fi
 
-EXTRA_DIST = $(pinfo_READLINE) $(pinfo_SNPRINTF) $(pinfo_SIGBLOCK)
+EXTRA_DIST = $(pinfo_SNPRINTF) $(pinfo_SIGBLOCK)
 

Deleted: pinfo/branches/cxx/src/readlinewrapper.cxx

Deleted: pinfo/branches/cxx/src/readlinewrapper.h

Modified: pinfo/branches/cxx/src/utils.cxx
===================================================================
--- pinfo/branches/cxx/src/utils.cxx	2005-08-23 01:21:43 UTC (rev 36)
+++ pinfo/branches/cxx/src/utils.cxx	2005-08-23 17:02:46 UTC (rev 37)
@@ -42,12 +42,10 @@
 int pinfo_re_offset = -1;
 #endif
 
-#ifdef HAS_READLINE
+/* Readline */
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <term.h>
-/* HAS_READLINE */
-#endif
 
 
 /*
@@ -229,7 +227,6 @@
 	}
 }
 
-#ifdef HAS_READLINE
 /* custom function that readline will use to display text */
 void
 my_rl_display()
@@ -241,15 +238,12 @@
 	printw("%s%s", rl_prompt, rl_line_buffer);
 	refresh();
 }
-#endif
 
 char *
 getstring(char *prompt)
 {
 	char *buf;
 
-#ifdef HAS_READLINE
-
 	curs_set(1);
 	move(maxy - 1, 0);
 	refresh();
@@ -264,13 +258,6 @@
 	
 	curs_set(0);
 
-#else
-
-	move(maxy - 1, 0);
-	buf = readlinewrapper(prompt);
-
-#endif
-
 	return buf;
 }