diff options
| author |  René Scharfe <l.s.r@web.de> | 2019-10-04 21:25:50 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-10-06 09:43:01 +0900 |
| commit | b181676ce9e8c89a39737f098d9b9c4f774596cf (patch) | |
| tree | 5612964e16a91ef7526722af951065970f7ad8f7 | |
| parent | mingw: allow building with an MSYS2 runtime v3.x (diff) | |
| download | tgif-b181676ce9e8c89a39737f098d9b9c4f774596cf.tar.xz | |
convert: fix handling of dashless UTF prefix in validate_encoding()
Strip "UTF" and an optional dash from the start of 'upper' without
passing a NULL pointer to skip_prefix() in the second call, as it cannot
handle that.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | convert.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -289,8 +289,8 @@ static int validate_encoding(const char *path, const char *enc, const char *stripped = NULL; char *upper = xstrdup_toupper(enc); upper[strlen(upper)-2] = '\0'; - if (!skip_prefix(upper, "UTF-", &stripped)) - skip_prefix(stripped, "UTF", &stripped); + if (skip_prefix(upper, "UTF", &stripped)) + skip_prefix(stripped, "-", &stripped); advise(advise_msg, path, stripped); free(upper); if (die_on_error) @@ -309,8 +309,8 @@ static int validate_encoding(const char *path, const char *enc, "working-tree-encoding."); const char *stripped = NULL; char *upper = xstrdup_toupper(enc); - if (!skip_prefix(upper, "UTF-", &stripped)) - skip_prefix(stripped, "UTF", &stripped); + if (skip_prefix(upper, "UTF", &stripped)) + skip_prefix(stripped, "-", &stripped); advise(advise_msg, path, stripped, stripped); free(upper); if (die_on_error) |