head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.192 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.190 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.188 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.186 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.184 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.182 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.180 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.178 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.176 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.174 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.172 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.170 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.168 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.166 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.164 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.162 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.160 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.158 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.156 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.154 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.152 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.150 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.148 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.144 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.124 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.146 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.142 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.140 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.138 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.136 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.134 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.132 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.130 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.128 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.126 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.122 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.120 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.118 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.116 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.114 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.112 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.110 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.108 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.106 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.104 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.102 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.100 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.98 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.96 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.94 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.92 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.90 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.88 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.86 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.84 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.82 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.80 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.78 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.76 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.74 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.72 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.70 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.68 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.66 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.64 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.62 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.60 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.58 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.56 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.54 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.52 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.50 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.48 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.46 pkgsrc-2008Q1:1.1.0.44 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.42 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.40 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.38 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.36 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.34 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.1 date 99.10.01.17.05.15; author dmcmahill; state Exp; branches; next ; desc @@ 1.1 log @- added missing -Wl,-Rpath for the X11 libraries - fixed program version number reported when spice is run to make it consistent with the version of the program. - several patches to fix compilation warnings due to missing header files and some inconsistent variable types. - broke out previous patch-aa which patched several files into 1 patch per file. - fixed some code which returned the address of a local char array variable. - added GNU readline support (a huge improvement in the interface) - changed USE_X11BASE to USE_X11. No reason to install into X11BASE. - removed 'x' target from package Makefile @ text @$NetBSD$ --- src/bin/main.c.orig Thu Jul 29 01:48:32 1993 +++ src/bin/main.c Mon Mar 8 12:00:35 1999 @@@@ -25,6 +25,13 @@@@ #include #endif +#ifdef HAS_GNUREADLINE +/* Added GNU Readline Support 11/3/97 -- Andrew Veliath */ +#include +#include +#include "fteinput.h" +#endif + #ifdef HAS_UNIX_SIGS #include #endif @@@@ -36,6 +43,11 @@@@ #endif #include "patchlev.h" + +#ifdef __FreeBSD__ +#include +#endif + #include "suffix.h" int Patch_Level = PATCHLEVEL; @@@@ -49,6 +61,11 @@@@ bool ft_intrpt = false; /* Set by the (void) signal handlers. */ bool ft_setflag = false; /* Don't abort after an interrupt. */ +#ifdef HAS_GNUREADLINE +char gnu_history_file[512]; +static char *application_name; +#endif + struct variable *(*if_getparam)( ); #ifdef BATCH @@@@ -181,6 +198,89 @@@@ #endif +#ifdef HAS_GNUREADLINE +/* Adapted ../lib/cp/lexical.c:prompt() for GNU Readline -- Andrew Veliath */ +static char * +prompt() +{ + static char pbuf[128]; + char *p = pbuf, *s; + + if (cp_interactive == false) + return; + if (cp_promptstring == NULL) + s = "-> "; + else + s = cp_promptstring; + if (cp_altprompt) + s = cp_altprompt; + while (*s) { + switch (strip(*s)) { + case '!': + p += sprintf(p, "%d", where_history() + 1); + break; + case '\\': + if (*(s + 1)) + p += sprintf(p, "%c", strip(*++s)); + default: + *p = strip(*s); ++p; + break; + } + s++; + } + *p = 0; + return pbuf; +} + +/* Process device events in Readline's hook since there is no where + else to do it now - AV */ +int rl_event_func() +{ + static REQUEST reqst = { checkup_option, 0 }; + Input(&reqst, NULL); + return 0; +} + +/* Added GNU Readline Support -- Andrew Veliath */ +void app_rl_readlines() +{ + char *line, *expanded_line; + + strcpy(gnu_history_file, getenv("HOME")); + strcat(gnu_history_file, "/."); + strcat(gnu_history_file, application_name); + strcat(gnu_history_file, "_history"); + + using_history(); + read_history(gnu_history_file); + + rl_readline_name = application_name; + rl_instream = cp_in; + rl_outstream = cp_out; + rl_event_hook = rl_event_func; + + while (1) { + history_set_pos(history_length); + line = readline(prompt()); + if (line && *line) { + int s = history_expand(line, &expanded_line); + + if (s == 2) { + fprintf(stderr, "-> %s\n", expanded_line); + } else if (s == -1) { + fprintf(stderr, "readline: %s\n", expanded_line); + } else { + cp_evloop(expanded_line); + add_history(expanded_line); + } + free(expanded_line); + } + if (line) free(line); + } + /* History gets written in ../fte/misccoms.c com_quit */ +} +#endif /* HAS_GNUREADLINE */ + char *hlp_filelist[] = { "spice", 0 }; void @@@@ -210,6 +310,10 @@@@ #endif +#ifdef __FreeBSD__ + fpsetmask(fpgetmask() & ~FP_X_INV); +#endif + /* MFB tends to jump to 0 on errors. This tends to catch it. */ if (started) { fprintf(cp_err, "main: Internal Error: jump to zero\n"); @@@@ -217,6 +321,13 @@@@ } started = true; +#ifdef HAS_GNUREADLINE + if (!(application_name = strrchr(av[0],'/'))) + application_name = av[0]; + else + ++application_name; +#endif + #ifdef HAS_MAC_ARGCARGV ac = initmac(&av); #endif @@@@ -393,7 +504,11 @@@@ # ifdef HAS_UNIX_SIGS /* Set up (void) signal handling */ if (!ft_batchmode) { +# ifdef HAS_GNUREADLINE + (void) signal(SIGINT, SIG_IGN); +# else (void) signal(SIGINT, ft_sigintr); +# endif (void) signal(SIGFPE, sigfloat); # ifdef SIGTSTP (void) signal(SIGTSTP, sigstop); @@@@ -588,7 +703,11 @@@@ } else { (void) setjmp(jbuf); cp_interactive = true; +#ifdef HAS_GNUREADLINE + app_rl_readlines(); +#else while (cp_evloop((char *) NULL) == 1) ; +#endif /* ifelse HAS_GNUREADLINE */ } # else /* if BATCH */ @@@@ -627,7 +746,11 @@@@ /* Nutmeg "main" */ (void) setjmp(jbuf); cp_interactive = true; +#ifdef HAS_GNUREADLINE + app_rl_readlines(); +#else while (cp_evloop((char *) NULL) == 1) ; +#endif /* ifelse HAS_GNUREADLINE */ #endif @