aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/LPdir_win.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-22 21:39:56 +0100
committermarha <marha@users.sourceforge.net>2015-02-22 21:39:56 +0100
commit462f18c7b25fe3e467f837647d07ab0a78aa8d2b (patch)
treefc8013c0a1bac05a1945846c1697e973f4c35013 /openssl/crypto/LPdir_win.c
parent36f711ee12b6dd5184198abed3aa551efb585587 (diff)
downloadvcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.gz
vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.bz2
vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.zip
Merged origin/release (checked in because wanted to merge new stuff)
Diffstat (limited to 'openssl/crypto/LPdir_win.c')
-rw-r--r--openssl/crypto/LPdir_win.c239
1 files changed, 111 insertions, 128 deletions
diff --git a/openssl/crypto/LPdir_win.c b/openssl/crypto/LPdir_win.c
index d5b5e2c90..07e63fb42 100644
--- a/openssl/crypto/LPdir_win.c
+++ b/openssl/crypto/LPdir_win.c
@@ -10,7 +10,7 @@
* 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 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
@@ -26,162 +26,145 @@
#include <windows.h>
#include <tchar.h>
#ifndef LPDIR_H
-#include "LPdir.h"
+# 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]. */
+/*
+ * 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)
+#if defined(LP_SYS_WINCE) && !defined(FindNextFile)
# define FindNextFile FindNextFileW
#endif
#ifndef NAME_MAX
-#define NAME_MAX 255
+# define NAME_MAX 255
#endif
-struct LP_dir_context_st
-{
- WIN32_FIND_DATA ctx;
- HANDLE handle;
- char entry_name[NAME_MAX+1];
+struct LP_dir_context_st {
+ WIN32_FIND_DATA ctx;
+ HANDLE handle;
+ char entry_name[NAME_MAX + 1];
};
const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
{
- if (ctx == NULL || directory == NULL)
- {
- errno = EINVAL;
- return 0;
+ if (ctx == NULL || directory == NULL) {
+ errno = EINVAL;
+ return 0;
}
- errno = 0;
- if (*ctx == NULL)
- {
- const char *extdir = directory;
- char *extdirbuf = NULL;
- size_t dirlen = strlen (directory);
-
- if (dirlen == 0)
- {
- errno = ENOENT;
- return 0;
- }
-
- *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX));
- if (*ctx == NULL)
- {
- errno = ENOMEM;
- return 0;
- }
- memset(*ctx, '\0', sizeof(LP_DIR_CTX));
-
- if (directory[dirlen-1] != '*')
- {
- extdirbuf = (char *)malloc(dirlen + 3);
- if (extdirbuf == NULL)
- {
- free(*ctx);
- *ctx = NULL;
- errno = ENOMEM;
- return 0;
- }
- if (directory[dirlen-1] != '/' && directory[dirlen-1] != '\\')
- extdir = strcat(strcpy (extdirbuf,directory),"/*");
- else
- extdir = strcat(strcpy (extdirbuf,directory),"*");
- }
-
- if (sizeof(TCHAR) != sizeof(char))
- {
- TCHAR *wdir = NULL;
- /* len_0 denotes string length *with* trailing 0 */
- size_t index = 0,len_0 = strlen(extdir) + 1;
-
- wdir = (TCHAR *)calloc(len_0, sizeof(TCHAR));
- if (wdir == NULL)
- {
- if (extdirbuf != NULL)
- {
- free (extdirbuf);
- }
- free(*ctx);
- *ctx = NULL;
- errno = ENOMEM;
- return 0;
- }
-
+ errno = 0;
+ if (*ctx == NULL) {
+ const char *extdir = directory;
+ char *extdirbuf = NULL;
+ size_t dirlen = strlen(directory);
+
+ if (dirlen == 0) {
+ errno = ENOENT;
+ return 0;
+ }
+
+ *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX));
+ if (*ctx == NULL) {
+ errno = ENOMEM;
+ return 0;
+ }
+ memset(*ctx, '\0', sizeof(LP_DIR_CTX));
+
+ if (directory[dirlen - 1] != '*') {
+ extdirbuf = (char *)malloc(dirlen + 3);
+ if (extdirbuf == NULL) {
+ free(*ctx);
+ *ctx = NULL;
+ errno = ENOMEM;
+ return 0;
+ }
+ if (directory[dirlen - 1] != '/' && directory[dirlen - 1] != '\\')
+ extdir = strcat(strcpy(extdirbuf, directory), "/*");
+ else
+ extdir = strcat(strcpy(extdirbuf, directory), "*");
+ }
+
+ if (sizeof(TCHAR) != sizeof(char)) {
+ TCHAR *wdir = NULL;
+ /* len_0 denotes string length *with* trailing 0 */
+ size_t index = 0, len_0 = strlen(extdir) + 1;
+
+ wdir = (TCHAR *)calloc(len_0, sizeof(TCHAR));
+ if (wdir == NULL) {
+ if (extdirbuf != NULL) {
+ free(extdirbuf);
+ }
+ free(*ctx);
+ *ctx = NULL;
+ errno = ENOMEM;
+ return 0;
+ }
#ifdef LP_MULTIBYTE_AVAILABLE
- if (!MultiByteToWideChar(CP_ACP, 0, extdir, len_0, (WCHAR *)wdir, len_0))
+ if (!MultiByteToWideChar
+ (CP_ACP, 0, extdir, len_0, (WCHAR *)wdir, len_0))
#endif
- for (index = 0; index < len_0; index++)
- wdir[index] = (TCHAR)extdir[index];
-
- (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx);
-
- free(wdir);
- }
- else
- {
- (*ctx)->handle = FindFirstFile((TCHAR *)extdir, &(*ctx)->ctx);
- }
- if (extdirbuf != NULL)
- {
- free (extdirbuf);
- }
-
- if ((*ctx)->handle == INVALID_HANDLE_VALUE)
- {
- free(*ctx);
- *ctx = NULL;
- errno = EINVAL;
- return 0;
- }
+ for (index = 0; index < len_0; index++)
+ wdir[index] = (TCHAR)extdir[index];
+
+ (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx);
+
+ free(wdir);
+ } else {
+ (*ctx)->handle = FindFirstFile((TCHAR *)extdir, &(*ctx)->ctx);
+ }
+ if (extdirbuf != NULL) {
+ free(extdirbuf);
+ }
+
+ if ((*ctx)->handle == INVALID_HANDLE_VALUE) {
+ free(*ctx);
+ *ctx = NULL;
+ errno = EINVAL;
+ return 0;
+ }
+ } else {
+ if (FindNextFile((*ctx)->handle, &(*ctx)->ctx) == FALSE) {
+ return 0;
+ }
}
- else
- {
- if (FindNextFile((*ctx)->handle, &(*ctx)->ctx) == FALSE)
- {
- return 0;
- }
- }
- if (sizeof(TCHAR) != sizeof(char))
- {
- TCHAR *wdir = (*ctx)->ctx.cFileName;
- size_t index, len_0 = 0;
+ if (sizeof(TCHAR) != sizeof(char)) {
+ TCHAR *wdir = (*ctx)->ctx.cFileName;
+ size_t index, len_0 = 0;
- while (wdir[len_0] && len_0 < (sizeof((*ctx)->entry_name) - 1)) len_0++;
- 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, (WCHAR *)wdir, len_0, (*ctx)->entry_name,
- sizeof((*ctx)->entry_name), NULL, 0))
+ 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, (const char *)(*ctx)->ctx.cFileName,
- sizeof((*ctx)->entry_name)-1);
+ for (index = 0; index < len_0; index++)
+ (*ctx)->entry_name[index] = (char)wdir[index];
+ } else
+ strncpy((*ctx)->entry_name, (const char *)(*ctx)->ctx.cFileName,
+ sizeof((*ctx)->entry_name) - 1);
- (*ctx)->entry_name[sizeof((*ctx)->entry_name)-1] = '\0';
+ (*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0';
- return (*ctx)->entry_name;
+ return (*ctx)->entry_name;
}
int LP_find_file_end(LP_DIR_CTX **ctx)
{
- if (ctx != NULL && *ctx != NULL)
- {
- FindClose((*ctx)->handle);
- free(*ctx);
- *ctx = NULL;
- return 1;
+ if (ctx != NULL && *ctx != NULL) {
+ FindClose((*ctx)->handle);
+ free(*ctx);
+ *ctx = NULL;
+ return 1;
}
- errno = EINVAL;
- return 0;
+ errno = EINVAL;
+ return 0;
}