diff options
| -rw-r--r-- | main.c | 16 | ||||
| -rw-r--r-- | man/qdepends.1 | 13 |
2 files changed, 17 insertions, 12 deletions
@@ -1,7 +1,7 @@ /* * Copyright 2005 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.61 2005/09/24 01:56:36 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.62 2005/10/01 23:18:00 solar Exp $ * * Copyright 2005 Ned Ludd - <solar@gentoo.org> * Copyright 2005 Mike Frysinger - <vapier@gentoo.org> @@ -100,7 +100,7 @@ void init_coredumps(void) /* variables to control runtime behavior */ -static const char *rcsid = "$Id: main.c,v 1.61 2005/09/24 01:56:36 vapier Exp $"; +static const char *rcsid = "$Id: main.c,v 1.62 2005/10/01 23:18:00 solar Exp $"; static char color = 1; static char exact = 0; @@ -223,8 +223,7 @@ int rematch(const char *regex, const char *match, int cflags) if ((match == NULL) || (regex == NULL)) return EXIT_FAILURE; - ret = regcomp(&preg, regex, cflags); - if (ret) { + if ((ret = regcomp(&preg, regex, cflags))) { char err[256]; if (regerror(ret, &preg, err, sizeof(err))) warnf("regcomp failed: %s", err); @@ -262,7 +261,8 @@ static char *remove_extra_space(char *str) size_t len, pos = 0; char *buf; - if (str == NULL) return NULL; + if (str == NULL) + return NULL; len = strlen(str); buf = (char*)xmalloc(len+1); memset(buf, 0, len+1); @@ -287,7 +287,7 @@ struct dirent *q_vdb_get_next_dir(DIR *dir) /* search for a category directory */ struct dirent *ret; -another_please: +next_entry: ret = readdir(dir); if (ret == NULL) { closedir(dir); @@ -295,9 +295,9 @@ another_please: } if (ret->d_name[0] == '.' || ret->d_name[0] == '-') - goto another_please; + goto next_entry; if (strchr(ret->d_name, '-') == NULL) - goto another_please; + goto next_entry; return ret; } diff --git a/man/qdepends.1 b/man/qdepends.1 index b95059c..c1279ef 100644 --- a/man/qdepends.1 +++ b/man/qdepends.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29. -.TH qdepends "1" "September 2005" "Gentoo Foundation" "qdepends" +.TH qdepends "1" "October 2005" "Gentoo Foundation" "qdepends" .SH NAME -qdepends \- manual page for qdepends compiled on Sep 24 2005 +qdepends \- manual page for qdepends compiled on Oct 1 2005 .SH SYNOPSIS .B qdepends \fI<pkgname> : show dependency info\fR .SH DESCRIPTION -Options: \fB\-[drpacNq\fR:vChV] +Options: \fB\-[drpacNk\fR:q:vChV] .TP \fB\-d\fR, \fB\-\-depend\fR * Show DEPEND info (default) @@ -20,6 +20,11 @@ Options: \fB\-[drpacNq\fR:vChV] \fB\-c\fR, \fB\-\-cdepend\fR * Show CDEPEND info .TP +\fB\-k\fR, \fB\-\-key\fR +<arg> +.BR + * User defined vdb key +.TP \fB\-q\fR, \fB\-\-query\fR <arg> .BR @@ -43,4 +48,4 @@ Options: \fB\-[drpacNq\fR:vChV] \fB\-V\fR, \fB\-\-version\fR * Print version and exit .PP -$Id: qdepends.1,v 1.4 2005/09/24 18:25:03 solar Exp $ +$Id: qdepends.1,v 1.5 2005/10/01 23:18:00 solar Exp $ |