jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

version: fix comparision of pre-suffixes 

got broke in 0b9bfa8d52 which
fixed another corner case. hopefully it's good now. fixes #191.
cute-signatures
Timo Teras 2009-10-26 09:33:12 +02:00
parent 6f21645ecf
commit cc4644a54e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/version.c
View File

@ -207,12 +207,23 @@ int apk_version_compare_blob(apk_blob_t a, apk_blob_t b)
if (av > bv) if (av > bv)
return APK_VERSION_GREATER; return APK_VERSION_GREATER;
/* at and bt are the next expected token type */ /* both have TOKEN_END or TOKEN_INVALID next? */
if (at == bt) if (at == bt)
return APK_VERSION_EQUAL; return APK_VERSION_EQUAL;
if (at < bt || bt == TOKEN_INVALID)
return APK_VERSION_GREATER; /* leading version components and their values are equal,
* now the non-terminating version is greater unless it's a suffix
* indicating pre-release */
if (at == TOKEN_SUFFIX && get_token(&at, &a) < 0)
return APK_VERSION_LESS; return APK_VERSION_LESS;
if (bt == TOKEN_SUFFIX && get_token(&bt, &b) < 0)
return APK_VERSION_GREATER;
if (at == TOKEN_END)
return APK_VERSION_LESS;
if (bt == TOKEN_END)
return APK_VERSION_GREATER;
return APK_VERSION_EQUAL;
} }
int apk_version_compare(const char *str1, const char *str2) int apk_version_compare(const char *str1, const char *str2)