r=adilger

 * clean up bugs in previous patch
 * print basename(argv[0]) instead of "mount" with error messages