[hackers] [sbase] Audit expand(1) || FRIGN

[git]

commit 06952334afda70f534a12aa8af21ae9cf08fc039
Author: FRIGN <d...@frign.de>
Date:   Fri Mar 13 00:37:37 2015 +0100

    Audit expand(1)
    
    Not much to do here. Forgot a colon in the manpage and some style-
    changes in the code.

diff --git a/README b/README
index a53e317..167844f 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ The following tools are implemented ('*' == finished, '#' == 
UTF-8 support,
 =*| du              yes                          none
 =*| echo            yes                          none
 =*| env             yes                          none
-#*  expand          yes                          none
+#*| expand          yes                          none
 #*  expr            yes                          none
 =*| false           yes                          none
 =   find            yes                          none
diff --git a/expand.1 b/expand.1
index e5b5e0f..8b52843 100644
--- a/expand.1
+++ b/expand.1
@@ -1,4 +1,4 @@
-.Dd January 25, 2015
+.Dd March 13, 2015
 .Dt EXPAND 1
 .Os sbase
 .Sh NAME
@@ -48,4 +48,4 @@ specification.
 .Pp
 The
 .Op Fl i
-flag is an extension to that specification
+flag is an extension to that specification.
diff --git a/expand.c b/expand.c
index 2f02e26..506039d 100644
--- a/expand.c
+++ b/expand.c
@@ -27,6 +27,7 @@ parselist(const char *s)
        tablist = ereallocarray(tablist, i + 1, sizeof(*tablist));
        /* tab length = 1 for the overflowing case later in the matcher */
        tablist[i] = 1;
+
        return i;
 }
 
@@ -87,8 +88,8 @@ int
 main(int argc, char *argv[])
 {
        FILE *fp;
+       int ret = 0;
        char *tl = "8";
-       int   ret = 0;
 
        ARGBEGIN {
        case 'i':
@@ -105,18 +106,19 @@ main(int argc, char *argv[])
 
        tablistlen = parselist(tl);
 
-       if (argc == 0) {
+       if (!argc) {
                expand("<stdin>", stdin);
        } else {
-               for (; argc > 0; argc--, argv++) {
-                       if (!(fp = fopen(argv[0], "r"))) {
-                               weprintf("fopen %s:", argv[0]);
+               for (; *argv; argc--, argv++) {
+                       if (!(fp = fopen(*argv, "r"))) {
+                               weprintf("fopen %s:", *argv);
                                ret = 1;
                                continue;
                        }
-                       expand(argv[0], fp);
+                       expand(*argv, fp);
                        fclose(fp);
                }
        }
+
        return ret;
 }