comparison 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
comparison
equal deleted inserted replaced
1:db609ba8ab93 2:a09d0630f05b
173 static int bcount = 22; 173 static int bcount = 22;
174 static int ocount = 11; 174 static int ocount = 11;
175 175
176 static jmp_buf savej; 176 static jmp_buf savej;
177 177
178 static void usage(char, int); 178 static void usage(char);
179 static void commands(void); 179 static void commands(void);
180 static long *address(void); 180 static long *address(void);
181 static void setdot(void); 181 static void setdot(void);
182 static void setall(void); 182 static void setall(void);
183 static void setnoaddr(void); 183 static void setnoaddr(void);
293 oldintr = sigset(SIGINT, SIG_IGN); 293 oldintr = sigset(SIGINT, SIG_IGN);
294 if (sigset(SIGTERM, SIG_IGN) != SIG_IGN) 294 if (sigset(SIGTERM, SIG_IGN) != SIG_IGN)
295 sigset(SIGTERM, quit); 295 sigset(SIGTERM, quit);
296 oldpipe = sigset(SIGPIPE, onpipe); 296 oldpipe = sigset(SIGPIPE, onpipe);
297 argv++; 297 argv++;
298 while (argc > 1 && **argv=='-') { 298 if (argc > 1 && **argv=='-') {
299 if ((*argv)[1] == '\0') { 299 if ((*argv)[1]=='\0') {
300 vflag = 0; 300 vflag = 0;
301 goto next; 301 } else {
302 } else if ((*argv)[1] == '-' && (*argv)[2] == '\0') { 302 usage((*argv)[1]);
303 argv++; 303 }
304 argc--; 304 argv++;
305 break;
306 }
307 letter: switch((*argv)[1]) {
308
309 case 's':
310 vflag = 0;
311 break;
312
313 case 'q':
314 sigset(SIGQUIT, SIG_DFL);
315 vflag = 1;
316 break;
317
318 case 'p':
319 if ((*argv)[2])
320 prompt = &(*argv)[2];
321 else if (argv[1]) {
322 prompt = argv[1];
323 argv++;
324 argc--;
325 } else
326 usage((*argv)[1], 1);
327 Pflag = 1;
328 goto next;
329
330 default:
331 usage((*argv)[1], 0);
332 }
333 if ((*argv)[2]) {
334 (*argv)++;
335 goto letter;
336 }
337 next: argv++;
338 argc--; 305 argc--;
339 } 306 }
340 307
341 growfn("no space"); 308 growfn("no space");
342 if (argc>1) { 309 if (argc>1) {
370 /*NOTREACHED*/ 337 /*NOTREACHED*/
371 return 0; 338 return 0;
372 } 339 }
373 340
374 static void 341 static void
375 usage(char c, int misarg) 342 usage(char c)
376 { 343 {
377 if (c) { 344 if (c) {
378 write(2, progname, strlen(progname)); 345 write(2, progname, strlen(progname));
379 if (misarg) 346 write(2, ": illegal option -- ", 20);
380 write(2, ": option requires an argument -- ", 33);
381 else
382 write(2, ": illegal option -- ", 20);
383 write(2, &c, 1); 347 write(2, &c, 1);
384 write(2, "\n", 1); 348 write(2, "\n", 1);
385 } 349 }
386 write(2, "usage: ", 7); 350 write(2, "usage: ", 7);
387 write(2, progname, strlen(progname)); 351 write(2, progname, strlen(progname));
388 write(2, " [- | -s] [-p string] [file]\n", 29); 352 write(2, " [-] [file]\n", 12);
389 exit(2); 353 exit(2);
390 } 354 }
391 355
392 static void 356 static void
393 commands(void) 357 commands(void)