pacman: rework the UI of -F

Reworks the UI of -F according to FS#47949

In short -F replaces both -Fs and -Fo.

Searching for an exact path (target contains "/"), causes the output to
switch to the old -Fo output. Otherwise the old -Fs output is used.

Also strip the leading "/" from targets like how -Qo does.

Signed-off-by: Allan McRae <allan@archlinux.org>

doc/pacman.8.asciidoc

@@ -488,14 +488,8 @@ File Options (apply to '-F')[[FO]]
 *-l, \--list*::
 	List the files owned by the queried package.
 
-*-s, \--search*::
-	Search package file names for matching strings.
-
 *-x, --regex*::
-	Treat arguments to '--search' as regular expressions.
+	Interpret each query as a regular expression.
-
-*-o, \--owns*::
-	Search for packages that own a particular file.
 
 *-q, \--quiet*::
 	Show less information for certain file operations. This is useful when
@@ -503,9 +497,9 @@ File Options (apply to '-F')[[FO]]
 	'--machinereadable' instead.
 
 *--machinereadable*::
-	Use a machine readable output format for '--list', '--search' and
+	Print each match in a machine readable output format. The format is
-	'--owns'. The format is 'repository\0pkgname\0pkgver\0path\n' with '\0'
+	'repository\0pkgname\0pkgver\0path\n' with '\0' being the NULL character
-	being the NULL character and '\n' a linefeed.
+	and '\n' a linefeed.
 
 Handling Config Files[[HCF]]
 ----------------------------

src/pacman/files.c

@@ -58,53 +58,7 @@ static void print_owned_by(alpm_db_t *db, alpm_pkg_t *pkg, char *filename)
 		alpm_pkg_get_version(pkg), colstr->nocolor);
 }
 
-static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) {
+static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, char *exact_file)
-	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) {
-						print_owned_by(repo, pkg, filename);
-					} 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);
 	const colstr_t *colstr = &config->colstr;
@@ -117,6 +71,12 @@ static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg)
 		}
 	} else if(config->quiet) {
 		printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg));
+	} else if(exact_file != NULL) {
+		alpm_list_t *ml;
+		for(ml = match; ml; ml = alpm_list_next(ml)) {
+			char *filename = ml->data;
+			print_owned_by(repo, pkg, filename);
+		}
 	} else {
 		alpm_list_t *ml;
 		printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo),
@@ -143,6 +103,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(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) {
@@ -158,14 +127,28 @@ 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) {
+				if(exact_file != NULL) {
-					c = strrchr(files->files[f].name, '/');
+					if (regex) {
+						for(size_t f = 0; f < files->count; f++) {
+							char *c = files->files[f].name;
+							if(regexec(&reg, c, 0, 0, 0) == 0) {
+								match = alpm_list_add(match, files->files[f].name);
+								found = 1;
+							}
+						}
+					} else {
+						if(alpm_filelist_contains(files, targ)) {
+							match = alpm_list_add(match, targ);
+							found = 1;
+						}
+					}
+				} 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(&reg, (c + 1), 0, 0, 0);
@@ -177,11 +160,11 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
 								found = 1;
 							}
 						}
-					f++;
+					}
 				}
 
 				if(match != NULL) {
-					print_match(match, repo, pkg);
+					print_match(match, repo, pkg, exact_file);
 					alpm_list_free(match);
 				}
 			}
@@ -312,30 +295,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) {
+	if(targets == NULL) {
-		pm_printf(ALPM_LOG_ERROR, _("no options specified (use -h for help)\n"));
+		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_f_regex);
 }

src/pacman/pacman.c

@@ -177,9 +177,7 @@ static void usage(int op, const char * const myname)
 			printf("%s:\n", str_opt);
 		} 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(_("  -q, --quiet          show less information for query and search\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"));
@@ -753,18 +751,10 @@ 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;
-			break;
 		case OP_REFRESH:
 		case 'y':
 			(config->op_s_sync)++;
@@ -788,13 +778,8 @@ static int parsearg_files(int opt)
 
 static void checkargs_files(void)
 {
-	if(config->op_q_owns) {
+	if(config->op_q_search) {
-		invalid_opt(config->op_q_list, "--owns", "--list");
+		invalid_opt(config->op_q_list, "--regex", "--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");
 	}
 }