Update test files, fix omitted {} in list.c

6 files changed, 25 insertions, 24 deletions

diff --git a/src/list.c b/src/list.c
index 3317da7..17fcbcc 100644
--- a/src/list.c
+++ b/src/list.c
@@ -44,7 +44,7 @@ void init_list_mode(void)
 		file = FEH_FILE(l->data);
 		if (opt.customlist)
 			printf("%s\n", feh_printf(opt.customlist, file));
-		else
+		else {
 			printf("%d\t%s\t%d\t%d\t%s", ++j,
 					file->info->format, file->info->width,
 					file->info->height,
@@ -52,6 +52,7 @@ void init_list_mode(void)
 			printf("\t%s\t%c\t%s\n",
 					format_size(file->info->size),
 					file->info->has_alpha ? 'X' : '-', file->filename);
+		}
 
 		feh_action_run(file, opt.actions[0]);
 	}
diff --git a/test/feh.t b/test/feh.t
index ac9262f..34b5cd3 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -36,7 +36,7 @@ my $re_warning =
 	qr{${feh_name} WARNING: test/fail/... \- No Imlib2 loader for that file format\n};
 my $re_loadable = qr{test/ok/...};
 my $re_unloadable = qr{test/fail/...};
-my $re_list_action = qr{test/ok/... 16x16 \(${feh_name}\)};
+my $re_list_action = qr{test/ok/... 16x16};
 
 my $cmd = Test::Command->new(cmd => "$feh --version");
 
@@ -128,7 +128,7 @@ $cmd->stdout_is_file('test/list/default');
 $cmd->stderr_is_eq('');
 
 $cmd = Test::Command->new(cmd =>
-	"$feh --quiet --list --action 'echo \"%f %wx%h (%P)\" >&2' $images");
+	"$feh --quiet --list --action 'echo \"%f %wx%h\" >&2' $images");
 
 $cmd->exit_is_num(0);
 $cmd->stdout_is_file('test/list/default');
diff --git a/test/list/default b/test/list/default
index d7b2c12..bc0ef52 100644
--- a/test/list/default
+++ b/test/list/default
@@ -1,5 +1,5 @@
-NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE(bytes)	ALPHA	FILENAME
-1	gif	16	16	256	953		-	test/ok/gif
-2	jpeg	16	16	256	354		-	test/ok/jpg
-3	png	16	16	256	403		X	test/ok/png
-4	pnm	16	16	256	269		-	test/ok/pnm
+NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE	ALPHA	FILENAME
+1	gif	16	16	256 	953 	-	test/ok/gif
+2	jpeg	16	16	256 	354 	-	test/ok/jpg
+3	png	16	16	256 	403 	X	test/ok/png
+4	pnm	16	16	256 	269 	-	test/ok/pnm
diff --git a/test/list/filename_recursive b/test/list/filename_recursive
index 5ffa63e..d4d27dd 100644
--- a/test/list/filename_recursive
+++ b/test/list/filename_recursive
@@ -1,6 +1,6 @@
-NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE(bytes)	ALPHA	FILENAME
-1	gif	16	16	256	953		-	test/ok/gif
-2	jpeg	16	16	256	354		-	test/ok/jpg
-3	png	16	16	256	403		X	test/ok/png
-4	pnm	16	16	256	269		-	test/ok/pnm
-5	png	16	16	256	403		X	test/ok/recursive/png
+NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE	ALPHA	FILENAME
+1	gif	16	16	256 	953 	-	test/ok/gif
+2	jpeg	16	16	256 	354 	-	test/ok/jpg
+3	png	16	16	256 	403 	X	test/ok/png
+4	pnm	16	16	256 	269 	-	test/ok/pnm
+5	png	16	16	256 	403 	X	test/ok/recursive/png
diff --git a/test/list/format_reverse b/test/list/format_reverse
index 801b732..9216184 100644
--- a/test/list/format_reverse
+++ b/test/list/format_reverse
@@ -1,5 +1,5 @@
-NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE(bytes)	ALPHA	FILENAME
-1	pnm	16	16	256	269		-	test/ok/pnm
-2	png	16	16	256	403		X	test/ok/png
-3	jpeg	16	16	256	354		-	test/ok/jpg
-4	gif	16	16	256	953		-	test/ok/gif
+NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE	ALPHA	FILENAME
+1	pnm	16	16	256 	269 	-	test/ok/pnm
+2	png	16	16	256 	403 	X	test/ok/png
+3	jpeg	16	16	256 	354 	-	test/ok/jpg
+4	gif	16	16	256 	953 	-	test/ok/gif
diff --git a/test/list/size b/test/list/size
index 9e1c3d0..cad60b0 100644
--- a/test/list/size
+++ b/test/list/size
@@ -1,5 +1,5 @@
-NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE(bytes)	ALPHA	FILENAME
-1	pnm	16	16	256	269		-	test/ok/pnm
-2	jpeg	16	16	256	354		-	test/ok/jpg
-3	png	16	16	256	403		X	test/ok/png
-4	gif	16	16	256	953		-	test/ok/gif
+NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE	ALPHA	FILENAME
+1	pnm	16	16	256 	269 	-	test/ok/pnm
+2	jpeg	16	16	256 	354 	-	test/ok/jpg
+3	png	16	16	256 	403 	X	test/ok/png
+4	gif	16	16	256 	953 	-	test/ok/gif