diff options
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r-- | coreutils/ls.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index dbf1c5ba6..9e5c6dee9 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -799,8 +799,6 @@ int ls_main(int argc, char **argv) | |||
799 | int ac; | 799 | int ac; |
800 | int i; | 800 | int i; |
801 | char **av; | 801 | char **av; |
802 | USE_FEATURE_AUTOWIDTH(char *tabstops_str = NULL;) | ||
803 | USE_FEATURE_AUTOWIDTH(char *terminal_width_str = NULL;) | ||
804 | USE_FEATURE_LS_COLOR(char *color_opt;) | 802 | USE_FEATURE_LS_COLOR(char *color_opt;) |
805 | 803 | ||
806 | #if ENABLE_FEATURE_LS_TIMESTAMPS | 804 | #if ENABLE_FEATURE_LS_TIMESTAMPS |
@@ -820,12 +818,9 @@ int ls_main(int argc, char **argv) | |||
820 | /* process options */ | 818 | /* process options */ |
821 | USE_FEATURE_LS_COLOR(applet_long_options = ls_color_opt;) | 819 | USE_FEATURE_LS_COLOR(applet_long_options = ls_color_opt;) |
822 | #if ENABLE_FEATURE_AUTOWIDTH | 820 | #if ENABLE_FEATURE_AUTOWIDTH |
823 | opt = getopt32(argv, ls_options, &tabstops_str, &terminal_width_str | 821 | opt_complementary = "T+:w+"; /* -T N, -w N */ |
822 | opt = getopt32(argv, ls_options, &tabstops, &terminal_width | ||
824 | USE_FEATURE_LS_COLOR(, &color_opt)); | 823 | USE_FEATURE_LS_COLOR(, &color_opt)); |
825 | if (tabstops_str) | ||
826 | tabstops = xatou(tabstops_str); | ||
827 | if (terminal_width_str) | ||
828 | terminal_width = xatou(terminal_width_str); | ||
829 | #else | 824 | #else |
830 | opt = getopt32(argv, ls_options USE_FEATURE_LS_COLOR(, &color_opt)); | 825 | opt = getopt32(argv, ls_options USE_FEATURE_LS_COLOR(, &color_opt)); |
831 | #endif | 826 | #endif |