diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-08 12:49:22 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-08 12:49:22 +0000 |
commit | 87d25a2b8535dc627a02eb539fa3946be2a24647 (patch) | |
tree | fc4d14a910593d1235318bb36abe5e9f72d2039e /coreutils/ls.c | |
parent | 81177b14907e73f11560f69e0b4ec34371f1a7d5 (diff) | |
download | busybox-w32-87d25a2b8535dc627a02eb539fa3946be2a24647.tar.gz busybox-w32-87d25a2b8535dc627a02eb539fa3946be2a24647.tar.bz2 busybox-w32-87d25a2b8535dc627a02eb539fa3946be2a24647.zip |
attempt to regularize atoi mess.
git-svn-id: svn://busybox.net/trunk/busybox@16342 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r-- | coreutils/ls.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 8ba4ab758..f34e83ebe 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -163,8 +163,8 @@ static int list_single(struct dnode *); | |||
163 | static unsigned int all_fmt; | 163 | static unsigned int all_fmt; |
164 | 164 | ||
165 | #ifdef CONFIG_FEATURE_AUTOWIDTH | 165 | #ifdef CONFIG_FEATURE_AUTOWIDTH |
166 | static int terminal_width = TERMINAL_WIDTH; | 166 | static unsigned terminal_width = TERMINAL_WIDTH; |
167 | static unsigned short tabstops = COLUMN_GAP; | 167 | static unsigned tabstops = COLUMN_GAP; |
168 | #else | 168 | #else |
169 | #define tabstops COLUMN_GAP | 169 | #define tabstops COLUMN_GAP |
170 | #define terminal_width TERMINAL_WIDTH | 170 | #define terminal_width TERMINAL_WIDTH |
@@ -915,10 +915,10 @@ int ls_main(int argc, char **argv) | |||
915 | #endif | 915 | #endif |
916 | ); | 916 | ); |
917 | if (tabstops_str) { | 917 | if (tabstops_str) { |
918 | tabstops = atoi(tabstops_str); | 918 | tabstops = xatou(tabstops_str); |
919 | } | 919 | } |
920 | if (terminal_width_str) { | 920 | if (terminal_width_str) { |
921 | terminal_width = atoi(terminal_width_str); | 921 | terminal_width = xatou(terminal_width_str); |
922 | } | 922 | } |
923 | #else | 923 | #else |
924 | opt = getopt32(argc, argv, ls_options | 924 | opt = getopt32(argc, argv, ls_options |