Very trivial changes from file 5.x: spelling mistakes, %ld->%d and some
style nits.

Update file to 4.21.

tested by ian@ sthen@

OK ian@, "move ahead with it" deraadt@

merge in new magic from file 4.09. Mostly from Bruno Rohee