22**entab.c- add tabs to a text file
33**by Bruce Momjian (root@candle.pha.pa.us)
44**
5- ** version 1.2
5+ ** version 1.3
66**
77**tabsize = 4
88**
@@ -102,11 +102,11 @@ char **argv;
102102while (* src != NUL )
103103{
104104col_in_tab ++ ;
105- if (* src == ' ' || * src == '\t' )
105+ if (quote_char == ' ' && ( * src == ' ' || * src == '\t' ) )
106106{
107107if (* src == '\t' )
108108{
109- prv_spaces = prv_spaces + tab_size - col_in_tab + 1 ;
109+ prv_spaces += tab_size - col_in_tab + 1 ;
110110col_in_tab = tab_size ;
111111}
112112else
@@ -116,8 +116,8 @@ char **argv;
116116{
117117/*
118118Is the next character going to be a tab?
119- Needed to do tab replacement in current spot if
120- next char is going to be a tab, ignoring
119+ Needed to do tab replacement in current spot
120+ if next char is going to be a tab, ignoring
121121min_spaces
122122 */
123123nxt_spaces = 0 ;
@@ -136,32 +136,26 @@ char **argv;
136136break ;
137137}
138138}
139- if (quote_char == ' ' )
139+ if ((prv_spaces >=min_spaces ||
140+ nxt_spaces == tab_size )&&
141+ del_tabs == FALSE)
140142{
141- if ((prv_spaces >=min_spaces ||
142- nxt_spaces == tab_size )&&
143- del_tabs == FALSE)
144- {
145- * (dst ++ )= '\t' ;
146- prv_spaces = 0 ;
147- }
148- else
149- {
150- for (;prv_spaces > 0 ;prv_spaces -- )
151- * (dst ++ )= ' ' ;
152- }
143+ * (dst ++ )= '\t' ;
144+ prv_spaces = 0 ;
153145}
154146else
155147{
156- * ( dst ++ ) = * src ;
157- prv_spaces = 0 ;
148+ for (; prv_spaces > 0 ; prv_spaces -- )
149+ * ( dst ++ ) = ' ' ;
158150}
159151}
160152}
161153else
162154{
163155for (;prv_spaces > 0 ;prv_spaces -- )
164156* (dst ++ )= ' ' ;
157+ if (* src == '\t' )/* only when in quote */
158+ col_in_tab = 0 ;
165159if (* src == '\b' )
166160col_in_tab -= 2 ;
167161if (escaped == FALSE&& protect_quotes == TRUE)
@@ -179,7 +173,9 @@ char **argv;
179173escaped = FALSE;
180174
181175if ((* src == '\r' || * src == '\n' )&&
182- clip_lines == TRUE&& escaped == FALSE)
176+ quote_char == ' ' &&
177+ clip_lines == TRUE&&
178+ escaped == FALSE)
183179{
184180while (dst > out_line &&
185181 (* (dst - 1 )== ' ' || * (dst - 1 )== '\t' ))