Apply upstream changesets 21f9d5f and 5c40ae1:

Fix bug with long options and explicitly number them to avoid this in
the future.

fix bug with 5.23 long options

Obtained from: https://github.com/file/file
Reported by: jkim