Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-23 20:29:42 +00:00
Code Issues Projects Releases Wiki Activity

ls: make -v and -X actually work as intended

Browse Source 
function                                             old     new   delta
strverscmp                                             -     236    +236
sortcmp                                              186     254     +68
static.result_type                                     -      60     +60
static.next_state                                     12      16      +4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-06-13 02:13:42 +02:00
parent b307eabf4d
commit f194cc1f33
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
coreutils/ls.c
View File

@ -874,19 +874,27 @@ static int sortcmp(const void *a, const void *b)
// instead of branch forest // instead of branch forest
if (sort_opts == SORT_SIZE) { if (sort_opts == SORT_SIZE) {
dif = (d2->dn_size - d1->dn_size); dif = (d2->dn_size - d1->dn_size);
} else if (sort_opts == SORT_ATIME) { } else
if (sort_opts == SORT_ATIME) {
dif = (d2->dn_atime - d1->dn_atime); dif = (d2->dn_atime - d1->dn_atime);
} else if (sort_opts == SORT_CTIME) { } else
if (sort_opts == SORT_CTIME) {
dif = (d2->dn_ctime - d1->dn_ctime); dif = (d2->dn_ctime - d1->dn_ctime);
} else if (sort_opts == SORT_MTIME) { } else
if (sort_opts == SORT_MTIME) {
dif = (d2->dn_mtime - d1->dn_mtime); dif = (d2->dn_mtime - d1->dn_mtime);
} else if (sort_opts == SORT_DIR) { } else
if (sort_opts == SORT_DIR) {
dif = S_ISDIR(d2->dn_mode) - S_ISDIR(d1->dn_mode); dif = S_ISDIR(d2->dn_mode) - S_ISDIR(d1->dn_mode);
/* } else if (sort_opts == SORT_VERSION) { */ } else
/* } else if (sort_opts == SORT_EXT) { */ if (sort_opts == SORT_VERSION) {
dif = strverscmp(d1->name, d2->name);
} else
if (sort_opts == SORT_EXT) {
dif = strcmp(strchrnul(d1->name, '.'), strchrnul(d2->name, '.'));
} }
if (dif == 0) { if (dif == 0) {
/* sort by name, or tie_breaker for other sorts */ /* sort by name, use as tie breaker for other sorts */
if (ENABLE_LOCALE_SUPPORT) if (ENABLE_LOCALE_SUPPORT)
dif = strcoll(d1->name, d2->name); dif = strcoll(d1->name, d2->name);
else else