x: fix XIM handling

[st.git] / arg.h

diff --git a/arg.h b/arg.h
index a94e6b5..a22e019 100644 (file)
--- a/arg.h
+++ b/arg.h
@@ -10,8 +10,8 @@ extern char *argv0;
 
 /* use main(int argc, char *argv[]) */
 #define ARGBEGIN       for (argv0 = *argv, argv++, argc--;\
 
 /* 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_;\
                                        argc--, argv++) {\
                                char argc_;\
                                char **argv_;\


@@ -21,28 +21,30 @@ extern char *argv0;
                                        argc--;\
                                        break;\
                                }\
                                        argc--;\
                                        break;\
                                }\

-                               for (brk_ = 0, argv[0]++, argv_ = argv;\
-                                               argv[0][0] && !brk_;\
-                                               argv[0]++) {\
+                               int i_;\
+                               for (i_ = 1, brk_ = 0, argv_ = argv;\
+                                               argv[0][i_] && !brk_;\
+                                               i_++) {\

                                        if (argv_ != argv)\
                                                break;\
                                        if (argv_ != argv)\
                                                break;\

-                                       argc_ = argv[0][0];\
+                                       argc_ = argv[0][i_];\

                                        switch (argc_)
                                        switch (argc_)

+

 #define ARGEND                 }\
                        }
 
 #define ARGC()         argc_
 
 #define ARGEND                 }\
                        }
 
 #define ARGC()         argc_
 

-#define EARGF(x)       ((argv[0][1] == '\0' && argv[1] == NULL)?\
+#define EARGF(x)       ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\

                                ((x), abort(), (char *)0) :\
                                ((x), abort(), (char *)0) :\

-                               (brk_ = 1, (argv[0][1] != '\0')?\
-                                       (&argv[0][1]) :\
+                               (brk_ = 1, (argv[0][i_+1] != '\0')?\
+                                       (&argv[0][i_+1]) :\

                                        (argc--, argv++, argv[0])))
 
                                        (argc--, argv++, argv[0])))
 

-#define ARGF()         ((argv[0][1] == '\0' && argv[1] == NULL)?\
+#define ARGF()         ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\

                                (char *)0 :\
                                (char *)0 :\

-                               (brk_ = 1, (argv[0][1] != '\0')?\
-                                       (&argv[0][1]) :\
+                               (brk_ = 1, (argv[0][i_+1] != '\0')?\
+                                       (&argv[0][i_+1]) :\

                                        (argc--, argv++, argv[0])))
 
 #endif
                                        (argc--, argv++, argv[0])))
 
 #endif