--- src/usr.bin/basename/basename.c	2005/09/18 10:12:55	1.5
+++ src/usr.bin/basename/basename.c	2005/09/22 23:44:55	1.6
@@ -58,9 +58,9 @@ main(int argc, char **argv)
 	int ch;
 
 	setlocale(LC_ALL, "");
-	
-	suffix = 0;
-	suffixlen = NULL;
+
+	suffix = NULL;
+	suffixlen = 0;
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
@@ -80,6 +80,10 @@ main(int argc, char **argv)
 	}
 	if ((p = basename(argv[0])) == NULL)
 		err(1, "%s", argv[0]);
+	if (argc == 2) {
+		suffix = argv[1];
+		suffixlen = strlen(argv[1]);
+	}
 	stripsuffix(p, suffix, suffixlen);
 	(void)printf("%s\n", p);
 	exit(0);