Merge pull request #388 from rayhayes/L1-Prod

Merge in latest changes for scp.

Author: rayhayes

contrib/win32/openssh/libssh.vcxproj

@@ -266,6 +266,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\openssl-epoint.c" />
+    <ClCompile Include="..\..\..\utf8.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(OpenSSH-Src-Path)crypto-wrap.h" />

contrib/win32/openssh/libssh.vcxproj.filters

@@ -294,6 +294,9 @@
     <ClCompile Include="..\..\..\openssl-epoint.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\utf8.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(OpenSSH-Src-Path)crypto-wrap.h">

contrib/win32/win32compat/w32fd.c

@@ -854,11 +854,9 @@ int
 w32_ftruncate(int fd, off_t length) {
     CHECK_FD(fd);
 
-    if (!SetEndOfFile(w32_fd_to_handle(fd)))
-        return -1;
-    if (!SetFileValidData(w32_fd_to_handle(fd), length))
+    if (!SetFilePointer(w32_fd_to_handle(fd), length, 0, FILE_BEGIN))
         return -1;
-    if (!SetFilePointer(w32_fd_to_handle(fd), 0, 0, FILE_BEGIN))
+    if (!SetEndOfFile(w32_fd_to_handle(fd)))
         return -1;
 
     return 0;

openbsd-compat/openbsd-compat.h

@@ -232,10 +232,45 @@ long long strtonum(const char *, long long, long long, const char **);
 # define mblen(x, y)	(1)
 #endif
 
+#ifndef HAVE_WCWIDTH
+# define wcwidth(x)	(((x) >= 0x20 && (x) <= 0x7e) ? 1 : -1)
+/* force our no-op nl_langinfo and mbtowc */
+# undef HAVE_NL_LANGINFO
+# undef HAVE_MBTOWC
+# undef HAVE_LANGINFO_H
+#endif
+
+#ifndef HAVE_NL_LANGINFO
+# define nl_langinfo(x)	""
+#endif
+
+#ifndef HAVE_MBTOWC
+int mbtowc(wchar_t *, const char*, size_t);
+#endif
+
+
 #if !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF)
 # include <stdarg.h>
 #endif
 
+/*
+* Some platforms unconditionally undefine va_copy() so we define VA_COPY()
+* instead.  This is known to be the case on at least some configurations of
+* AIX with the xlc compiler.
+*/
+#ifndef VA_COPY
+# ifdef HAVE_VA_COPY
+#  define VA_COPY(dest, src) va_copy(dest, src)
+# else
+#  ifdef HAVE___VA_COPY
+#   define VA_COPY(dest, src) __va_copy(dest, src)
+#  else
+#   define VA_COPY(dest, src) (dest) = (src)
+#  endif
+# endif
+#endif
+
+
 #ifndef HAVE_VASPRINTF
 int vasprintf(char **, const char *, va_list);
 #endif

openbsd-compat/vis.h

@@ -48,7 +48,7 @@
  */
 #define	VIS_OCTAL	0x01	/* use octal \ddd format */
 #define	VIS_CSTYLE	0x02	/* use \[nrft0..] where appropriate */
-
+#define	VIS_ALL		0x400	/* encode all characters */
 /*
  * to alter set of characters encoded (default is to encode all
  * non-graphic except space, tab, and newline).