Reworks the UI of -F according to FS#47949
In short -F replaces both -Fs and -Fo.
--regex/-x has been replaced with --search/-s.
Signed-off-by: morganamilo
---
This patch is WIP. Functional changes made,
documentation still needs to be changed.
Additionally I think https://bugs.archlinux.org/task/47949#comment143477
Is a good idea and I will probably be included in v2
src/pacman/conf.h | 1 -
src/pacman/files.c | 119 +++++++++++++++-----------------------------
src/pacman/pacman.c | 19 ++-----
3 files changed, 42 insertions(+), 97 deletions(-)
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index ababf2e0..04bba2dd 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -91,7 +91,6 @@ typedef struct __config_t {
unsigned short op_s_search;
unsigned short op_s_upgrade;
- unsigned short op_f_regex;
unsigned short op_f_machinereadable;
unsigned short group;
diff --git a/src/pacman/files.c b/src/pacman/files.c
index 3ebd9b9b..5ec47c54 100644
--- a/src/pacman/files.c
+++ b/src/pacman/files.c
@@ -49,56 +49,6 @@ static void dump_pkg_machinereadable(alpm_db_t *db, alpm_pkg_t *pkg)
}
}
-static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) {
- int ret = 0;
- alpm_list_t *t;
-
- for(t = targets; t; t = alpm_list_next(t)) {
- char *filename = t->data;
- int found = 0;
- alpm_list_t *s;
- size_t len = strlen(filename);
-
- while(len > 1 && filename[0] == '/') {
- filename++;
- len--;
- }
-
- for(s = syncs; s; s = alpm_list_next(s)) {
- alpm_list_t *p;
- alpm_db_t *repo = s->data;
- alpm_list_t *packages = alpm_db_get_pkgcache(repo);
-
- for(p = packages; p; p = alpm_list_next(p)) {
- alpm_pkg_t *pkg = p->data;
- alpm_filelist_t *files = alpm_pkg_get_files(pkg);
-
- if(alpm_filelist_contains(files, filename)) {
- if(config->op_f_machinereadable) {
- print_line_machinereadable(repo, pkg, filename);
- } else if(!config->quiet) {
- const colstr_t *colstr = &config->colstr;
- printf(_("%s is owned by %s%s/%s%s %s%s%s\n"), filename,
- colstr->repo, alpm_db_get_name(repo), colstr->title,
- alpm_pkg_get_name(pkg), colstr->version,
- alpm_pkg_get_version(pkg), colstr->nocolor);
- } else {
- printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg));
- }
-
- found = 1;
- }
- }
- }
-
- if(!found) {
- ret++;
- }
- }
-
- return 0;
-}
-
static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg)
{
alpm_db_t *db_local = alpm_get_localdb(config->handle);
@@ -138,6 +88,15 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
alpm_list_t *s;
int found = 0;
regex_t reg;
+ size_t len = strlen(targ);
+ char *exact_file = strchr(targ, '/');
+
+ if(exact_file != NULL) {
+ while(len > 1 && targ[0] == '/') {
+ targ++;
+ len--;
+ }
+ }
if(regex) {
if(regcomp(®, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) {
@@ -153,26 +112,40 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
int m;
for(p = packages; p; p = alpm_list_next(p)) {
- size_t f = 0;
- char* c;
alpm_pkg_t *pkg = p->data;
alpm_filelist_t *files = alpm_pkg_get_files(pkg);
alpm_list_t *match = NULL;
- while(f < files->count) {
- c = strrchr(files->files[f].name, '/');
- if(c && *(c + 1)) {
- if(regex) {
- m = regexec(®, (c + 1), 0, 0, 0);
- } else {
- m = strcmp(c + 1, targ);
+ if(exact_file != NULL) {
+ if (regex) {
+ for(size_t f = 0; f < files->count; f++) {
+ char *c = files->files[f].name;
+ if(regexec(®, c, 0, 0, 0) == 0) {
+ match = alpm_list_add(match, files->files[f].name);
+ found = 1;
+ }
}
- if(m == 0) {
- match = alpm_list_add(match, files->files[f].name);
+ } else {
+ if(alpm_filelist_contains(files, targ)) {
+ match = alpm_list_add(match, targ);
found = 1;
}
}
- f++;
+ } else {
+ for(size_t f = 0; f < files->count; f++) {
+ char *c = strrchr(files->files[f].name, '/');
+ if(c && *(c + 1)) {
+ if(regex) {
+ m = regexec(®, (c + 1), 0, 0, 0);
+ } else {
+ m = strcmp(c + 1, targ);
+ }
+ if(m == 0) {
+ match = alpm_list_add(match, files->files[f].name);
+ found = 1;
+ }
+ }
+ }
}
if(match != NULL) {
@@ -307,30 +280,16 @@ int pacman_files(alpm_list_t *targets)
}
}
- if(targets == NULL && (config->op_q_owns | config->op_s_search)) {
- pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n"));
- return 1;
- }
-
- /* determine the owner of a file */
- if(config->op_q_owns) {
- return files_fileowner(files_dbs, targets);
- }
-
- /* search for a file */
- if(config->op_s_search) {
- return files_search(files_dbs, targets, config->op_f_regex);
- }
-
/* get a listing of files in sync DBs */
if(config->op_q_list) {
return files_list(files_dbs, targets);
}
- if(targets != NULL) {
- pm_printf(ALPM_LOG_ERROR, _("no options specified (use -h for help)\n"));
+ if(targets == NULL) {
+ pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n"));
return 1;
}
- return 0;
+ /* search for a file */
+ return files_search(files_dbs, targets, config->op_q_search);
}
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index a2a420b6..1ec57ff3 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -753,26 +753,18 @@ static int parsearg_files(int opt)
return 0;
}
switch(opt) {
- case OP_OWNS:
- case 'o':
- config->op_q_owns = 1;
- break;
case OP_LIST:
case 'l':
config->op_q_list = 1;
break;
case OP_SEARCH:
case 's':
- config->op_s_search = 1;
+ config->op_q_search = 1;
break;
case OP_REFRESH:
case 'y':
(config->op_s_sync)++;
break;
- case OP_REGEX:
- case 'x':
- config->op_f_regex = 1;
- break;
case OP_MACHINEREADABLE:
config->op_f_machinereadable = 1;
break;
@@ -788,13 +780,8 @@ static int parsearg_files(int opt)
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");
+ if(config->op_q_search) {
+ invalid_opt(config->op_q_list, "--search", "--list");
}
}
--
2.20.1