Eliminating the getopt disgrace.

kill.c

@@ -19,60 +19,62 @@ struct {
 #undef SIG
 };
 
-static void usage(void);
+static void
+usage(void)
+{
+	eprintf("usage: %s [-s signal] [pid...]\n"
+	        "       %s -l [signum]\n", argv0, argv0);
+	exit(1);
+}
 
 int
 main(int argc, char *argv[])
 {
 	bool lflag = false;
-	char c, *end;
+	char *end, *v;
 	int sig = SIGTERM;
 	pid_t pid;
 	size_t i;
 
-	while((c = getopt(argc, argv, "ls:")) != -1)
-		switch(c) {
-		case 'l':
-			lflag = true;
+	ARGBEGIN {
+	case 'l':
+		lflag = true;
+		break;
+	case 's':
+		v = EARGF(usage());
+		sig = strtol(v, &end, 0);
+		if(*end == '\0')
 			break;
-		case 's':
-			sig = strtol(optarg, &end, 0);
-			if(*end == '\0')
+		for(i = 0; i < LEN(sigs); i++) {
+			if(!strcasecmp(v, sigs[i].name)) {
+				sig = sigs[i].sig;
 				break;
-			for(i = 0; i < LEN(sigs); i++)
-				if(!strcasecmp(optarg, sigs[i].name)) {
-					sig = sigs[i].sig;
-					break;
-				}
-			if(i == LEN(sigs))
-				eprintf("%s: unknown signal\n", optarg);
-			break;
-		default:
-			usage();
+			}
 		}
-	if(optind < argc-1)
+		if(i == LEN(sigs))
+			eprintf("%s: unknown signal\n", v);
+		break;
+	default:
+		usage();
+	} ARGEND;
+
+	if(argc < 2)
 		usage();
 
 	if(lflag) {
-		sig = (optind == argc) ? 0 : estrtol(argv[optind], 0);
+		sig = (argc > 0) ? 0 : estrtol(argv[0], 0);
 		if(sig > 128)
 			sig = WTERMSIG(sig);
 		for(i = 0; i < LEN(sigs); i++)
 			if(sigs[i].sig == sig || sig == 0)
 				putword(sigs[i].name);
 		putchar('\n');
-	}
-	else for(; optind < argc; optind++) {
-		pid = estrtol(argv[optind], 0);
+	} else for(; argc > 0; argc--, argv++) {
+		pid = estrtol(argv[0], 0);
 		if(kill(pid, sig) == -1)
 			eprintf("kill %d:", pid);
 	}
-	return EXIT_SUCCESS;
+
+	return 0;
 }
 
-void
-usage(void)
-{
-	eprintf("usage: %s [-s signal] [pid...]\n"
-	        "       %s -l [signum]\n", argv0, argv0);
-}