unbreak, and remove the "goto bad's". discussed with and ok uwe@, jsg@, grange@
unbreak, and remove the "goto bad's".
discussed with and ok uwe@, jsg@, grange@

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars