Mercurial > hg > xemacs-beta

diff src/sysdep.c @ 4834:b3ea9c582280

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use new cygwin_conv_path API with Cygwin 1.7 for converting names between Win32 and POSIX, UTF-8-aware, with attendant changes elsewhere
author Ben Wing <ben@xemacs.org>
date Tue, 12 Jan 2010 01:38:04 -0600
parents 217abcf015c4
children 95c4ced5c07c
line wrap: on
line diff
--- a/src/sysdep.c	Sun Jan 10 01:06:15 2010 -0600
+++ b/src/sysdep.c	Tue Jan 12 01:38:04 2010 -0600
@@ -3092,14 +3092,15 @@
     ;
   new_argv = alloca_array (Extbyte *, argc + 1);
   for (i = 0; i < argc; i++)
-    C_STRING_TO_EXTERNAL (argv[i], new_argv[i], Qnative);
+    C_STRING_TO_EXTERNAL (argv[i], new_argv[i], Qcommand_argument_encoding);
   new_argv[argc] = NULL;
 
   for (envc = 0; envp[envc]; envc++)
     ;
   new_envp = alloca_array (Extbyte *, envc + 1);
   for (i = 0; i < envc; i++)
-    C_STRING_TO_EXTERNAL (envp[i], new_envp[i], Qnative);
+    C_STRING_TO_EXTERNAL (envp[i], new_envp[i],
+			  Qenvironment_variable_encoding);
   new_envp[envc] = NULL;
 
 #if defined (WIN32_NATIVE)
@@ -3146,13 +3147,16 @@
   cached_pwd = *pwd;
   if (cached_pwd.pw_name)
     TO_INTERNAL_FORMAT (C_STRING, cached_pwd.pw_name,
-			C_STRING_MALLOC, cached_pwd.pw_name, Qnative);
+			C_STRING_MALLOC, cached_pwd.pw_name,
+			Quser_name_encoding);
   if (cached_pwd.pw_passwd)
     TO_INTERNAL_FORMAT (C_STRING, cached_pwd.pw_passwd,
-			C_STRING_MALLOC, cached_pwd.pw_passwd, Qnative);
+			C_STRING_MALLOC, cached_pwd.pw_passwd,
+			Quser_name_encoding);
   if (cached_pwd.pw_gecos)
     TO_INTERNAL_FORMAT (C_STRING, cached_pwd.pw_gecos,
-			C_STRING_MALLOC, cached_pwd.pw_gecos, Qnative);
+			C_STRING_MALLOC, cached_pwd.pw_gecos,
+			Quser_name_encoding);
   if (cached_pwd.pw_dir)
     TO_INTERNAL_FORMAT (C_STRING, cached_pwd.pw_dir,
 			C_STRING_MALLOC, cached_pwd.pw_dir, Qfile_name);
@@ -3170,7 +3174,7 @@
   return getpwnam (name);
 #else
   Extbyte *nameext;
-  C_STRING_TO_EXTERNAL (name, nameext, Qnative);
+  C_STRING_TO_EXTERNAL (name, nameext, Quser_name_encoding);
 
   return copy_in_passwd (getpwnam (nameext));
 #endif /* WIN32_NATIVE */
@@ -3210,7 +3214,7 @@
     return (Ibyte *) "Sun Jan 01 00:00:00 1970";
   if (ctime_static)
     xfree (ctime_static, Ibyte *);
-  EXTERNAL_TO_C_STRING_MALLOC (str, ctime_static, Qnative);
+  EXTERNAL_TO_C_STRING_MALLOC (str, ctime_static, Qtime_function_encoding);
   return ctime_static;
 }