Eliminating the getopt disgrace.

mv.c

@@ -9,26 +9,36 @@
 
 int mv(const char *, const char *);
 
+static void
+usage(void)
+{
+	eprintf("usage: %s source... dest\n", argv0);
+	exit(1);
+}
+
 int
 main(int argc, char *argv[])
 {
 	struct stat st;
-	
-	if(getopt(argc, argv, "") != -1)
-		exit(EXIT_FAILURE);
+
+	ARGBEGIN {
+	default:
+		usage();
+	} ARGEND;
+
 	if(argc > 3 && !(stat(argv[argc-1], &st) == 0 && S_ISDIR(st.st_mode)))
 		eprintf("%s: not a directory\n", argv[argc-1]);
-	enmasse(argc - optind, &argv[optind], mv);
-	return EXIT_SUCCESS;
+	enmasse(argc, &argv[0], mv);
+
+	return 0;
 }
 
 int
-mv (const char *s1, const char *s2)
+mv(const char *s1, const char *s2)
 {
 	if (rename(s1, s2) == 0)
 		return 0;
-	if (errno == EXDEV)
-	{
+	if (errno == EXDEV) {
 		cp_rflag = true;
 		rm_rflag = true;
 		cp(s1, s2);
@@ -37,3 +47,4 @@ mv (const char *s1, const char *s2)
 	}
 	return -1;
 }
+