[gentoo-commits] gentoo-projects commit in portage-utils: .depend main.c qcheck.c qgrep.c

[Mike Frysinger (vapier)]

vapier      11/10/03 01:25:54

  Modified:             .depend main.c qcheck.c qgrep.c
  Log:
  add xregcomp helpers

Revision  Changes    Path
1.44                 portage-utils/.depend

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/.depend?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/.depend?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/.depend?r1=1.43&r2=1.44

Index: .depend
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/.depend,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .depend	3 Oct 2011 00:24:22 -0000	1.43
+++ .depend	3 Oct 2011 01:25:54 -0000	1.44
@@ -2,9 +2,9 @@
  libq/colors.c libq/xmalloc.c libq/xstrdup.c libq/xasprintf.c \
  libq/hash_fd.c libq/md5_sha1_sum.c libq/human_readable.c libq/rmspace.c \
  libq/which.c libq/compat.c libq/copy_file.c libq/safe_io.c libq/xchdir.c \
- libq/xgetcwd.c libq/xmkdir.c libq/xreadlink.c libq/xsystem.c \
- libq/atom_explode.c libq/atom_compare.c libq/basename.c libq/prelink.c \
- libq/profile.c libq/vdb_get_next_dir.c libq/virtuals.c applets.h \
- include_applets.h q.c qcheck.c qdepends.c qfile.c qlist.c qlop.c \
- qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c qgrep.c qatom.c qmerge.c \
- qcache.c qglsa.c
+ libq/xgetcwd.c libq/xmkdir.c libq/xreadlink.c libq/xregex.c \
+ libq/xsystem.c libq/atom_explode.c libq/atom_compare.c libq/basename.c \
+ libq/prelink.c libq/profile.c libq/vdb_get_next_dir.c libq/virtuals.c \
+ applets.h include_applets.h q.c qcheck.c qdepends.c qfile.c qlist.c \
+ qlop.c qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c qgrep.c qatom.c \
+ qmerge.c qcache.c qglsa.c



1.195                portage-utils/main.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.195&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.195&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?r1=1.194&r2=1.195

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- main.c	2 Oct 2011 22:08:11 -0000	1.194
+++ main.c	3 Oct 2011 01:25:54 -0000	1.195
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2008 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.194 2011/10/02 22:08:11 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.195 2011/10/03 01:25:54 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@g.o>
@@ -285,14 +285,8 @@
 	if ((match == NULL) || (re == NULL))
 		return EXIT_FAILURE;
 
-	if ((ret = regcomp(&preg, re, cflags))) {
-		char err[256];
-		if (regerror(ret, &preg, err, sizeof(err)))
-			warnf("regcomp failed: %s", err);
-		else
-			warnf("regcomp failed");
+	if (wregcomp(&preg, re, cflags))
 		return EXIT_FAILURE;
-	}
 	ret = regexec(&preg, match, 0, NULL, 0);
 	regfree(&preg);
 



1.49                 portage-utils/qcheck.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcheck.c?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcheck.c?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcheck.c?r1=1.48&r2=1.49

Index: qcheck.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- qcheck.c	3 Oct 2011 00:24:22 -0000	1.48
+++ qcheck.c	3 Oct 2011 01:25:54 -0000	1.49
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.48 2011/10/03 00:24:22 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.49 2011/10/03 01:25:54 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -34,7 +34,7 @@
 	"Undo prelink when calculating checksums",
 	COMMON_OPTS_HELP
 };
-static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.48 2011/10/03 00:24:22 vapier Exp $";
+static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.49 2011/10/03 01:25:54 vapier Exp $";
 #define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qcheck_opts_help, lookup_applet_idx("qcheck"))
 
 short bad_only = 0;
@@ -81,15 +81,9 @@
 		case 'a': search_all = 1; break;
 		case 'e': exact = 1; break;
 		case 's': {
-				int regex_val;
 				regex_head = xrealloc(regex_head, (regex_count + 1) * sizeof(*regex_head));
 				regex_head[regex_count] = xmalloc(sizeof(*regex_head[0]));
-				regex_val = regcomp(regex_head[regex_count], optarg, REG_EXTENDED|REG_NOSUB);
-				if (regex_val != 0) {
-					char errbuf[256];
-					regerror(regex_val, regex_head[regex_count], errbuf, sizeof(errbuf));
-					err("Invalid regexp: %s -- %s\n", optarg, errbuf);
-				}
+				xregcomp(regex_head[regex_count], optarg, REG_EXTENDED|REG_NOSUB);
 				++regex_count;
 			}
 			break;



1.30                 portage-utils/qgrep.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qgrep.c?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qgrep.c?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qgrep.c?r1=1.29&r2=1.30

Index: qgrep.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- qgrep.c	17 Mar 2011 03:01:19 -0000	1.29
+++ qgrep.c	3 Oct 2011 01:25:54 -0000	1.30
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v 1.29 2011/03/17 03:01:19 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v 1.30 2011/10/03 01:25:54 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -47,7 +47,7 @@
 	"Print <arg> lines of trailing context",
 	COMMON_OPTS_HELP
 };
-static const char qgrep_rcsid[] = "$Id: qgrep.c,v 1.29 2011/03/17 03:01:19 vapier Exp $";
+static const char qgrep_rcsid[] = "$Id: qgrep.c,v 1.30 2011/10/03 01:25:54 vapier Exp $";
 #define qgrep_usage(ret) usage(ret, QGREP_FLAGS, qgrep_long_opts, qgrep_opts_help, lookup_applet_idx("qgrep"))
 
 char qgrep_name_match(const char*, const int, depend_atom**);
@@ -363,23 +363,12 @@
 
 	/* pre-compile regexps once for all */
 	if (do_regex) {
-		int ret;
-		char err[256];
 		if (invert_match || *RED == '\0')
 			reflags |= REG_NOSUB;
-		if ((ret = regcomp(&preg, argv[optind], reflags))) {
-			if (regerror(ret, &preg, err, sizeof(err)))
-				err("regcomp failed: %s", err);
-			else
-				err("regcomp failed");
-		}
+		xregcomp(&preg, argv[optind], reflags);
 		reflags |= REG_NOSUB;
-		if (skip_pattern && (ret = regcomp(&skip_preg, skip_pattern, reflags))) {
-			if (regerror(ret, &skip_preg, err, sizeof(err)))
-				err("regcomp failed for --skip pattern: %s", err);
-			else
-				err("regcomp failed for --skip pattern");
-		}
+		if (skip_pattern)
+			xregcomp(&skip_preg, skip_pattern, reflags);
 	}
 
 	/* go look either in ebuilds or eclasses or VDB */