From LPlib:

[openssl.git] / crypto / LPdir_win.c

diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c
index 06948f7adc1833763fb724617a7061ad5b4c9bc8..3bcc11982d4ce910224bf6cb66389fe0362f3f2e 100644 (file)
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@@ -1,4 +1,4 @@
-/* $LP: LPlib/source/LPdir_win.c,v 1.5 2004/07/20 22:39:13 _cvs_levitte Exp $ */
+/* $LP: LPlib/source/LPdir_win.c,v 1.6 2004/07/21 21:16:23 _cvs_levitte Exp $ */
 /*
  * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
  * All rights reserved.
@@ -30,11 +30,16 @@
 #include "LPdir.h"
 #endif
 
-/* It seems like WinCE doesn't always have the "normal" mapping
-   macros.  We're opting for the UNICODE ones. */
+/* We're most likely overcautious here, but let's reserve for
+    broken WinCE headers and explicitly opt for UNICODE call.
+    Keep in mind that our WinCE builds are compiled with -DUNICODE
+    [as well as -D_UNICODE]. */
 #if defined(LP_SYS_WINCE) && !defined(FindFirstFile)
 # define FindFirstFile FindFirstFileW
 #endif
+#if defined(LP_SYS_WINCE) && !defined(FindFirstFile)
+# define FindNextFile FindNextFileW
+#endif
 
 struct LP_dir_context_st
 {
@@ -67,9 +72,10 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
       if (sizeof(TCHAR) != sizeof(char))
        {
          TCHAR *wdir = NULL;
-         size_t index = 0,len = strlen(direcory);
+         /* len_0 denotes string length *with* trailing 0 */ 
+         size_t index = 0,len_0 = strlen(direcory) + 1;
 
-         wdir = (TCHAR *)malloc((len + 1) * sizeof(TCHAR));
+         wdir = (TCHAR *)malloc(len_0 * sizeof(TCHAR));
          if (wdir == NULL)
            {
              free(*ctx);
@@ -79,9 +85,9 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
            }
 
 #ifdef LP_MULTIBYTE_AVAILABLE
-         if (!MultiByteToWideChar(CP_ACP, 0, directory, len, wdir, len + 1))
+         if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, wdir, len_0))
 #endif
-           for (index = 0; index < strlen(directory) + 1; index++)
+           for (index = 0; index < len_0; index++)
              wdir[index] = (TCHAR)directory[index];
 
          (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx);
@@ -110,16 +116,16 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
   if (sizeof(TCHAR) != sizeof(char))
     {
       TCHAR *wdir = (*ctx)->ctx.cFileName;
-      size_t index, len;
+      size_t index, len_0 = 0;
 
-      for (len = 0; wdir[len] && len < (sizeof((*ctx)->entry_name) - 1);)
-       len++;
+      while (wdir[len] && len < (sizeof((*ctx)->entry_name) - 1)) len_0++;
+      len_0++;
 
 #ifdef LP_MULTIBYTE_AVAILABLE
-      if (!WideCharToMultiByte(CP_ACP, 0, wdir, len, (*ctx)->entry_name,
-                              sizeof((*ctx)->entry_name) - 1, NULL, 0))
+      if (!WideCharToMultiByte(CP_ACP, 0, wdir, len_0, (*ctx)->entry_name,
+                              sizeof((*ctx)->entry_name), NULL, 0))
 #endif
-       for (index = 0; index < len; index++)
+       for (index = 0; index < len_0; index++)
          (*ctx)->entry_name[index] = (char)wdir[index];
     }
   else