Output filename fix

The provided names in -o1 and -o2 were not passed on between argument
passing and initialisation of write structures, resulting in default
names.
Merge branch 'pr/n115_wforums'