Replace xstricmp() with strcoll()

This commit is contained in:
Arun Prakash Jana 2017-12-22 01:19:32 +05:30
parent a451e74465
commit 59ae6c9e7f
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 5 additions and 2 deletions

View file

@ -104,7 +104,6 @@ Have fun with it! PRs are welcome. Check out [#1](https://github.com/jarun/nnn/i
- Detailed file information - Detailed file information
- Media information (needs mediainfo or exiftool, if specified) - Media information (needs mediainfo or exiftool, if specified)
- Ordering - Ordering
- Numeric order (1, 2, ... 10, 11, ...) for numeric names
- Sort by modification time, size - Sort by modification time, size
- Convenience - Convenience
- Create, rename files and directories - Create, rename files and directories

6
nnn.c
View file

@ -632,6 +632,7 @@ xdiraccess(char *path)
return TRUE; return TRUE;
} }
#if 0
/* /*
* We assume none of the strings are NULL. * We assume none of the strings are NULL.
* *
@ -639,6 +640,8 @@ xdiraccess(char *path)
* E.g., the order '1, 10, 2' doesn't make sense to human eyes. * E.g., the order '1, 10, 2' doesn't make sense to human eyes.
* *
* If the absolute numeric values are same, we fallback to alphasort. * If the absolute numeric values are same, we fallback to alphasort.
*
* NOTE: This API is replaced by strcoll().
*/ */
static int static int
xstricmp(char *s1, char *s2) xstricmp(char *s1, char *s2)
@ -731,6 +734,7 @@ xstricmp(char *s1, char *s2)
return (int) (TOUPPER(*s1) - TOUPPER(*s2)); return (int) (TOUPPER(*s1) - TOUPPER(*s2));
} }
#endif
/* Return the integer value of a char representing HEX */ /* Return the integer value of a char representing HEX */
static char static char
@ -842,7 +846,7 @@ entrycmp(const void *va, const void *vb)
return -1; return -1;
} }
return xstricmp(pa->name, pb->name); return strcoll(pa->name, pb->name);
} }
/* /*