From: Karel Zak <kzak@redhat.com>
Date: Tue, 5 Jun 2012 12:19:13 +0000 (+0200)
Subject: more: fix regex error messages printing
X-Git-Tag: v2.22-rc1~333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eecbb2cfeebd01244f07c49f49028089052526f3;p=thirdparty%2Futil-linux.git

more: fix regex error messages printing

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/text-utils/more.c b/text-utils/more.c
index ac05a658a0..d86d66420e 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -127,6 +127,7 @@ void prepare_line_buffer(void);
 #define INIT_BUF	80
 #define SHELL_LINE	1000
 #define COMMAND_BUF	200
+#define REGERR_BUF	NUM_COLUMNS
 
 struct termios	otty, savetty0;
 long		file_pos, file_size;
@@ -1583,13 +1584,13 @@ void search(char buf[], FILE *file, register int n)
     register long line3 = startline;
     register int lncount;
     int saveln, rv, rc;
-    char *s;
     regex_t re;
 
     context.line = saveln = Currline;
     context.chrctr = startline;
     lncount = 0;
-    if (rc = regcomp (&re, buf, REG_NOSUB) != 0) {
+    if ((rc = regcomp (&re, buf, REG_NOSUB)) != 0) {
+	char s[REGERR_BUF];
 	regerror (rc, &re, s, sizeof s);
 	more_error (s);
     }