moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle all POSIX compliant systems in mbscasecmp. 

The width of wchar_t is allowed to be of the same width as long,
according to standards. The return type of mbscasecmp is int though.

On amd64 with a 32 bit int, this means that mbscasecmp can return
zero (indicating that strings are equal) even though the input
strings differ.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Tobias Stoeckmann 2016-06-18 18:58:07 +02:00 committed by Allan McRae
parent 5fcd60e264
commit af83a58574
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pacman/util.c
View File

@ -1503,6 +1503,8 @@ int select_question(int count)
return (preset - 1); return (preset - 1);
} }
#define CMP(x, y) ((x) < (y) ? -1 : ((x) > (y) ? 1 : 0))
static int mbscasecmp(const char *s1, const char *s2) static int mbscasecmp(const char *s1, const char *s2)
{ {
size_t len1 = strlen(s1), len2 = strlen(s2); size_t len1 = strlen(s1), len2 = strlen(s2);
@ -1520,19 +1522,19 @@ static int mbscasecmp(const char *s1, const char *s2)
return strcasecmp(p1, p2); return strcasecmp(p1, p2);
} }
if(b1 == 0 || b2 == 0) { if(b1 == 0 || b2 == 0) {
return c1 - c2; return CMP(c1, c2);
} }
c1 = towlower(c1); c1 = towlower(c1);
c2 = towlower(c2); c2 = towlower(c2);
if(c1 != c2) { if(c1 != c2) {
return c1 - c2; return CMP(c1, c2);
} }
p1 += b1; p1 += b1;
p2 += b2; p2 += b2;
len1 -= b1; len1 -= b1;
len2 -= b2; len2 -= b2;
} }
return *p1 - *p2; return CMP(*p1, *p2);
} }
/* presents a prompt and gets a Y/N answer */ /* presents a prompt and gets a Y/N answer */