From mboxrd@z Thu Jan 1 00:00:00 1970 From: Torsten =?utf-8?q?B=C3=B6gershausen?= Subject: [PATCH] precompompose_utf8.c: iconv_open_or_die Date: Tue, 21 Aug 2012 21:20:55 +0200 Message-ID: <201208212120.56444.tboegi@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: tboegi@web.de To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 21 21:21:16 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1T3u0p-0004ik-4C for gcvg-git-2@plane.gmane.org; Tue, 21 Aug 2012 21:21:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752635Ab2HUTVI convert rfc822-to-quoted-printable (ORCPT ); Tue, 21 Aug 2012 15:21:08 -0400 Received: from mout.web.de ([212.227.17.12]:52487 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752525Ab2HUTVG convert rfc822-to-8bit (ORCPT ); Tue, 21 Aug 2012 15:21:06 -0400 Received: from appes.localnet ([195.67.191.22]) by smtp.web.de (mrweb102) with ESMTPA (Nemesis) id 0MUF4Q-1TC7Dm0Weo-00QOuv; Tue, 21 Aug 2012 21:21:04 +0200 X-Provags-ID: V02:K0:oIAuumJvkwmu7p4Eko44HyTa0/oBpvWqU+1mFsXyONK W9uD1UBRx584zWGW8kYDG/aI7tf0xAmTliNy/e1E6rWo7vBwIW twaUfZPX47fc5tQK7aNuATMy2iVozVsKmcxIr3WnUZiyL4CSxX WAblyu3MggEtF5+rxRs3uQCTmg8aimCQLsyQ7Q6rrvFApvC1Ow XezurF+UhmGW6LyxjpkLg== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add the function iconv_open_or_die(), which is used in both readdir() and precompose_argv() Optimized away one save/restore of errno, which is no longer nedded Signed-off-by: Torsten B=C3=B6gershausen --- (Needs to be applied to pu) compat/precompose_utf8.c | 63 ++++++++++++++++++++++++----------------= -------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c index e6c6bf2..95ab9a1 100644 --- a/compat/precompose_utf8.c +++ b/compat/precompose_utf8.c @@ -13,6 +13,19 @@ typedef char *iconv_ibp; static const char *repo_encoding =3D "UTF-8"; static const char *path_encoding =3D "UTF-8-MAC"; =20 +static iconv_t iconv_open_or_die(const char* tocode, const char* fromc= ode) +{ + iconv_t my_iconv; + my_iconv =3D iconv_open(tocode, fromcode); + if (my_iconv =3D=3D (iconv_t) -1) { + die(_("iconv_open(%s,%s) failed, but needed:\n" + " core.precomposeunicode not supported.\n"), + repo_encoding, path_encoding); + } + + return my_iconv; +} + static size_t has_utf8(const char *s, size_t maxlen, size_t *strlen_c) { const uint8_t *utf8p =3D (const uint8_t *)s; @@ -78,9 +91,7 @@ void precompose_argv(int argc, const char **argv) if (argc <=3D i) return; /* no utf8 found */ =20 - ic_precompose =3D iconv_open(repo_encoding, path_encoding); - if (ic_precompose =3D=3D (iconv_t) -1) - return; + ic_precompose =3D iconv_open_or_die(repo_encoding, path_encoding); =20 for (i =3D 0; i < argc; i++) { size_t namelen; @@ -106,11 +117,8 @@ PREC_DIR *precompose_utf8_opendir(const char *dirn= ame) free(prec_dir->dirent_nfc); free(prec_dir); return NULL; - } else { - int ret_errno =3D errno; + } else prec_dir->ic_precompose =3D (iconv_t)-1; - errno =3D ret_errno; - } =20 return prec_dir; } @@ -137,32 +145,23 @@ struct dirent_prec_psx *precompose_utf8_readdir(P= REC_DIR *prec_dir) prec_dir->dirent_nfc->d_type =3D res->d_type; =20 if ((precomposed_unicode =3D=3D 1) && has_utf8(res->d_name, (size_t)= -1, NULL)) { + iconv_ibp cp =3D (iconv_ibp)res->d_name; + size_t inleft =3D namelenz; + char *outpos =3D &prec_dir->dirent_nfc->d_name[0]; + size_t outsz =3D prec_dir->dirent_nfc->max_name_len; + size_t cnt; + errno =3D 0; if (prec_dir->ic_precompose =3D=3D (iconv_t)-1) - prec_dir->ic_precompose =3D - iconv_open(repo_encoding, path_encoding); - if (prec_dir->ic_precompose =3D=3D (iconv_t)-1) { - die("iconv_open(%s,%s) failed, but needed:\n" - " precomposed unicode is not supported.\n" - " If you wnat to use decomposed unicode, run\n" - " \"git config core.precomposeunicode false\"\n", - repo_encoding, path_encoding); - } else { - iconv_ibp cp =3D (iconv_ibp)res->d_name; - size_t inleft =3D namelenz; - char *outpos =3D &prec_dir->dirent_nfc->d_name[0]; - size_t outsz =3D prec_dir->dirent_nfc->max_name_len; - size_t cnt; - errno =3D 0; - cnt =3D iconv(prec_dir->ic_precompose, &cp, &inleft, &outpos, &out= sz); - if (errno || inleft) { - /* - * iconv() failed and errno could be E2BIG, EILSEQ, EINVAL, EBADF - * MacOS X avoids illegal byte sequemces. - * If they occur on a mounted drive (e.g. NFS) it is not worth to - * die() for that, but rather let the user see the original name - */ - namelenz =3D 0; /* trigger strlcpy */ - } + prec_dir->ic_precompose =3D iconv_open_or_die(repo_encoding, path_= encoding); + cnt =3D iconv(prec_dir->ic_precompose, &cp, &inleft, &outpos, &outs= z); + if (errno || inleft) { + /* + * iconv() failed and errno could be E2BIG, EILSEQ, EINVAL, EBADF + * MacOS X avoids illegal byte sequemces. + * If they occur on a mounted drive (e.g. NFS) it is not worth to + * die() for that, but rather let the user see the original name + */ + namelenz =3D 0; /* trigger strlcpy */ } } else namelenz =3D 0; --=20 1.7.12