heirloom-ed
diff ed.c @ 2:a09d0630f05b
removed unnecessary command line options
author | markus schnalke <meillo@marmaro.de> |
---|---|
date | Tue, 12 Aug 2014 18:08:24 +0200 |
parents | 1493bea5ac22 |
children | ac52712b2b5e |
line diff
1.1 --- a/ed.c Mon Sep 05 16:36:26 2011 +0200 1.2 +++ b/ed.c Tue Aug 12 18:08:24 2014 +0200 1.3 @@ -175,7 +175,7 @@ 1.4 1.5 static jmp_buf savej; 1.6 1.7 -static void usage(char, int); 1.8 +static void usage(char); 1.9 static void commands(void); 1.10 static long *address(void); 1.11 static void setdot(void); 1.12 @@ -295,46 +295,13 @@ 1.13 sigset(SIGTERM, quit); 1.14 oldpipe = sigset(SIGPIPE, onpipe); 1.15 argv++; 1.16 - while (argc > 1 && **argv=='-') { 1.17 - if ((*argv)[1] == '\0') { 1.18 + if (argc > 1 && **argv=='-') { 1.19 + if ((*argv)[1]=='\0') { 1.20 vflag = 0; 1.21 - goto next; 1.22 - } else if ((*argv)[1] == '-' && (*argv)[2] == '\0') { 1.23 - argv++; 1.24 - argc--; 1.25 - break; 1.26 + } else { 1.27 + usage((*argv)[1]); 1.28 } 1.29 - letter: switch((*argv)[1]) { 1.30 - 1.31 - case 's': 1.32 - vflag = 0; 1.33 - break; 1.34 - 1.35 - case 'q': 1.36 - sigset(SIGQUIT, SIG_DFL); 1.37 - vflag = 1; 1.38 - break; 1.39 - 1.40 - case 'p': 1.41 - if ((*argv)[2]) 1.42 - prompt = &(*argv)[2]; 1.43 - else if (argv[1]) { 1.44 - prompt = argv[1]; 1.45 - argv++; 1.46 - argc--; 1.47 - } else 1.48 - usage((*argv)[1], 1); 1.49 - Pflag = 1; 1.50 - goto next; 1.51 - 1.52 - default: 1.53 - usage((*argv)[1], 0); 1.54 - } 1.55 - if ((*argv)[2]) { 1.56 - (*argv)++; 1.57 - goto letter; 1.58 - } 1.59 - next: argv++; 1.60 + argv++; 1.61 argc--; 1.62 } 1.63 1.64 @@ -372,20 +339,17 @@ 1.65 } 1.66 1.67 static void 1.68 -usage(char c, int misarg) 1.69 +usage(char c) 1.70 { 1.71 if (c) { 1.72 write(2, progname, strlen(progname)); 1.73 - if (misarg) 1.74 - write(2, ": option requires an argument -- ", 33); 1.75 - else 1.76 - write(2, ": illegal option -- ", 20); 1.77 + write(2, ": illegal option -- ", 20); 1.78 write(2, &c, 1); 1.79 write(2, "\n", 1); 1.80 } 1.81 write(2, "usage: ", 7); 1.82 write(2, progname, strlen(progname)); 1.83 - write(2, " [- | -s] [-p string] [file]\n", 29); 1.84 + write(2, " [-] [file]\n", 12); 1.85 exit(2); 1.86 } 1.87