SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: replace strverscmp() and str_verscmp() with strverscmp_improved()

Browse Source
This commit is contained in:
Yu Watanabe
2021-02-09 14:25:03 +09:00
parent 87b7d9b6ff
commit 8087644a13
8 changed files with 10 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/bootctl.c
+1 -1
View File
@@ -471,7 +471,7 @@ static int compare_version(const char *a, const char *b) {
b += strcspn(b, " ");
b += strspn(b, " ");
return strverscmp(a, b);
return strverscmp_improved(a, b);
}
static int version_check(int fd_from, const char *from, int fd_to, const char *to) {
src/boot/efi/boot.c
+1 -58
View File
@@ -914,63 +914,6 @@ static VOID config_entry_free(ConfigEntry *entry) {
FreePool(entry);
}
static BOOLEAN is_digit(CHAR16 c) {
return (c >= '0') && (c <= '9');
}
static UINTN c_order(CHAR16 c) {
if (c == '\0')
return 0;
if (is_digit(c))
return 0;
else if ((c >= 'a') && (c <= 'z'))
return c;
else
return c + 0x10000;
}
static INTN str_verscmp(CHAR16 *s1, CHAR16 *s2) {
CHAR16 *os1 = s1;
CHAR16 *os2 = s2;
while (*s1 || *s2) {
INTN first;
while ((*s1 && !is_digit(*s1)) || (*s2 && !is_digit(*s2))) {
INTN order;
order = c_order(*s1) - c_order(*s2);
if (order != 0)
return order;
s1++;
s2++;
}
while (*s1 == '0')
s1++;
while (*s2 == '0')
s2++;
first = 0;
while (is_digit(*s1) && is_digit(*s2)) {
if (first == 0)
first = *s1 - *s2;
s1++;
s2++;
}
if (is_digit(*s1))
return 1;
if (is_digit(*s2))
return -1;
if (first != 0)
return first;
}
return StrCmp(os1, os2);
}
static CHAR8 *line_get_key_value(
CHAR8 *content,
CHAR8 *sep,
@@ -1535,7 +1478,7 @@ static INTN config_entry_compare(ConfigEntry *a, ConfigEntry *b) {
if (a->tries_left == 0 && b->tries_left != 0)
return -1;
r = str_verscmp(a->id, b->id);
r = strverscmp_improved(a->id, b->id);
if (r != 0)
return r;