Converged Win Unix code in auth.c, move utf routine declarations to separate header

Author: manojampalam

auth.c

@@ -379,72 +379,6 @@ auth_root_allowed(const char *method)
  * This returns a buffer allocated by xmalloc.
  */
 
-/*
- * Win32 implementation uses UTF16 names.
- */
- 
-#ifdef WIN32_FIXME
-
-char *expand_authorized_keys(const char *filename, struct passwd *pw)
-{
-	wchar_t *file_w, ret[MAXPATHLEN], pw_name_w[MAXPATHLEN], filename_w[MAXPATHLEN], pw_dir_w[MAXPATHLEN];
-	char* expanded_utf8[MAXPATHLEN];
-  int i;
-  
-  wchar_t *slash;
-  
-  if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, filename_w, MAXPATHLEN) == 0 ||
-	  MultiByteToWideChar(CP_UTF8, 0, pw->pw_name, -1, pw_name_w, MAXPATHLEN) == 0 ||
-	  MultiByteToWideChar(CP_UTF8, 0, pw->pw_dir, -1, pw_dir_w, MAXPATHLEN) == 0)
-	  fatal("expand_authorized_keys -MultiByteToWideChar failed" );
-
-  file_w = percent_expand_w(filename_w, L"h", pw_dir_w,
-                                L"u", pw_name_w, (char *) NULL);
-  
-  /*
-   * Replace '/'  with '\'
-   */
-
-  slash = file_w; 
-  
-  while ((slash = wcschr(slash, L'/')))
-  {
-    *slash = L'\\';
-  }
-  
-  /*
-   * Absolute path given.
-   */
-   
-  if (wcschr(file_w, ':'))
-  {
-    i = _snwprintf(ret, sizeof(ret), L"%ls", file_w);
-  }
-   
-  /*
-   * Relative path given. Expand to user homedir.
-   */
-   
-  else
-  {
-    i = _snwprintf(ret, sizeof(ret), L"%ls\\%ls", pw->pw_dir, file_w);
-  }  
-  
-  if (i < 0 || (size_t) i >= sizeof(ret))
-  {  
-    fatal("expand_authorized_keys: path too long");
-  }  
-
-  if (WideCharToMultiByte(CP_UTF8, 0, ret, -1, expanded_utf8, MAXPATHLEN, NULL, NULL) == 0)
-	  fatal("expand_authorized_keys: WideCharToMultiByte failed");
-
-  free(file_w);
-  
-  return (xstrdup(expanded_utf8));
-}
-
-#else /* WIN32_FIXME */
-
 char *
 expand_authorized_keys(const char *filename, struct passwd *pw)
 {
@@ -467,7 +401,6 @@ expand_authorized_keys(const char *filename, struct passwd *pw)
 	free(file);
 	return (xstrdup(ret));
 }
-#endif /* WIN32_FIXME */
 
 char *
 authorized_principals_file(struct passwd *pw)

contrib/win32/openssh/win32iocompat.vcxproj

@@ -172,6 +172,7 @@
     <ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\signal_internal.h" />
     <ClInclude Include="..\win32compat\inc\pwd.h" />
     <ClInclude Include="..\win32compat\inc\sys\param.h" />
+    <ClInclude Include="..\win32compat\inc\utf.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

contrib/win32/openssh/win32iocompat.vcxproj.filters

@@ -60,6 +60,9 @@
     <ClInclude Include="..\win32compat\inc\sys\param.h">
       <Filter>inc\sys</Filter>
     </ClInclude>
+    <ClInclude Include="..\win32compat\inc\utf.h">
+      <Filter>inc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="inc">

contrib/win32/win32compat/inc/utf.h

@@ -0,0 +1,12 @@
+/*
+* Author: Manoj Ampalam <[email protected]>
+*
+* UTF-16 <--> UTF-8 definitions
+*/
+#ifndef UTF_H
+#define UTF_H 1
+
+wchar_t* utf8_to_utf16(const char *);
+char* utf16_to_utf8(const wchar_t*);
+
+#endif

contrib/win32/win32compat/inc/w32posix.h

@@ -8,6 +8,7 @@
 #include <WS2tcpip.h>
 #include <stdio.h>
 #include "defs.h"
