--- a/ed.c	Mon Sep 05 16:36:26 2011 +0200
+++ b/ed.c	Tue Aug 12 18:08:24 2014 +0200
@@ -175,7 +175,7 @@
 
 static jmp_buf	savej;
 
-static void	usage(char, int);
+static void	usage(char);
 static void	commands(void);
 static long	*address(void);
 static void	setdot(void);
@@ -295,46 +295,13 @@
 		sigset(SIGTERM, quit);
 	oldpipe = sigset(SIGPIPE, onpipe);
 	argv++;
-	while (argc > 1 && **argv=='-') {
-		if ((*argv)[1] == '\0') {
-			vflag = 0;
-			goto next;
-		} else if ((*argv)[1] == '-' && (*argv)[2] == '\0') {
-			argv++;
-			argc--;
-			break;
-		}
-	letter:	switch((*argv)[1]) {
-
-		case 's':
+	if (argc > 1 && **argv=='-') {
+		if ((*argv)[1]=='\0') {
 			vflag = 0;
-			break;
-
-		case 'q':
-			sigset(SIGQUIT, SIG_DFL);
-			vflag = 1;
-			break;
-
-		case 'p':
-			if ((*argv)[2])
-				prompt = &(*argv)[2];
-			else if (argv[1]) {
-				prompt = argv[1];
-				argv++;
-				argc--;
-			} else
-				usage((*argv)[1], 1);
-			Pflag = 1;
-			goto next;
-
-		default:
-			usage((*argv)[1], 0);
+		} else {
+			usage((*argv)[1]);
 		}
-		if ((*argv)[2]) {
-			(*argv)++;
-			goto letter;
-		}
-	next:	argv++;
+		argv++;
 		argc--;
 	}
 
@@ -372,20 +339,17 @@
 }
 
 static void
-usage(char c, int misarg)
+usage(char c)
 {
 	if (c) {
 		write(2, progname, strlen(progname));
-		if (misarg)
-			write(2, ": option requires an argument -- ", 33);
-		else
-			write(2, ": illegal option -- ", 20);
+		write(2, ": illegal option -- ", 20);
 		write(2, &c, 1);
 		write(2, "\n", 1);
 	}
 	write(2, "usage: ", 7);
 	write(2, progname, strlen(progname));
-	write(2, " [- | -s] [-p string] [file]\n", 29);
+	write(2, " [-] [file]\n", 12);
 	exit(2);
 }