emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add HAVE_STRVERSCMP, guard the only usage of strverscmp with #ifdef

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-06-21 16:38:29 +02:00
parent 040b5a2e29
commit 561f9c8585
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/ls.c
View File

@ -886,9 +886,11 @@ static int sortcmp(const void *a, const void *b)
if (sort_opts == SORT_DIR) { 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 } else
#ifdef HAVE_STRVERSCMP && HAVE_STRVERSCMP == 1
if (sort_opts == SORT_VERSION) { if (sort_opts == SORT_VERSION) {
dif = strverscmp(d1->name, d2->name); dif = strverscmp(d1->name, d2->name);
} else } else
#endif
if (sort_opts == SORT_EXT) { if (sort_opts == SORT_EXT) {
dif = strcmp(strchrnul(d1->name, '.'), strchrnul(d2->name, '.')); dif = strcmp(strchrnul(d1->name, '.'), strchrnul(d2->name, '.'));
} }

5
include/platform.h
View File

@ -348,6 +348,7 @@ typedef unsigned smalluint;
#define HAVE_STRCHRNUL 1 #define HAVE_STRCHRNUL 1
#define HAVE_STRSEP 1 #define HAVE_STRSEP 1
#define HAVE_STRSIGNAL 1 #define HAVE_STRSIGNAL 1
#define HAVE_STRVERSCMP 1
#define HAVE_VASPRINTF 1 #define HAVE_VASPRINTF 1
#define HAVE_XTABS 1 #define HAVE_XTABS 1
#define HAVE_MNTENT_H 1 #define HAVE_MNTENT_H 1
@ -372,6 +373,7 @@ typedef unsigned smalluint;
# undef HAVE_STRCHRNUL # undef HAVE_STRCHRNUL
# undef HAVE_STRSEP # undef HAVE_STRSEP
# undef HAVE_STRSIGNAL # undef HAVE_STRSIGNAL
# undef HAVE_STRVERSCMP
# undef HAVE_VASPRINTF # undef HAVE_VASPRINTF
# undef HAVE_NET_ETHERNET_H # undef HAVE_NET_ETHERNET_H
#endif #endif
@ -389,18 +391,21 @@ typedef unsigned smalluint;
# undef HAVE_PTSNAME_R # undef HAVE_PTSNAME_R
# undef HAVE_SYS_STATFS_H # undef HAVE_SYS_STATFS_H
# undef HAVE_SIGHANDLER_T # undef HAVE_SIGHANDLER_T
# undef HAVE_STRVERSCMP
# undef HAVE_XTABS # undef HAVE_XTABS
# undef HAVE_DPRINTF # undef HAVE_DPRINTF
#endif #endif
#if defined(__digital__) && defined(__unix__) #if defined(__digital__) && defined(__unix__)
# undef HAVE_STPCPY # undef HAVE_STPCPY
# undef HAVE_STRVERSCMP
#endif #endif
#if defined(ANDROID) #if defined(ANDROID)
# undef HAVE_DPRINTF # undef HAVE_DPRINTF
# undef HAVE_STPCPY # undef HAVE_STPCPY
# undef HAVE_STRCHRNUL # undef HAVE_STRCHRNUL
# undef HAVE_STRVERSCMP
# undef HAVE_NET_ETHERNET_H # undef HAVE_NET_ETHERNET_H
#endif #endif