Previously, the array count was ignored with the "-o" option.
While I admit that repeating code is not "good style", the goto from
the middle of a loop was not nice either, and this variant removes
a dependency of the main loop on the "aflag" variable.
Signed-off-by: Petr Tesarik <ptesarik(a)suse.cz>