Slightly modified patch from James Beal: add --no-eof (or --noeof) as