MFC r316637-r316638

r316637:
When passingthrough from sdiff to diff the -H/--speed-large-files
options rename it to the long version as GNU diff only support the long
version of the option not the short version

r316638:
Remove a useless loop over the long options before passing through some
options to diff(1)