diff options
| author | Allan McRae <allan@archlinux.org> | 2015-06-18 19:27:51 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-07-15 10:57:31 +1000 |
| commit | fd9ff672b0010650297e645c4fd1bd1cc320e3ef (patch) | |
| tree | f998e589374739f6d6634fabe385f8135182bef6 /src/pacman/pacman.c | |
| parent | acf95f6b3b6e2bef174da51e799bd07ce9f4cfd0 (diff) | |
| download | pacman-fd9ff672b0010650297e645c4fd1bd1cc320e3ef.tar.xz | |
Add regex search option to sync database file searching
e.g. pacman -Fsx kcm.*print.*\.so
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/pacman/pacman.c')
| -rw-r--r-- | src/pacman/pacman.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 951d628c..c680067c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -177,7 +177,8 @@ static void usage(int op, const char * const myname) } else if(op == PM_OP_FILES) { addlist(_(" -l, --list list the files owned by the queried package\n")); addlist(_(" -o, --owns <file> query the package that owns <file>\n")); - addlist(_(" -s, --search <regex> search package file names for matching strings\n")); + addlist(_(" -s, --search <file> search package file names for matching strings\n")); + addlist(_(" -x, --regex enable searching using regular expressions\n")); addlist(_(" -y, --refresh download fresh package databases from the server\n" " (-yy to force a refresh even if up to date)\n")); } @@ -787,6 +788,10 @@ static int parsearg_files(int opt) case 'y': (config->op_s_sync)++; break; + case OP_REGEX: + case 'x': + config->op_f_regex = 1; + break; case OP_QUIET: case 'q': config->quiet = 1; @@ -802,8 +807,10 @@ static void checkargs_files(void) if(config->op_q_owns) { invalid_opt(config->op_q_list, "--owns", "--list"); invalid_opt(config->op_q_search, "--owns", "--search"); + invalid_opt(config->op_f_regex, "--owns", "--regex"); } else if(config->op_q_list) { invalid_opt(config->op_q_search, "--list", "--search"); + invalid_opt(config->op_f_regex, "--list", "--regex"); } } @@ -899,7 +906,7 @@ static int parseargs(int argc, char *argv[]) int opt; int option_index = 0; int result; - const char *optstring = "DFQRSTUVb:cdefghiklmnopqr:stuvwy"; + const char *optstring = "DFQRSTUVb:cdefghiklmnopqr:stuvwxy"; static const struct option opts[] = { {"database", no_argument, 0, 'D'}, @@ -933,6 +940,7 @@ static int parseargs(int argc, char *argv[]) {"root", required_argument, 0, OP_ROOT}, {"recursive", no_argument, 0, OP_RECURSIVE}, {"search", no_argument, 0, OP_SEARCH}, + {"regex", no_argument, 0, OP_REGEX}, {"unrequired", no_argument, 0, OP_UNREQUIRED}, {"upgrades", no_argument, 0, OP_UPGRADES}, {"sysupgrade", no_argument, 0, OP_SYSUPGRADE}, |