Mark Brand authored Jun 11, 2012 and Akira TAGOH committed Jun 11, 2012

8c255fb1 moved some code out of switch
but did not declare 'buffer'. Also, replacing the "break" with
"goto bail" neglected the WIN32 specific code.