From bd0e9c7aa613edfdc3146014fb73c38df4748659 Mon Sep 17 00:00:00 2001 From: Pierre Humblet Date: Thu, 17 Jun 2004 13:34:26 +0000 Subject: 2004-06-17 Pierre Humblet * fhandler.cc (fhandler_base::open_9x): Do not check for null name. Move debug_printf to common code line. (fhandler_base::open): Ditto. Initialize upath. Remove second argument of pc.get_nt_native_path. * path.h (path_conv::get_nt_native_path): Remove second argument. * path.cc (path_conv::get_nt_native_path): Ditto. Call str2uni_cat. * security.h (str2buf2uni_cat): Delete declaration. (str2uni_cat): New declaration. * security.cc (str2buf2uni): Get length from sys_mbstowcs call. (str2buf2uni_cat): Delete function. (str2uni_cat): New function. * miscfuncs.cc (sys_mbstowcs): Add debug_printf. --- winsup/cygwin/path.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'winsup/cygwin/path.cc') diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 23bf2c207..c348268b6 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -459,25 +459,25 @@ path_conv::set_normalized_path (const char *path_copy) } PUNICODE_STRING -path_conv::get_nt_native_path (UNICODE_STRING &upath, WCHAR *wpath) +path_conv::get_nt_native_path (UNICODE_STRING &upath) { if (path[0] != '\\') /* X:\... or NUL, etc. */ { - str2buf2uni (upath, wpath, "\\??\\"); - str2buf2uni_cat (upath, path); + str2uni_cat (upath, "\\??\\"); + str2uni_cat (upath, path); } else if (path[1] != '\\') /* \Device\... */ - str2buf2uni (upath, wpath, path); + str2uni_cat (upath, path); else if (path[2] != '.' || path[3] != '\\') /* \\server\share\... */ { - str2buf2uni (upath, wpath, "\\??\\UNC\\"); - str2buf2uni_cat (upath, path + 2); + str2uni_cat (upath, "\\??\\UNC\\"); + str2uni_cat (upath, path + 2); } else /* \\.\device */ { - str2buf2uni (upath, wpath, "\\??\\"); - str2buf2uni_cat (upath, path + 4); + str2uni_cat (upath, "\\??\\"); + str2uni_cat (upath, path + 4); } return &upath; } -- cgit v1.2.3