Fix link for ASN1_generate_nconf

[openssl.git] / crypto / LPdir_win.c

diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c
index fcb80049932efb866966863748b59db438fe2390..702dbc730f62ffcdcaf85c02c6e7b235b3913f69 100644 (file)
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@@ -1,4 +1,4 @@
-/* $LP: LPlib/source/LPdir_win.c,v 1.4 2004/07/20 21:15:55 _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.
 /*
  * 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.
  * 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>
  */
 #include <windows.h>
 #include <tchar.h>


@@ -30,6 +30,21 @@
 #include "LPdir.h"
 #endif
 
 #include "LPdir.h"
 #endif
 

+/* 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
+
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+

 struct LP_dir_context_st
 {
   WIN32_FIND_DATA ctx;
 struct LP_dir_context_st
 {
   WIN32_FIND_DATA ctx;


@@ -39,8 +54,6 @@ struct LP_dir_context_st
 
 const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 {
 
 const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 {

-  struct dirent *direntry = NULL;
-

   if (ctx == NULL || directory == NULL)
     {
       errno = EINVAL;
   if (ctx == NULL || directory == NULL)
     {
       errno = EINVAL;


@@ -61,20 +74,22 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
       if (sizeof(TCHAR) != sizeof(char))
        {
          TCHAR *wdir = NULL;
       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(directory) + 1;

 
 

-         wdir = (TCHAR *)malloc((len + 1) * sizeof(TCHAR));
+         wdir = (TCHAR *)malloc(len_0 * sizeof(TCHAR));

          if (wdir == NULL)
            {
          if (wdir == NULL)
            {

-             errno = ENOMEM;

              free(*ctx);
              free(*ctx);

+             *ctx = NULL;
+             errno = ENOMEM;

              return 0;
            }
 
 #ifdef LP_MULTIBYTE_AVAILABLE
              return 0;
            }
 
 #ifdef LP_MULTIBYTE_AVAILABLE

-         if (!MultiByteToWideChar (CP_THREAD_ACP,0,directory,len,wdir,len+1))
+         if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, (WCHAR *)wdir, len_0))

 #endif
 #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);
              wdir[index] = (TCHAR)directory[index];
 
          (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx);


@@ -82,7 +97,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
          free(wdir);
        }
       else
          free(wdir);
        }
       else

-       (*ctx)->handle = FindFirstFile(directory, &(*ctx)->ctx);
+       (*ctx)->handle = FindFirstFile((TCHAR *)directory, &(*ctx)->ctx);

 
       if ((*ctx)->handle == INVALID_HANDLE_VALUE)
        {
 
       if ((*ctx)->handle == INVALID_HANDLE_VALUE)
        {


@@ -94,7 +109,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
     }
   else
     {
     }
   else
     {

-      if (FindNextFile((*ctx)->handle, (*ctx)->ctx) == FALSE)
+      if (FindNextFile((*ctx)->handle, &(*ctx)->ctx) == FALSE)

        {
          return 0;
        }
        {
          return 0;
        }


@@ -102,21 +117,21 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 
   if (sizeof(TCHAR) != sizeof(char))
     {
 
   if (sizeof(TCHAR) != sizeof(char))
     {

-      TCHAR *wdir=(*ctx)->ctx.cFileName;
-      size_t i,len;
+      TCHAR *wdir = (*ctx)->ctx.cFileName;
+      size_t index, len_0 = 0;

 
 

-      for (len=0;wdir[len] && len<(sizeof((*ctx)->entry_name)-1);)
-       len++;
+      while (wdir[len_0] && len_0 < (sizeof((*ctx)->entry_name) - 1)) len_0++;
+      len_0++;

 
 #ifdef LP_MULTIBYTE_AVAILABLE
 
 #ifdef LP_MULTIBYTE_AVAILABLE

-      if (!WideCharToMultiByte (CP_THREAD_ACP,0,wdir,len,
-                               (*ctx)->entry_name,
-                               sizeof((*ctx)->entry_name)-1,NULL,0))
+      if (!WideCharToMultiByte(CP_ACP, 0, (WCHAR *)wdir, len_0, (*ctx)->entry_name,
+                              sizeof((*ctx)->entry_name), NULL, 0))

 #endif
 #endif

-       for (i=0;i<len;i++) (*ctx)->entry_name[i] = (char)wdir[i];
+       for (index = 0; index < len_0; index++)
+         (*ctx)->entry_name[index] = (char)wdir[index];

     }
   else
     }
   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';
            sizeof((*ctx)->entry_name)-1);
 
   (*ctx)->entry_name[sizeof((*ctx)->entry_name)-1] = '\0';


@@ -130,6 +145,7 @@ int LP_find_file_end(LP_DIR_CTX **ctx)
     {
       FindClose((*ctx)->handle);
       free(*ctx);
     {
       FindClose((*ctx)->handle);
       free(*ctx);

+      *ctx = NULL;

       return 1;
     }
   errno = EINVAL;
       return 1;
     }
   errno = EINVAL;