diff options
Diffstat (limited to 'src/fe-text')
| -rw-r--r-- | src/fe-text/gui-windows.c | 16 | ||||
| -rw-r--r-- | src/fe-text/screen.c | 6 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c index f17dec81..acc2c2f3 100644 --- a/src/fe-text/gui-windows.c +++ b/src/fe-text/gui-windows.c @@ -33,7 +33,9 @@ #include "gui-entry.h" #include "gui-windows.h" -#include <regex.h> +#ifdef HAVE_REGEX_H +# include <regex.h> +#endif /* how often to scan line cache for lines not accessed for a while (ms) */ #define LINE_CACHE_CHECK_TIME (5*60*1000) @@ -740,7 +742,9 @@ static void signal_window_item_update(WINDOW_REC *window) GList *gui_window_find_text(WINDOW_REC *window, gchar *text, GList *startline, int regexp, int fullword) { +#ifdef HAVE_REGEX_H regex_t preg; +#endif GList *tmp; GList *matches; gchar *str, *ptr; @@ -751,8 +755,10 @@ GList *gui_window_find_text(WINDOW_REC *window, gchar *text, GList *startline, i matches = NULL; size = 1024; str = g_malloc(1024); +#ifdef HAVE_REGEX_H if (regcomp(&preg, text, REG_ICASE|REG_EXTENDED|REG_NOSUB) != 0) return 0; +#endif if (startline == NULL) startline = WINDOW_GUI(window)->lines; for (tmp = startline; tmp != NULL; tmp = tmp->next) @@ -790,15 +796,19 @@ GList *gui_window_find_text(WINDOW_REC *window, gchar *text, GList *startline, i } str[n] = '\0'; - if (regexp ? regexec(&preg, str, 0, NULL, 0) == 0 : + if ( +#ifdef HAVE_REGEX_H + regexp ? regexec(&preg, str, 0, NULL, 0) == 0 : +#endif fullword ? stristr_full(str, text) != NULL : stristr(str, text) != NULL) { /* matched */ matches = g_list_append(matches, rec); } } +#ifdef HAVE_REGEX_H regfree(&preg); - +#endif if (str != NULL) g_free(str); return matches; } diff --git a/src/fe-text/screen.c b/src/fe-text/screen.c index e4458c6c..917cb133 100644 --- a/src/fe-text/screen.c +++ b/src/fe-text/screen.c @@ -90,12 +90,14 @@ static void read_signals(void) const char *ignores; ignores = settings_get_str("ignore_signals"); +#ifndef WIN32 signal(SIGHUP, find_substr(ignores, "hup") ? SIG_IGN : SIG_DFL); signal(SIGQUIT, find_substr(ignores, "quit") ? SIG_IGN : SIG_DFL); signal(SIGTERM, find_substr(ignores, "term") ? SIG_IGN : SIG_DFL); signal(SIGALRM, find_substr(ignores, "alrm") ? SIG_IGN : SIG_DFL); signal(SIGUSR1, find_substr(ignores, "usr1") ? SIG_IGN : SIG_DFL); signal(SIGUSR2, find_substr(ignores, "usr2") ? SIG_IGN : SIG_DFL); +#endif } static void read_settings(void) @@ -111,7 +113,9 @@ static int init_curses(void) { char ansi_tab[8] = { 0, 4, 2, 6, 1, 5, 3, 7 }; int num; +#ifndef WIN32 struct sigaction act; +#endif if (!initscr()) return FALSE; @@ -119,10 +123,12 @@ static int init_curses(void) if (COLS < MIN_SCREEN_WIDTH) COLS = MIN_SCREEN_WIDTH; +#ifndef WIN32 sigemptyset (&act.sa_mask); act.sa_flags = 0; act.sa_handler = sigint_handler; sigaction(SIGINT, &act, NULL); +#endif #ifdef SIGWINCH act.sa_handler = sig_winch; sigaction(SIGWINCH, &act, NULL); |