diff options
author | Ron Yorston <rmy@pobox.com> | 2020-07-09 13:10:58 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2020-07-09 13:10:58 +0100 |
commit | 9c0b2f7020d7c30b21a930ef54be632e092e533b (patch) | |
tree | b2187c40bd2fd9f49f73599fb08e52cb7a596de0 /coreutils | |
parent | a8c6e20e332a9e11a9d28cd6770eadb9c9d73cb7 (diff) | |
parent | d21a63f9fca8eb16f79de9b72d4a3484dfaec1fc (diff) | |
download | busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.tar.gz busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.tar.bz2 busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/expand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/expand.c b/coreutils/expand.c index 4fa974df8..5f5993921 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c | |||
@@ -160,7 +160,7 @@ static void unexpand(FILE *file, unsigned tab_size, unsigned opt) | |||
160 | putchar('\t'); | 160 | putchar('\t'); |
161 | } | 161 | } |
162 | 162 | ||
163 | if ((opt & OPT_INITIAL) && ptr != line) { | 163 | if (!(opt & OPT_ALL) && ptr != line) { |
164 | printf("%*s%s", len, "", ptr); | 164 | printf("%*s%s", len, "", ptr); |
165 | break; | 165 | break; |
166 | } | 166 | } |
@@ -207,13 +207,13 @@ int expand_main(int argc UNUSED_PARAM, char **argv) | |||
207 | "ft:a" | 207 | "ft:a" |
208 | "\0" | 208 | "\0" |
209 | "ta" /* -t NUM sets -a */, | 209 | "ta" /* -t NUM sets -a */, |
210 | "first-only\0" No_argument "i" | 210 | "first-only\0" No_argument "f" |
211 | "tabs\0" Required_argument "t" | 211 | "tabs\0" Required_argument "t" |
212 | "all\0" No_argument "a" | 212 | "all\0" No_argument "a" |
213 | , &opt_t | 213 | , &opt_t |
214 | ); | 214 | ); |
215 | /* -f --first-only is the default */ | 215 | /* -t implies -a, but an explicit -f overrides */ |
216 | if (!(opt & OPT_ALL)) opt |= OPT_INITIAL; | 216 | if (opt & OPT_INITIAL) opt &= ~OPT_ALL; |
217 | } | 217 | } |
218 | tab_size = xatou_range(opt_t, 1, UINT_MAX); | 218 | tab_size = xatou_range(opt_t, 1, UINT_MAX); |
219 | 219 | ||