[pacman-dev] [PATCH 13/15] colourize -Sl/-Ql

[Simon Gomizelj]

Signed-off-by: Simon Gomizelj <simongmzlj at gmail.com>
---
 src/pacman/package.c | 7 ++-----
 src/pacman/sync.c    | 6 ++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/pacman/package.c b/src/pacman/package.c
index 06d31d6..df87dd8 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -307,12 +307,9 @@ void dump_pkg_files(alpm_pkg_t *pkg, int quiet)
 		 * Quiet  : '<root><filepath>\n'
 		 */
 		if(!quiet) {
-			fputs(pkgname, stdout);
-			putchar(' ');
+			printf("%s%s%s ", config->colstr.title, pkgname, config->colstr.nocolor);
 		}
-		fputs(root, stdout);
-		fputs(file->name, stdout);
-		putchar('\n');
+		printf("%s%s\n", root, file->name);
 	}
 
 	fflush(stdout);
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 7b54cba..e8da346 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -522,8 +522,10 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets)
 			alpm_pkg_t *pkg = j->data;
 
 			if(!config->quiet) {
-				printf("%s %s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg),
-						alpm_pkg_get_version(pkg));
+				const colstr_t *colstr = &config->colstr;
+				printf("%s%s %s%s %s%s%s", colstr->repo, alpm_db_get_name(db),
+						colstr->title, alpm_pkg_get_name(pkg),
+						colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor);
 				print_installed(db_local, pkg);
 				printf("\n");
 			} else {
-- 
1.8.1.5