[hackers] [sbase] Do not interpret -- in echo(1) || sin

From: <git_AT_suckless.org>
Date: Fri, 3 Apr 2015 13:36:54 +0200 (CEST)

commit 9611e92303c587ea5d6c0fd0fab5f5e010153ba4
Author: sin <sin_AT_2f30.org>
Date: Fri Apr 3 10:29:11 2015 +0100

    Do not interpret -- in echo(1)
    
    Retain -n as it is marginally useful and common.

diff --git a/echo.c b/echo.c
index 8280137..c845c47 100644
--- a/echo.c
+++ b/echo.c
_AT_@ -1,26 +1,17 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdio.h>
-
+#include <string.h>
 #include "util.h"
 
-static void
-usage(void)
-{
- eprintf("usage: %s [-n] [string ...]\n", argv0);
-}
-
 int
 main(int argc, char *argv[])
 {
         int nflag = 0;
 
- ARGBEGIN {
- case 'n':
+ if (*++argv && !strcmp(*argv, "-n")) {
                 nflag = 1;
- break;
- default:
- usage();
- } ARGEND;
+ argc--, argv++;
+ }
 
         for (; *argv; argc--, argv++)
                 putword(*argv);
Received on Fri Apr 03 2015 - 13:36:54 CEST