Attachment #2913 for bug #2643

Lines 379-385 main(int argc, char **argv) Link Here

(-)a/scp.c (-1 / +1 lines)
379	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */	379	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
380	sanitise_stdfd();	380	sanitise_stdfd();
381		381
382	setlocale(LC_CTYPE, "");	382	msetlocale();
383		383
384	/* Copy argv, because we modify it */	384	/* Copy argv, because we modify it */
385	newargv = xcalloc(MAXIMUM(argc + 1, 1), sizeof(*newargv));	385	newargv = xcalloc(MAXIMUM(argc + 1, 1), sizeof(*newargv));

Lines 2272-2278 main(int argc, char **argv) Link Here

(-)a/sftp.c (-1 / +1 lines)
2272	ssh_malloc_init(); /* must be called before any mallocs */	2272	ssh_malloc_init(); /* must be called before any mallocs */
2273	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */	2273	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
2274	sanitise_stdfd();	2274	sanitise_stdfd();
2275	setlocale(LC_CTYPE, "");	2275	msetlocale();
2276		2276
2277	__progname = ssh_get_progname(argv[0]);	2277	__progname = ssh_get_progname(argv[0]);
2278	memset(&args, '\0', sizeof(args));	2278	memset(&args, '\0', sizeof(args));

Lines 109-114 Link Here

(-)a/ssh.c (-1 / +2 lines)
109	#include "version.h"	109	#include "version.h"
110	#include "ssherr.h"	110	#include "ssherr.h"
111	#include "myproposal.h"	111	#include "myproposal.h"
		112	#include "utf8.h"
112		113
113	#ifdef ENABLE_PKCS11	114	#ifdef ENABLE_PKCS11
114	#include "ssh-pkcs11.h"	115	#include "ssh-pkcs11.h"
Lines 589-595 main(int ac, char **av) Link Here
589	*/	590	*/
590	umask(022);	591	umask(022);
591		592
592	setlocale(LC_CTYPE, "");	593	msetlocale();
593		594
594	/*	595	/*
595	* Initialize option structure to indicate that no values have been	596	* Initialize option structure to indicate that no values have been




# include <langinfo.h>
#endif
#include <limits.h>
#include <locale.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>

	va_end(ap);
	return ret;
}

/*
 * Set up libc for multibyte output in the user's chosen locale.
 *
 * XXX: we are known to have problems with Turkish (i/I confusion) so we
 *      deliberately fall back to the C locale for now. Longer term we should
 *      always prefer to select C.[encoding] if possible, but there's no
 *      standardisation in locales between systems, so we'll need to survey
 *      what's out there first.
 */
void
msetlocale(void)
{
	const char *vars[] = { "LC_ALL", "LC_CTYPE", "LANG", NULL };
	char *cp;
	int i;

	/*
	 * We can't yet cope with dotless/dotted I in Turkish locales,
	 * so fall back to the C locale for these.
	 */
	for (i = 0; vars[i] != NULL; i++) {
		if ((cp = getenv(vars[i])) == NULL)
			continue;
		if (strncasecmp(cp, "TR", 2) != 0)
			break;
		/*
		 * If we're in a UTF-8 locale then prefer to use
		 * the C.UTF-8 locale (or equivalent) if it exists.
		 */
		if ((strcasestr(cp, "UTF-8") != NULL ||
		    strcasestr(cp, "UTF8") != NULL) &&
		    (setlocale(LC_CTYPE, "C.UTF-8") != NULL ||
		    setlocale(LC_CTYPE, "POSIX.UTF-8") != NULL))
			return;
		setlocale(LC_CTYPE, "C");
		return;
	}
	/* We can handle this locale */
	setlocale(LC_CTYPE, "");
}

Lines 22-24 int fmprintf(FILE , const char , ...) Link Here

(-)a/utf8.h (+1 lines)
22	int vfmprintf(FILE , const char , va_list);	22	int vfmprintf(FILE , const char , va_list);
23	int snmprintf(char , size_t, int , const char *, ...)	23	int snmprintf(char , size_t, int , const char *, ...)
24	__attribute__((format(printf, 4, 5)));	24	__attribute__((format(printf, 4, 5)));
		25	void msetlocale(void);

Return to bug 2643

Lines 27-32 Link Here

(-)a/utf8.c (+42 lines)
27	# include <langinfo.h>	27	# include <langinfo.h>
28	#endif	28	#endif
29	#include <limits.h>	29	#include <limits.h>
		30	#include <locale.h>
30	#include <stdarg.h>	31	#include <stdarg.h>
31	#include <stdio.h>	32	#include <stdio.h>
32	#include <stdlib.h>	33	#include <stdlib.h>
Lines 288-290 mprintf(const char *fmt, ...) Link Here
288	va_end(ap);	289	va_end(ap);
289	return ret;	290	return ret;
290	}	291	}
		292
		293	/*
		294	* Set up libc for multibyte output in the user's chosen locale.
		295	*
		296	* XXX: we are known to have problems with Turkish (i/I confusion) so we
		297	* deliberately fall back to the C locale for now. Longer term we should
		298	* always prefer to select C.[encoding] if possible, but there's no
		299	* standardisation in locales between systems, so we'll need to survey
		300	* what's out there first.
		301	*/
		302	void
		303	msetlocale(void)
		304	{
		305	const char *vars[] = { "LC_ALL", "LC_CTYPE", "LANG", NULL };
		306	char *cp;
		307	int i;
		308
		309	/*
		310	* We can't yet cope with dotless/dotted I in Turkish locales,
		311	* so fall back to the C locale for these.
		312	*/
		313	for (i = 0; vars[i] != NULL; i++) {
		314	if ((cp = getenv(vars[i])) == NULL)
		315	continue;
		316	if (strncasecmp(cp, "TR", 2) != 0)
		317	break;
		318	/*
		319	* If we're in a UTF-8 locale then prefer to use
		320	* the C.UTF-8 locale (or equivalent) if it exists.
		321	*/
		322	if ((strcasestr(cp, "UTF-8") != NULL \|\|
		323	strcasestr(cp, "UTF8") != NULL) &&
		324	(setlocale(LC_CTYPE, "C.UTF-8") != NULL \|\|
		325	setlocale(LC_CTYPE, "POSIX.UTF-8") != NULL))
		326	return;
		327	setlocale(LC_CTYPE, "C");
		328	return;
		329	}
		330	/* We can handle this locale */
		331	setlocale(LC_CTYPE, "");
		332	}