svn commit: r232224 - user/gabor/tre-integration/usr.bin/grep

Gabor Kovesdan gabor at FreeBSD.org
Mon Feb 27 16:18:51 UTC 2012


Author: gabor
Date: Mon Feb 27 16:18:49 2012
New Revision: 232224
URL: http://svn.freebsd.org/changeset/base/232224

Log:
  - mregerror() (and regerror()) can also be used after regexec() and the rest

Modified:
  user/gabor/tre-integration/usr.bin/grep/util.c

Modified: user/gabor/tre-integration/usr.bin/grep/util.c
==============================================================================
--- user/gabor/tre-integration/usr.bin/grep/util.c	Mon Feb 27 16:15:56 2012	(r232223)
+++ user/gabor/tre-integration/usr.bin/grep/util.c	Mon Feb 27 16:18:49 2012	(r232224)
@@ -285,9 +285,10 @@ procline(struct str *l, int nottext)
 		    (size_t)pmatch.rm_eo;
 		if (r == REG_NOMATCH)
 			continue;
-		else if (r != REG_OK)
-		  // XXX: better error msg?
-		  errx(2, "Failed processing input.");
+		else if (r != REG_OK) {
+			mregerror(r, &preg, NULL, re_error, RE_ERROR_BUF);
+			errx(2, "%s", re_error);
+		}
 
 		/*
 		 * Check for full match.  There is already a match so


More information about the svn-src-user mailing list