tImport the arg.h without out of bounds from st. - rohrpost - A commandline mail client to change the world as we see it.
 (HTM) git clone git://r-36.net/rohrpost
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) LICENSE
       ---
 (DIR) commit 7d3182b95405ca9d5fe8db6096bf332ef3abc257
 (DIR) parent d59a3b539769e9b3f85a1a919b1853a7437ca0bc
 (HTM) Author: Christoph Lohmann <20h@r-36.net>
       Date:   Sat, 27 Feb 2016 23:19:59 +0100
       
       Import the arg.h without out of bounds from st.
       
       Diffstat:
         arg.h                               |      41 ++++++++++++-------------------
       
       1 file changed, 16 insertions(+), 25 deletions(-)
       ---
 (DIR) diff --git a/arg.h b/arg.h
       t@@ -3,55 +3,46 @@
         * by 20h
         */
        
       -#ifndef __ARG_H__
       -#define __ARG_H__
       +#ifndef ARG_H__
       +#define ARG_H__
        
        extern char *argv0;
        
       -#define USED(x)                ((void)(x))
       -
        /* use main(int argc, char *argv[]) */
        #define ARGBEGIN        for (argv0 = *argv, argv++, argc--;\
       -                                        argv[0] && argv[0][1]\
       -                                        && argv[0][0] == '-';\
       +                                        argv[0] && argv[0][0] == '-'\
       +                                        && argv[0][1];\
                                                argc--, argv++) {\
       -                                char _argc;\
       -                                char **_argv;\
       -                                int brk;\
       +                                char argc_;\
       +                                char **argv_;\
       +                                int brk_;\
                                        if (argv[0][1] == '-' && argv[0][2] == '\0') {\
                                                argv++;\
                                                argc--;\
                                                break;\
                                        }\
       -                                for (brk = 0, argv[0]++, _argv = argv;\
       -                                                argv[0][0] && !brk;\
       +                                for (brk_ = 0, argv[0]++, argv_ = argv;\
       +                                                argv[0][0] && !brk_;\
                                                        argv[0]++) {\
       -                                        if (_argv != argv)\
       +                                        if (argv_ != argv)\
                                                        break;\
       -                                        _argc = argv[0][0];\
       -                                        switch (_argc)
       -
       +                                        argc_ = argv[0][0];\
       +                                        switch (argc_)
        #define ARGEND                        }\
       -                                USED(_argc);\
       -                        }\
       -                        USED(argv);\
       -                        USED(argc);
       +                        }
        
       -#define ARGC()                _argc
       +#define ARGC()                argc_
        
        #define EARGF(x)        ((argv[0][1] == '\0' && argv[1] == NULL)?\
                                        ((x), abort(), (char *)0) :\
       -                                (brk = 1, (argv[0][1] != '\0')?\
       +                                (brk_ = 1, (argv[0][1] != '\0')?\
                                                (&argv[0][1]) :\
                                                (argc--, argv++, argv[0])))
        
        #define ARGF()                ((argv[0][1] == '\0' && argv[1] == NULL)?\
                                        (char *)0 :\
       -                                (brk = 1, (argv[0][1] != '\0')?\
       +                                (brk_ = 1, (argv[0][1] != '\0')?\
                                                (&argv[0][1]) :\
                                                (argc--, argv++, argv[0])))
        
       -#define LNGARG()        &argv[0][0]
       -
        #endif
       -