+#include "utf.h"
 
 
 typedef struct w32_fd_set_ {

contrib/win32/win32compat/pwd.c

@@ -36,17 +36,17 @@
 #define SECURITY_WIN32
 #include <security.h>
 #include "inc\pwd.h"
+#include "inc\utf.h"
 
 static struct passwd pw;
 static char* pw_shellpath = "ssh-shellhost.exe";
-char* utf16_to_utf8(const wchar_t*);
-wchar_t* utf8_to_utf16(const char *);
 
 int
 initialize_pw() {
         if (pw.pw_shell != pw_shellpath) {
                 memset(&pw, 0, sizeof(pw));
                 pw.pw_shell = pw_shellpath;
+                pw.pw_passwd = "\0";
         }
         return 0;
 }

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

@@ -46,6 +46,8 @@
 #include "digest.h"
 #include "agent.h"
 
+#include <utf.h>
+
 static int use_privsep = -1;
 Buffer cfg;
 ServerOptions options;
@@ -85,8 +87,6 @@ int GetCurrentModulePath(wchar_t *path, int pathSize)
 	return -1;
 }
 
-char* utf16_to_utf8(const wchar_t*);
-
 int load_config() {
 	wchar_t basePath[MAX_PATH] = { 0 };
 	wchar_t path[MAX_PATH] = { 0 };

contrib/win32/win32compat/w32fd.c

@@ -399,7 +399,6 @@ w32_lseek(int fd, long offset, int origin) {
 	return fileio_lseek(fd_table.w32_ios[fd], offset, origin);
 }
 
-wchar_t* utf8_to_utf16(const char *);
 int 
 w32_mkdir(const char *path_utf8, unsigned short mode) {
         wchar_t *path_utf16 = utf8_to_utf16(path_utf8);

contrib/win32/win32compat/wmain.c

@@ -31,9 +31,9 @@
 */
 
 #include <Windows.h>
+#include "inc\utf.h"
 
 int main(int, char **);
-char* utf16_to_utf8(const wchar_t*);
 void w32posix_initialize();
 
 int

misc.c

@@ -646,64 +646,6 @@ percent_expand(const char *string, ...)
 #undef EXPAND_MAX_KEYS
 }
 
-#ifdef WIN32_FIXME
-wchar_t    *percent_expand_w(const wchar_t *string, ...)
-{
-#define EXPAND_MAX_KEYS 16
-        u_int num_keys, i, j;
-        struct {
-                const wchar_t *key;
-                const wchar_t *repl;
-        } keys[EXPAND_MAX_KEYS];
-        wchar_t buf[4096];
-        wchar_t *aptr = NULL;
-        va_list ap;
-
-        /* Gather keys */
-        va_start(ap, string);
-        for (num_keys = 0; num_keys < EXPAND_MAX_KEYS; num_keys++) {
-                keys[num_keys].key = va_arg(ap, wchar_t *);
-                if (keys[num_keys].key == NULL)
-                        break;
-                keys[num_keys].repl = va_arg(ap, wchar_t *);
-                if (keys[num_keys].repl == NULL)
-                        fatal("%s: NULL replacement", __func__);
-        }
-        if (num_keys == EXPAND_MAX_KEYS && va_arg(ap, wchar_t *) != NULL)
-                fatal("%s: too many keys", __func__);
-        va_end(ap);
-
-        /* Expand string */
-        *buf = L'\0';
-        for (i = 0; *string != L'\0'; string++) {
-                if (*string != L'%') {
- append:
-                        buf[i++] = *string;
-                        if (i >= sizeof(buf))
-                                fatal("%s: string too long", __func__);
-                        buf[i] = L'\0';
-                        continue;
-                }
-                string++;
-                /* %% case */
-                if (*string == L'%')
-                        goto append;
-                for (j = 0; j < num_keys; j++) {
-                        if (wcschr(keys[j].key, *string) != NULL) {
-                                aptr = wcsncat(buf, keys[j].repl, sizeof(buf));
-                                buf[sizeof(buf)-1] = 0;
-                                if (aptr == NULL)
-                                        fatal("%s: string too long", __func__);
-                                break;
-                        }
-                }
-                if (j >= num_keys)
-                        fatal("%s: unknown key %%%c", __func__, *string);
-        }
-        return (_wcsdup(buf));
-#undef EXPAND_MAX_KEYS
-}
-#endif
 /*
  * Read an entire line from a public key file into a static buffer, discarding
  * lines that exceed the buffer size.  Returns 0 on success, -1 on failure.