Import of OpenSSH 4.4p1

[gssapi-openssh.git] / openssh / openbsd-compat / bsd-cygwin_util.c

diff --git a/openssh/openbsd-compat/bsd-cygwin_util.c b/openssh/openbsd-compat/bsd-cygwin_util.c
index 94f63f1a574f7d241416285752fd2cb52a7719af..dbf8176b6225f12beb576f1c6feeebd72137447c 100644 (file)
--- a/openssh/openbsd-compat/bsd-cygwin_util.c
+++ b/openssh/openbsd-compat/bsd-cygwin_util.c
@@ -29,15 +29,25 @@
 
 #include "includes.h"
 
-RCSID("$Id$");
-
 #ifdef HAVE_CYGWIN
 
-#include <fcntl.h>
-#include <stdlib.h>
+#if defined(open) && open == binary_open
+# undef open
+#endif
+#if defined(pipe) && open == binary_pipe
+# undef pipe
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/utsname.h>
 #include <sys/vfs.h>
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <windows.h>
+
 #include "xmalloc.h"
 #define is_winnt       (GetVersion() < 0x80000000)
 
@@ -45,13 +55,6 @@ RCSID("$Id$");
 #define ntsec_off(c)   ((c) && strstr((c),"nontsec"))
 #define ntea_on(c)     ((c) && strstr((c),"ntea") && !strstr((c),"nontea"))
 
-#if defined(open) && open == binary_open
-# undef open
-#endif
-#if defined(pipe) && open == binary_pipe
-# undef pipe
-#endif
-
 int 
 binary_open(const char *filename, int flags, ...)
 {
@@ -268,9 +271,9 @@ char **
 fetch_windows_environment(void)
 {
        char **e, **p;
-       int i, idx = 0;
+       unsigned int i, idx = 0;
 
-       p = xmalloc((WENV_SIZ + 1) * sizeof(char *));
+       p = xcalloc(WENV_SIZ + 1, sizeof(char *));
        for (e = environ; *e != NULL; ++e) {
                for (i = 0; i < WENV_SIZ; ++i) {
                        if (!strncmp(*e, wenv_arr[i].name, wenv_arr[i].namelen))