This patch, put together by Manuel Novoa III, is a merge of work

done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.

coreutils/dirname.c

@@ -30,7 +30,7 @@ extern int dirname_main(int argc, char **argv)
 	char* s;
 
 	if ((argc < 2) || (**(argv + 1) == '-'))
-		usage(dirname_usage);
+		show_usage();
 	argv++;
 
 	s=*argv+strlen(*argv)-1;