[pacman-dev] [PATCH 13/13] Handle repo/pkg style arguments to sync repo file listing

Allan McRae allan at archlinux.org
Sat Jun 20 07:42:26 UTC 2015


Passing "-Fl pkg" will print the filelist for the first occurance of "pkg"
in the sync repos. Other version of the package can be printed using
"-Fl repo/pkg".

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 src/pacman/files.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/pacman/files.c b/src/pacman/files.c
index 5156e46..2250994 100644
--- a/src/pacman/files.c
+++ b/src/pacman/files.c
@@ -171,22 +171,45 @@ static int files_list(alpm_list_t *syncs, alpm_list_t *targets) {
 
 	if(targets != NULL) {
 		for(i = targets; i; i = alpm_list_next(i)) {
-			/* TODO: handle repo/pkg stype arguements */
 			char *targ = i->data;
-			
+			char *repo = NULL;
+			char *c = strchr(targ, '/');
+
+			if(c) {
+				if(! *(c + 1)) {
+					pm_printf(ALPM_LOG_ERROR,
+						_("invalid package: '%s'\n"), targ);
+					ret += 1;
+					continue;
+				}
+
+				repo = strndup(targ, c - targ);
+				targ = c + 1;
+			}
+
 			for(j = syncs; j; j = alpm_list_next(j)) {
 				alpm_pkg_t *pkg;
 				alpm_db_t *db = j->data;
+
+				if(repo) {
+					if(strcmp(alpm_db_get_name(db), repo) != 0) {
+						continue;
+					}
+				}
+
 				if((pkg = alpm_db_get_pkg(db, targ)) != NULL) {
 					found = 1;
 					dump_pkg_files(pkg, config->quiet);
+					break;
 				}
 			}
 			if(!found) {
+				targ = i->data;
 				pm_printf(ALPM_LOG_ERROR,
 						_("package '%s' was not found\n"), targ);
 				ret += 1;
 			}
+			free(repo);
 		}
 	} else {
 		for(i = syncs; i; i = alpm_list_next(i)) {
-- 
2.4.4


More information about the pacman-dev mailing list