Attachment #57941 for bug #91327

Lines 612-618 Link Here

(-)./Makefile.in
612		612
613	# comment out for distribution	613	# comment out for distribution
614	$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in	614	$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
615	$(srcdir) && autoconf	615	$(srcdir) && autoconf
616		616
617	# for chet	617	# for chet
618	reconfig: force	618	reconfig: force

Lines 55-60 Link Here

(-)./configure.in (+6 lines)
55	opt_afs=no	55	opt_afs=no
56	opt_curses=no	56	opt_curses=no
57	opt_with_installed_readline=no	57	opt_with_installed_readline=no
		58	opt_syslog=no
58		59
59	#htmldir=	60	#htmldir=
60		61
Lines 101-106 Link Here
101	AC_ARG_WITH(installed-readline, AC_HELP_STRING([--with-installed-readline], [use a version of the readline library that is already installed]), opt_with_installed_readline=$withval)	102	AC_ARG_WITH(installed-readline, AC_HELP_STRING([--with-installed-readline], [use a version of the readline library that is already installed]), opt_with_installed_readline=$withval)
102	AC_ARG_WITH(purecov, AC_HELP_STRING([--with-purecov], [configure to postprocess with pure coverage]), opt_purecov=$withval)	103	AC_ARG_WITH(purecov, AC_HELP_STRING([--with-purecov], [configure to postprocess with pure coverage]), opt_purecov=$withval)
103	AC_ARG_WITH(purify, AC_HELP_STRING([--with-purify], [configure to postprocess with purify]), opt_purify=$withval)	104	AC_ARG_WITH(purify, AC_HELP_STRING([--with-purify], [configure to postprocess with purify]), opt_purify=$withval)
		105	AC_ARG_WITH(syslog, AC_HELP_STRING([--with-syslog], [additional logging via syslog]), opt_syslog=$withval)
		106
		107	if test "$opt_syslog" = yes; then
		108	AC_DEFINE(USE_SYSLOG)
		109	fi
104		110
105	if test "$opt_bash_malloc" = yes; then	111	if test "$opt_bash_malloc" = yes; then
106	MALLOC_TARGET=malloc	112	MALLOC_TARGET=malloc

Lines 1160-1166 Link Here

(-)./lib/readline/histexpand.c (-1 / +5 lines)
1160		1160
1161	if (only_printing)	1161	if (only_printing)
1162	{	1162	{
1163	add_history (result);	1163	#ifdef USE_SYSLOG
		1164	add_history (result, 1); /* Ant: new 2nd argument means do syslog */
		1165	#else
		1166	add_history (result); /* orig */
		1167	#endif
1164	return (2);	1168	return (2);
1165	}	1169	}
1166		1170

Lines 231-237 Link Here

(-)./lib/readline/histfile.c (-1 / +5 lines)
231	*line_end = '\0';	231	*line_end = '\0';
232		232
233	if (*line_start)	233	if (*line_start)
234	add_history (line_start);	234	#ifdef USE_SYSLOG
		235	add_history (line_start,0); /* Ant: new 2nd arg means skip syslog */
		236	#else
		237	add_history (line_start); /* orig */
		238	#endif
235		239
236	current_line++;	240	current_line++;
237		241

Lines 31-36 Link Here

(-)./lib/readline/history.c (+25 lines)
31		31
32	#include <stdio.h>	32	#include <stdio.h>
33		33
		34	#ifdef USE_SYSLOG
		35	# include <syslog.h>
		36	#endif
		37
34	#if defined (HAVE_STDLIB_H)	38	#if defined (HAVE_STDLIB_H)
35	# include <stdlib.h>	39	# include <stdlib.h>
36	#else	40	#else
Lines 209-218 Link Here
209	/* Place STRING at the end of the history list. The data field	213	/* Place STRING at the end of the history list. The data field
210	is set to NULL. */	214	is set to NULL. */
211	void	215	void
		216	#ifdef USE_SYSLOG
		217	add_history (string, logme)
		218	const char *string;
		219	int logme; /* 0 means no sending history to syslog */
		220	#else
212	add_history (string)	221	add_history (string)
213	const char *string;	222	const char *string;
		223	#endif
214	{	224	{
215	HIST_ENTRY *temp;	225	HIST_ENTRY *temp;
		226	#ifdef USE_SYSLOG
		227	if (logme) {
		228	if (strlen(string)<600) {
		229	syslog(LOG_LOCAL5 \| LOG_INFO, "HISTORY: PID=%d UID=%d %s",
		230	getpid(), getuid(), string);
		231	}
		232	else {
		233	char trunc[600];
		234	strncpy(trunc,string,sizeof(trunc));
		235	trunc[sizeof(trunc)-1]='\0';
		236	syslog(LOG_LOCAL5, LOG_INFO, "HISTORY: PID=%d UID=%d %s(++TRUNC)",
		237	getpid(), getuid(), trunc);
		238	}
		239	}
		240	#endif
216		241
217	if (history_stifled && (history_length == history_max_entries))	242	if (history_stifled && (history_length == history_max_entries))
218	{	243	{

Lines 74-80 Link Here

(-)./lib/readline/history.h (-1 / +5 lines)
74		74
75	/* Place STRING at the end of the history list.	75	/* Place STRING at the end of the history list.
76	The associated data field (if any) is set to NULL. */	76	The associated data field (if any) is set to NULL. */
77	extern void add_history PARAMS((const char *));	77	#ifdef USE_SYSLOG /* kev added config time */
		78	extern void add_history PARAMS((const char , int )); / Ant added arg */
		79	#else
		80	extern void add_history PARAMS((const char *));
		81	#endif
78		82
79	/* A reasonably useless function, only here for completeness. WHICH	83	/* A reasonably useless function, only here for completeness. WHICH
80	is the magic number that tells us which element to delete. The	84	is the magic number that tells us which element to delete. The

Return to bug 91327