more: improve ugly macro

no comment, just F*CK YOU to the original author of this crap...

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/text-utils/more.c b/text-utils/more.c
index 4602cba97a55322b8ed0318b24dd65e2073a341b..2ac74393fa4fc8efb955e18bf5451bacca63138e 100644 (file)
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1922,11 +1922,13 @@ int readch(void)
 static char *BS = "\b";
 static char *BSB = "\b \b";
 static char *CARAT = "^";
-#define ERASEONECOLUMN \
-    if (docrterase) \
-       putserr(BSB); \
-    else \
-       putserr(BS);
+#define ERASEONECOLUMN(x) \
+               do { \
+                   if (x) \
+                       putserr(BSB); \
+                   else \
+                       putserr(BS); \
+               } while(0)
 
 void ttyin(char buf[], register int nmax, char pchar)
 {
@@ -1976,14 +1978,16 @@ void ttyin(char buf[], register int nmax, char pchar)
                                        }
 
                                        if (mblength == 1) {
-                                       ERASEONECOLUMN} else {
+                                               ERASEONECOLUMN(docrterase);
+                                       } else {
                                                int wc_width;
                                                wc_width = wcwidth(wc);
                                                wc_width =
                                                    (wc_width <
                                                     1) ? 1 : wc_width;
                                                while (wc_width--) {
-                                               ERASEONECOLUMN}
+                                                       ERASEONECOLUMN(docrterase);
+                                               }
                                        }
 
                                        while (mblength--) {
@@ -1994,12 +1998,14 @@ void ttyin(char buf[], register int nmax, char pchar)
 #endif /* HAVE_WIDECHAR */
                                {
                                        --promptlen;
-                                       ERASEONECOLUMN-- sp;
+                                       ERASEONECOLUMN(docrterase);
+                                       --sp;
                                }
 
                                if ((*sp < ' ' && *sp != '\n') || *sp == RUBOUT) {
                                        --promptlen;
-                               ERASEONECOLUMN}
+                                       ERASEONECOLUMN(docrterase);
+                               }
                                continue;
                        } else {
                                if (!eraseln)
@@ -2027,7 +2033,8 @@ void ttyin(char buf[], register int nmax, char pchar)
                }
                if (slash && ((cc_t) c == otty.c_cc[VKILL]
                              || (cc_t) c == otty.c_cc[VERASE])) {
-                       ERASEONECOLUMN-- sp;
+                       ERASEONECOLUMN(docrterase);
+                       --sp;
                }
                if (c != '\\')
                        slash = 0;