X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2FLPdir_win.c;h=702dbc730f62ffcdcaf85c02c6e7b235b3913f69;hb=2a9023f7b4e5198e5950269088133526d617544a;hp=3bcc11982d4ce910224bf6cb66389fe0362f3f2e;hpb=f744f92adb6a57b86839eb9edd3397936a1124e0;p=openssl.git

diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c
index 3bcc11982d..702dbc730f 100644
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@@ -1,4 +1,4 @@
-/* $LP: LPlib/source/LPdir_win.c,v 1.6 2004/07/21 21:16:23 _cvs_levitte Exp $ */
+/* $LP: LPlib/source/LPdir_win.c,v 1.10 2004/08/26 13:36:05 _cvs_levitte Exp $ */
 /*
  * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
  * All rights reserved.
@@ -11,18 +11,18 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <windows.h>
 #include <tchar.h>
@@ -41,6 +41,10 @@
 # define FindNextFile FindNextFileW
 #endif
 
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+
 struct LP_dir_context_st
 {
   WIN32_FIND_DATA ctx;
@@ -50,8 +54,6 @@ struct LP_dir_context_st
 
 const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 {
-  struct dirent *direntry = NULL;
-
   if (ctx == NULL || directory == NULL)
     {
       errno = EINVAL;
@@ -73,7 +75,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 	{
 	  TCHAR *wdir = NULL;
 	  /* len_0 denotes string length *with* trailing 0 */ 
-	  size_t index = 0,len_0 = strlen(direcory) + 1;
+	  size_t index = 0,len_0 = strlen(directory) + 1;
 
 	  wdir = (TCHAR *)malloc(len_0 * sizeof(TCHAR));
 	  if (wdir == NULL)
@@ -85,7 +87,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 	    }
 
 #ifdef LP_MULTIBYTE_AVAILABLE
-	  if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, wdir, len_0))
+	  if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, (WCHAR *)wdir, len_0))
 #endif
 	    for (index = 0; index < len_0; index++)
 	      wdir[index] = (TCHAR)directory[index];
@@ -95,7 +97,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 	  free(wdir);
 	}
       else
-	(*ctx)->handle = FindFirstFile(directory, &(*ctx)->ctx);
+	(*ctx)->handle = FindFirstFile((TCHAR *)directory, &(*ctx)->ctx);
 
       if ((*ctx)->handle == INVALID_HANDLE_VALUE)
 	{
@@ -107,7 +109,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
     }
   else
     {
-      if (FindNextFile((*ctx)->handle, (*ctx)->ctx) == FALSE)
+      if (FindNextFile((*ctx)->handle, &(*ctx)->ctx) == FALSE)
 	{
 	  return 0;
 	}
@@ -118,18 +120,18 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
       TCHAR *wdir = (*ctx)->ctx.cFileName;
       size_t index, len_0 = 0;
 
-      while (wdir[len] && len < (sizeof((*ctx)->entry_name) - 1)) len_0++;
+      while (wdir[len_0] && len_0 < (sizeof((*ctx)->entry_name) - 1)) len_0++;
       len_0++;
 
 #ifdef LP_MULTIBYTE_AVAILABLE
-      if (!WideCharToMultiByte(CP_ACP, 0, wdir, len_0, (*ctx)->entry_name,
+      if (!WideCharToMultiByte(CP_ACP, 0, (WCHAR *)wdir, len_0, (*ctx)->entry_name,
 			       sizeof((*ctx)->entry_name), NULL, 0))
 #endif
 	for (index = 0; index < len_0; index++)
 	  (*ctx)->entry_name[index] = (char)wdir[index];
     }
   else
-    strncpy((*ctx)->entry_name, (*ctx)->ctx.cFileName,
+    strncpy((*ctx)->entry_name, (const char *)(*ctx)->ctx.cFileName,
 	    sizeof((*ctx)->entry_name)-1);
 
   (*ctx)->entry_name[sizeof((*ctx)->entry_name)-1] = '\0';