From 7b4b41ab3e89bc6bde673b68107e378fa91b230d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 14 Feb 2008 16:47:11 +0000 Subject: * cygheap.cc (cwcsdup): New function. (cwcsdup1): New function. * cygheap.h (cygheap_user::get_windows_id): New method returning PWCHAR. (cwcsdup): Declare. (cwcsdup1): Declare. * registry.cc (get_registry_hive_path): Use WCHAR instead of char throughout. (load_registry_hive): Ditto. * registry.h (get_registry_hive_path): Change declaration accordingly. (load_registry_hive): Ditto. * sec_helper.cc (cygpsid::string): New method returning PWCHAR. * security.h (cygpsid::string): Declare. * syscalls.cc (seteuid32): Convert local name var to WCHAR. * uinfo.cc (cygheap_user::env_userprofile): Convert local name buffers to WCHAR. Call sys_wcstombs_alloc to generate puserprof buffer. * winsup.h: Fix comment. (NT_MAX_PATH): New definition for maximum internal path length. Use throughout where appropriate. * include/limits.h (PATH_MAX): Set to 4096 as on Linux. --- winsup/cygwin/cygheap.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/cygheap.h') diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index 7d232584a..567aecf69 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -206,7 +206,11 @@ public: if (internal_token != NO_IMPERSONATION) CloseHandle (internal_token); } - char * get_windows_id (char * buf) + PWCHAR get_windows_id (PWCHAR buf) + { + return effec_cygsid.string (buf); + } + char *get_windows_id (char *buf) { return effec_cygsid.string (buf); } @@ -231,7 +235,7 @@ struct cwdstuff DWORD get_drive (char * dst) { cwd_lock.acquire (); - DWORD ret = sys_wcstombs (dst, PATH_MAX, win32.Buffer, drive_length); + DWORD ret = sys_wcstombs (dst, NT_MAX_PATH, win32.Buffer, drive_length); cwd_lock.release (); return ret; } @@ -423,6 +427,8 @@ void *__stdcall ccalloc (cygheap_types, DWORD, DWORD) __attribute__ ((regparm(3) void *__stdcall cmalloc_abort (cygheap_types, DWORD) __attribute__ ((regparm(2))); void *__stdcall crealloc_abort (void *, DWORD) __attribute__ ((regparm(2))); void *__stdcall ccalloc_abort (cygheap_types, DWORD, DWORD) __attribute__ ((regparm(3))); +PWCHAR __stdcall cwcsdup (const PWCHAR) __attribute__ ((regparm(1))); +PWCHAR __stdcall cwcsdup1 (const PWCHAR) __attribute__ ((regparm(1))); char *__stdcall cstrdup (const char *) __attribute__ ((regparm(1))); char *__stdcall cstrdup1 (const char *) __attribute__ ((regparm(1))); void __stdcall cfree_and_set (char *&, char * = NULL) __attribute__ ((regparm(2))); -- cgit v1.2.3