Cleaning up stringhelp.c

Author: manojampalam

contrib/win32/openssh/win32compat.vcxproj

@@ -153,7 +153,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\kerberos.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\startupneeds.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\strcasecmp.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\stringhelp.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tncon.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tnnet.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\win32auth.c" />

contrib/win32/openssh/win32compat.vcxproj.filters

@@ -63,9 +63,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\strcasecmp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\stringhelp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tncon.c">
       <Filter>Source Files</Filter>
     </ClCompile>

contrib/win32/win32compat/fileio.c

@@ -36,6 +36,7 @@
 #include "inc/defs.h"
 #include <errno.h>
 #include <stddef.h>
+#include "inc\utf.h"
 
 /* internal read buffer size */
 #define READ_BUFFER_SIZE 100*1024
@@ -238,39 +239,40 @@ createFile_flags_setup(int flags, int mode, struct createFile_flags* cf_flags) {
 
 /* open() implementation. Uses CreateFile to open file, console, device, etc */
 struct w32_io*
-	fileio_open(const char *pathname, int flags, int mode) {
+	fileio_open(const char *path_utf8, int flags, int mode) {
 	struct w32_io* pio = NULL;
 	struct createFile_flags cf_flags;
 	HANDLE handle;
-        wchar_t wpathname[MAX_PATH];
+        wchar_t *path_utf16 = NULL;
 
-	debug2("open - pathname:%s, flags:%d, mode:%d", pathname, flags, mode);
+	debug2("open - pathname:%s, flags:%d, mode:%d", path_utf8, flags, mode);
 	/* check input params*/
-	if (pathname == NULL) {
+	if (path_utf8 == NULL) {
 		errno = EINVAL;
 		debug("open - ERROR:%d", errno);
 		return NULL;
 	}
 
-        if (MultiByteToWideChar(CP_UTF8, 0, pathname, -1, wpathname, MAX_PATH) == 0) {
-                errno = EFAULT;
-                debug("WideCharToMultiByte failed - ERROR:%d", GetLastError());
+        if ((path_utf16 = utf8_to_utf16(path_utf8)) == NULL) {
+                errno = ENOMEM;
+                debug("utf8_to_utf16 failed - ERROR:%d", GetLastError());
                 return NULL;
         }
 
 	if (createFile_flags_setup(flags, mode, &cf_flags) == -1)
 		return NULL;
 
-	handle = CreateFileW(wpathname, cf_flags.dwDesiredAccess, cf_flags.dwShareMode,
+	handle = CreateFileW(path_utf16, cf_flags.dwDesiredAccess, cf_flags.dwShareMode,
 		&cf_flags.securityAttributes, cf_flags.dwCreationDisposition,
 		cf_flags.dwFlagsAndAttributes, NULL);
 
 	if (handle == INVALID_HANDLE_VALUE) {
 		errno = errno_from_Win32LastError();
 		debug("open - CreateFile ERROR:%d", GetLastError());
+                free(path_utf16);
 		return NULL;
 	}
-
+        free(path_utf16);
 	pio = (struct w32_io*)malloc(sizeof(struct w32_io));
 	if (pio == NULL) {
 		CloseHandle(handle);

contrib/win32/win32compat/ssh-agent/agentconfig.c

@@ -116,13 +116,18 @@ int config_log_level() {
 
 int pubkey_allowed(struct sshkey* pubkey, wchar_t* wuser, wchar_t* wuser_home) {
 	struct passwd pw;
-	char user[256], user_home[MAX_PATH];
+        int ret;
+	char *user = NULL, *user_home = NULL;
 	memset(&pw, 0, sizeof(pw));
 
-	if (WideCharToMultiByte(CP_UTF8, 0, wuser, -1, user, 256, NULL, NULL) == 0)
-		return 0;
-	WideCharToMultiByte(CP_UTF8, 0, wuser_home, -1, user_home, MAX_PATH, NULL, NULL);
-	pw.pw_dir = user_home;
+        if ((user_home = utf16_to_utf8(wuser_home)) == NULL ||
+            (user = utf16_to_utf8(wuser)) == NULL)
+                return 0;
+	
+        pw.pw_dir = user_home;
 	pw.pw_name = user;
-	return user_key_allowed(&pw, pubkey, 1);
+	ret = user_key_allowed(&pw, pubkey, 1);
+        free(user);
+        free(user_home);
+        return ret;
 }