|
@@ -160,7 +160,7 @@ static void unexpand(FILE *file, unsigned tab_size, unsigned opt)
|
|
|
putchar('\t');
|
|
|
}
|
|
|
|
|
|
- if ((opt & OPT_INITIAL) && ptr != line) {
|
|
|
+ if (!(opt & OPT_ALL) && ptr != line) {
|
|
|
printf("%*s%s", len, "", ptr);
|
|
|
break;
|
|
|
}
|
|
@@ -207,13 +207,13 @@ int expand_main(int argc UNUSED_PARAM, char **argv)
|
|
|
"ft:a"
|
|
|
"\0"
|
|
|
"ta" /* -t NUM sets -a */,
|
|
|
- "first-only\0" No_argument "i"
|
|
|
+ "first-only\0" No_argument "f"
|
|
|
"tabs\0" Required_argument "t"
|
|
|
"all\0" No_argument "a"
|
|
|
, &opt_t
|
|
|
);
|
|
|
- /* -f --first-only is the default */
|
|
|
- if (!(opt & OPT_ALL)) opt |= OPT_INITIAL;
|
|
|
+ /* -t implies -a, but an explicit -f overrides */
|
|
|
+ if (opt & OPT_INITIAL) opt &= ~OPT_ALL;
|
|
|
}
|
|
|
tab_size = xatou_range(opt_t, 1, UINT_MAX);
|
|
|
|