OSDN Git Service

Fix for entab.
authorBruce Momjian <bruce@momjian.us>
Sat, 6 Sep 1997 01:37:01 +0000 (01:37 +0000)
committerBruce Momjian <bruce@momjian.us>
Sat, 6 Sep 1997 01:37:01 +0000 (01:37 +0000)
src/tools/entab/entab.c

index e04d853..ab7d193 100644 (file)
@@ -113,10 +113,12 @@ char **argv;
 
                                        if (col_in_tab == tab_size)
                                        {
-                                               /* Is the next character going to be a tab?
-                                                  Needed to do tab replacement in current spot if
-                                                  next char is going to be a tab, ignoring
-                                                  min_spaces */
+                                               /*
+                                                       Is the next character going to be a tab?
+                                                       Needed to do tab replacement in current spot if
+                                                       next char is going to be a tab, ignoring
+                                                       min_spaces
+                                                */
                                                nxt_spaces = 0;
                                                while (1)
                                                {
@@ -133,17 +135,20 @@ char **argv;
                                                                break;
                                                        }
                                                }
-                                               if ((prv_spaces >= min_spaces || nxt_spaces == tab_size) &&
-                                                        quote_char == ' ' &&
-                                                        del_tabs == FALSE )
+                                               if (quote_char == ' ')
                                                {
-                                                       *(dst++) = '\t';
-                                                       prv_spaces = 0;
-                                               }
-                                               else
-                                               {
-                                                       for (; prv_spaces > 0; prv_spaces--)
-                                                               *(dst++) = ' ';
+                                                       if ((prv_spaces >= min_spaces ||
+                                                               nxt_spaces == tab_size) &&
+                                                               del_tabs == FALSE)
+                                                       {
+                                                               *(dst++) = '\t';
+                                                               prv_spaces = 0;
+                                                       }
+                                                       else
+                                                       {
+                                                               for (; prv_spaces > 0; prv_spaces--)
+                                                                       *(dst++) = ' ';
+                                                       }
                                                }
                                        }
                                }