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

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