Skip to content
Snippets Groups Projects
Commit 4169eae1 authored by Max Rees's avatar Max Rees Committed by sroracle
Browse files

fflush in src/list.c to make tested behavior consistent

On glibc, if output is redirected to a file, output will look like this:

touch test/ok/gif
touch test/ok/jpg
touch test/ok/png
touch test/ok/pnm
test/ok/gif
test/ok/jpg
test/ok/png
test/ok/pnm

On musl, if stdout is redirected to a file, output looks like this:

test/ok/gif
touch test/ok/gif
touch test/ok/jpg
touch test/ok/png
touch test/ok/pnm
test/ok/jpg
test/ok/png
test/ok/pnm

On glibc and musl, if stdout is interactive, it looks like this:

test/ok/gif
touch test/ok/gif
test/ok/jpg
touch test/ok/jpg
test/ok/png
touch test/ok/png
test/ok/pnm
touch test/ok/pnm

Adding two fflush calls makes all behavior look like the last example.
Test cases have been updated accordingly.
parent 0911570b
No related branches found
No related tags found
No related merge requests found
...@@ -92,6 +92,7 @@ void real_loadables_mode(int loadable) ...@@ -92,6 +92,7 @@ void real_loadables_mode(int loadable)
if (opt.verbose) if (opt.verbose)
feh_display_status('.'); feh_display_status('.');
puts(file->filename); puts(file->filename);
fflush(stdout);
feh_action_run(file, opt.actions[0], NULL); feh_action_run(file, opt.actions[0], NULL);
} }
else { else {
...@@ -106,6 +107,7 @@ void real_loadables_mode(int loadable) ...@@ -106,6 +107,7 @@ void real_loadables_mode(int loadable)
if (opt.verbose) if (opt.verbose)
feh_display_status('.'); feh_display_status('.');
puts(file->filename); puts(file->filename);
fflush(stdout);
feh_action_run(file, opt.actions[0], NULL); feh_action_run(file, opt.actions[0], NULL);
} }
else { else {
......
touch test/ok/gif
touch test/ok/jpg
touch test/ok/png
touch test/ok/pnm
test/ok/gif test/ok/gif
touch test/ok/gif
test/ok/jpg test/ok/jpg
touch test/ok/jpg
test/ok/png test/ok/png
touch test/ok/png
test/ok/pnm test/ok/pnm
touch test/ok/pnm
touch test/ok/gif
touch test/ok/jpg
touch test/ok/png
touch test/ok/pnm
test/ok/gif test/ok/gif
touch test/ok/gif
test/ok/jpg test/ok/jpg
touch test/ok/jpg
test/ok/png test/ok/png
touch test/ok/png
test/ok/pnm test/ok/pnm
touch test/ok/pnm
rm test/fail/gif
rm test/fail/jpg
rm test/fail/png
rm test/fail/pnm
test/fail/gif test/fail/gif
rm test/fail/gif
test/fail/jpg test/fail/jpg
rm test/fail/jpg
test/fail/png test/fail/png
rm test/fail/png
test/fail/pnm test/fail/pnm
rm test/fail/pnm
rm test/fail/gif
rm test/fail/jpg
rm test/fail/png
rm test/fail/pnm
test/fail/gif test/fail/gif
rm test/fail/gif
test/fail/jpg test/fail/jpg
rm test/fail/jpg
test/fail/png test/fail/png
rm test/fail/png
test/fail/pnm test/fail/pnm
rm test/fail/pnm
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment