windows: Support UTF-8 locale

Newer versions of the Windows CRT can return locales that are suffixed
with .utf8 instead of an integer code page.

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 554533ecb91bd0266602c26a823b391d03c946a5..18ad82d1e85f69f652b297379d82a92223f08c0d 100644 (file)
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -1512,8 +1512,10 @@ get_current_codepage(void)
        p = strrchr(locale, '.');
        if (p == NULL)
                return (GetACP());
+       if (strcmp(p+1, "utf8") == 0)
+               return CP_UTF8;
        cp = my_atoi(p+1);
-       if (cp <= 0)
+       if ((int)cp <= 0)
                return (GetACP());
        return (cp);
 }