security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Factored utf8 switching code out to i18n.c.

Browse source
This commit is contained in:
Werner Koch 2007-10-19 15:58:38 +00:00
parent 259a40c830
commit c12ce55b25
12 changed files with 107 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

35
tools/symcryptrun.c
View file

@ -424,46 +424,17 @@ confucius_get_pass (const char *cacheid, int again, int *canceled)
{
int err;
char *pw;
#ifdef ENABLE_NLS
char *orig_codeset = NULL;
#endif
char *orig_codeset;
if (canceled)
*canceled = 0;
#ifdef ENABLE_NLS
/* The Assuan agent protocol requires us to transmit utf-8 strings */
orig_codeset = bind_textdomain_codeset (PACKAGE_GT, NULL);
#ifdef HAVE_LANGINFO_CODESET
if (!orig_codeset)
orig_codeset = nl_langinfo (CODESET);
#endif
if (orig_codeset && !strcmp (orig_codeset, "UTF-8"))
orig_codeset = NULL;
if (orig_codeset)
{
/* We only switch when we are able to restore the codeset later. */
orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
{
xfree (orig_codeset);
orig_codeset = NULL;
}
}
#endif
orig_codeset = i18n_switchto_utf8 ();
pw = simple_pwquery (cacheid,
again ? _("does not match - try again"):NULL,
_("Passphrase:"), NULL, 0, &err);
err = map_spwq_error (err);
#ifdef ENABLE_NLS
if (orig_codeset)
{
bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
xfree (orig_codeset);
}
#endif
i18n_switchback (orig_codeset);
if (!pw)
{