Add new-line.  Remove braces.
No unneeded tabs and spaces in declarations.
Do not remove the EINTR code yet.