Fix option terminator handling
Fix option terminator handling

With the changes to option checking the terminator handling was not
being handled correctly/consistently.  Fix it.

Signed-off-by: Kevin Locke <ffb4761cba839470133bee36aeb139f58d7dbaa9@kevinlocke.name>

kevinoid/ultragetopt,kevinoid/ultragetopt