-/* $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.6 2004/07/21 21:16:23 _cvs_levitte Exp $ */
/*
* Copyright (c) 2004, Richard Levitte <richard@levitte.org>
* All rights reserved.
#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;
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)
{
- errno = ENOMEM;
free(*ctx);
+ *ctx = NULL;
+ errno = ENOMEM;
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
- 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);
free(wdir);
}
else
- (*ctx)->handle = FindFirstFile(directory, &(*ctx)->ctx);
+ (*ctx)->handle = FindFirstFile((TCHAR *)directory, &(*ctx)->ctx);
if ((*ctx)->handle == INVALID_HANDLE_VALUE)
{
}
else
{
- if (FindNextFile((*ctx)->handle, (*ctx)->ctx) == FALSE)
+ if (FindNextFile((*ctx)->handle, &(*ctx)->ctx) == FALSE)
{
return 0;
}
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
- 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
- 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
- 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';
{
FindClose((*ctx)->handle);
free(*ctx);
+ *ctx = NULL;
return 1;
}
errno = EINVAL;