Make the parsing of ssh command more robust, or more complicated.

It now can deal with both '-p 2222' and '-p2222'.

This is a follow up of 869cdb1090c5ea3e16a5b2f11276ffcabd09a982