New upstream version 5.2.0Beta2.1upstream/5.2.0Beta2.1

6 files changed, 1414 insertions, 0 deletions

diff --git a/app/bin/include/dirent.h b/app/bin/include/dirent.h
new file mode 100644
index 0000000..fdfbe5b
--- /dev/null
+++ b/app/bin/include/dirent.h
@@ -0,0 +1,1254 @@
+/*

+ * Dirent interface for Microsoft Visual Studio

+ *

+ * Copyright (C) 2006-2012 Toni Ronkko

+ * This file is part of dirent.  Dirent may be freely distributed

+ * under the MIT license.  For all details and documentation, see

+ * https://github.com/tronkko/dirent

+ */

+#ifndef DIRENT_H

+#define DIRENT_H

+

+ /*

+  * Include windows.h without Windows Sockets 1.1 to prevent conflicts with

+  * Windows Sockets 2.0.

+  */

+#ifndef WIN32_LEAN_AND_MEAN

+#   define WIN32_LEAN_AND_MEAN

+#endif

+#include <windows.h>

+

+#include <stdio.h>

+#include <stdarg.h>

+#include <wchar.h>

+#include <string.h>

+#include <stdlib.h>

+#include <malloc.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <errno.h>

+

+  /* Indicates that d_type field is available in dirent structure */

+#define _DIRENT_HAVE_D_TYPE

+

+/* Indicates that d_namlen field is available in dirent structure */

+#define _DIRENT_HAVE_D_NAMLEN

+

+/* Entries missing from MSVC 6.0 */

+#if !defined(FILE_ATTRIBUTE_DEVICE)

+#   define FILE_ATTRIBUTE_DEVICE 0x40

+#endif

+

+/* File type and permission flags for stat(), general mask */

+#if !defined(S_IFMT)

+#   define S_IFMT _S_IFMT

+#endif

+

+/* Directory bit */

+#if !defined(S_IFDIR)

+#   define S_IFDIR _S_IFDIR

+#endif

+

+/* Character device bit */

+#if !defined(S_IFCHR)

+#   define S_IFCHR _S_IFCHR

+#endif

+

+/* Pipe bit */

+#if !defined(S_IFFIFO)

+#   define S_IFFIFO _S_IFFIFO

+#endif

+

+/* Regular file bit */

+#if !defined(S_IFREG)

+#   define S_IFREG _S_IFREG

+#endif

+

+/* Read permission */

+#if !defined(S_IREAD)

+#   define S_IREAD _S_IREAD

+#endif

+

+/* Write permission */

+#if !defined(S_IWRITE)

+#   define S_IWRITE _S_IWRITE

+#endif

+

+/* Execute permission */

+#if !defined(S_IEXEC)

+#   define S_IEXEC _S_IEXEC

+#endif

+

+/* Pipe */

+#if !defined(S_IFIFO)

+#   define S_IFIFO _S_IFIFO

+#endif

+

+/* Block device */

+#if !defined(S_IFBLK)

+#   define S_IFBLK 0

+#endif

+

+/* Link */

+#if !defined(S_IFLNK)

+#   define S_IFLNK 0

+#endif

+

+/* Socket */

+#if !defined(S_IFSOCK)

+#   define S_IFSOCK 0

+#endif

+

+/* Read user permission */

+#if !defined(S_IRUSR)

+#   define S_IRUSR S_IREAD

+#endif

+

+/* Write user permission */

+#if !defined(S_IWUSR)

+#   define S_IWUSR S_IWRITE

+#endif

+

+/* Execute user permission */

+#if !defined(S_IXUSR)

+#   define S_IXUSR 0

+#endif

+

+/* Read group permission */

+#if !defined(S_IRGRP)

+#   define S_IRGRP 0

+#endif

+

+/* Write group permission */

+#if !defined(S_IWGRP)

+#   define S_IWGRP 0

+#endif

+

+/* Execute group permission */

+#if !defined(S_IXGRP)

+#   define S_IXGRP 0

+#endif

+

+/* Read others permission */

+#if !defined(S_IROTH)

+#   define S_IROTH 0

+#endif

+

+/* Write others permission */

+#if !defined(S_IWOTH)

+#   define S_IWOTH 0

+#endif

+

+/* Execute others permission */

+#if !defined(S_IXOTH)

+#   define S_IXOTH 0

+#endif

+

+/* Maximum length of file name */

+#if !defined(PATH_MAX)

+#   define PATH_MAX MAX_PATH

+#endif

+#if !defined(FILENAME_MAX)

+#   define FILENAME_MAX MAX_PATH

+#endif

+#if !defined(NAME_MAX)

+#   define NAME_MAX FILENAME_MAX

+#endif

+

+/* File type flags for d_type */

+#define DT_UNKNOWN 0

+#define DT_REG S_IFREG

+#define DT_DIR S_IFDIR

+#define DT_FIFO S_IFIFO

+#define DT_SOCK S_IFSOCK

+#define DT_CHR S_IFCHR

+#define DT_BLK S_IFBLK

+#define DT_LNK S_IFLNK

+

+/* Macros for converting between st_mode and d_type */

+#define IFTODT(mode) ((mode) & S_IFMT)

+#define DTTOIF(type) (type)

+

+/*

+ * File type macros.  Note that block devices, sockets and links cannot be

+ * distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are

+ * only defined for compatibility.  These macros should always return false

+ * on Windows.

+ */

+#if !defined(S_ISFIFO)

+#   define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO)

+#endif

+#if !defined(S_ISDIR)

+#   define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)

+#endif

+#if !defined(S_ISREG)

+#   define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)

+#endif

+#if !defined(S_ISLNK)

+#   define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)

+#endif

+#if !defined(S_ISSOCK)

+#   define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)

+#endif

+#if !defined(S_ISCHR)

+#   define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)

+#endif

+#if !defined(S_ISBLK)

+#   define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)

+#endif

+

+ /* Return the exact length of the file name without zero terminator */

+#define _D_EXACT_NAMLEN(p) ((p)->d_namlen)

+

+/* Return the maximum size of a file name */

+#define _D_ALLOC_NAMLEN(p) ((PATH_MAX)+1)

+

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+

+	/* Wide-character version */

+	struct _wdirent {

+		/* Always zero */

+		long d_ino;

+

+		/* File position within stream */

+		long d_off;

+

+		/* Structure size */

+		unsigned short d_reclen;

+

+		/* Length of name without \0 */

+		size_t d_namlen;

+

+		/* File type */

+		int d_type;

+

+		/* File name */

+		wchar_t d_name[PATH_MAX + 1];

+	};

+	typedef struct _wdirent _wdirent;

+

+	struct _WDIR {

+		/* Current directory entry */

+		struct _wdirent ent;

+

+		/* Private file data */

+		WIN32_FIND_DATAW data;

+

+		/* True if data is valid */

+		int cached;

+

+		/* Win32 search handle */

+		HANDLE handle;

+

+		/* Initial directory name */

+		wchar_t *patt;

+	};

+	typedef struct _WDIR _WDIR;

+

+	/* Multi-byte character version */

+	struct dirent {

+		/* Always zero */

+		long d_ino;

+

+		/* File position within stream */

+		long d_off;

+

+		/* Structure size */

+		unsigned short d_reclen;

+

+		/* Length of name without \0 */

+		size_t d_namlen;

+

+		/* File type */

+		int d_type;

+

+		/* File name */

+		char d_name[PATH_MAX + 1];

+	};

+	typedef struct dirent dirent;

+

+	struct DIR {

+		struct dirent ent;

+		struct _WDIR *wdirp;

+	};

+	typedef struct DIR DIR;

+

+

+	/* Dirent functions */

+	static DIR *opendir(const char *dirname);

+	static _WDIR *_wopendir(const wchar_t *dirname);

+

+	static struct dirent *readdir(DIR *dirp);

+	static struct _wdirent *_wreaddir(_WDIR *dirp);

+

+	static int readdir_r(

+		DIR *dirp, struct dirent *entry, struct dirent **result);

+	static int _wreaddir_r(

+		_WDIR *dirp, struct _wdirent *entry, struct _wdirent **result);

+

+	static int closedir(DIR *dirp);

+	static int _wclosedir(_WDIR *dirp);

+

+	static void rewinddir(DIR* dirp);

+	static void _wrewinddir(_WDIR* dirp);

+

+	static int scandir(const char *dirname, struct dirent ***namelist,

+		int(*filter)(const struct dirent*),

+		int(*compare)(const struct dirent**, const struct dirent**));

+

+	static int alphasort(const struct dirent **a, const struct dirent **b);

+

+	static int versionsort(const struct dirent **a, const struct dirent **b);

+

+

+	/* For compatibility with Symbian */

+#define wdirent _wdirent

+#define WDIR _WDIR

+#define wopendir _wopendir

+#define wreaddir _wreaddir

+#define wclosedir _wclosedir

+#define wrewinddir _wrewinddir

+

+

+/* Internal utility functions */

+	static WIN32_FIND_DATAW *dirent_first(_WDIR *dirp);

+	static WIN32_FIND_DATAW *dirent_next(_WDIR *dirp);

+

+	static int dirent_mbstowcs_s(

+		size_t *pReturnValue,

+		wchar_t *wcstr,

+		size_t sizeInWords,

+		const char *mbstr,

+		size_t count);

+

+	static int dirent_wcstombs_s(

+		size_t *pReturnValue,

+		char *mbstr,

+		size_t sizeInBytes,

+		const wchar_t *wcstr,

+		size_t count);

+

+	static void dirent_set_errno(int error);

+

+

+	/*

+	 * Open directory stream DIRNAME for read and return a pointer to the

+	 * internal working area that is used to retrieve individual directory

+	 * entries.

+	 */

+	static _WDIR*

+		_wopendir(

+			const wchar_t *dirname)

+	{

+		_WDIR *dirp = NULL;

+		int error;

+

+		/* Must have directory name */

+		if (dirname == NULL || dirname[0] == '\0') {

+			dirent_set_errno(ENOENT);

+			return NULL;

+		}

+

+		/* Allocate new _WDIR structure */

+		dirp = (_WDIR*)malloc(sizeof(struct _WDIR));

+		if (dirp != NULL) {

+			DWORD n;

+

+			/* Reset _WDIR structure */

+			dirp->handle = INVALID_HANDLE_VALUE;

+			dirp->patt = NULL;

+			dirp->cached = 0;

+

+			/* Compute the length of full path plus zero terminator

+			 *

+			 * Note that on WinRT there's no way to convert relative paths

+			 * into absolute paths, so just assume it is an absolute path.

+			 */

+#       if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)

+			n = wcslen(dirname);

+#       else

+			n = GetFullPathNameW(dirname, 0, NULL, NULL);

+#       endif

+

+			/* Allocate room for absolute directory name and search pattern */

+			dirp->patt = (wchar_t*)malloc(sizeof(wchar_t) * n + 16);

+			if (dirp->patt) {

+

+				/*

+				 * Convert relative directory name to an absolute one.  This

+				 * allows rewinddir() to function correctly even when current

+				 * working directory is changed between opendir() and rewinddir().

+				 *

+				 * Note that on WinRT there's no way to convert relative paths

+				 * into absolute paths, so just assume it is an absolute path.

+				 */

+#           if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)

+				wcsncpy_s(dirp->patt, n + 1, dirname, n);

+#           else

+				n = GetFullPathNameW(dirname, n, dirp->patt, NULL);

+#           endif

+				if (n > 0) {

+					wchar_t *p;

+

+					/* Append search pattern \* to the directory name */

+					p = dirp->patt + n;

+					if (dirp->patt < p) {

+						switch (p[-1]) {

+						case '\\':

+						case '/':

+						case ':':

+							/* Directory ends in path separator, e.g. c:\temp\ */

+							/*NOP*/;

+							break;

+

+						default:

+							/* Directory name doesn't end in path separator */

+							*p++ = '\\';

+						}

+					}

+					*p++ = '*';

+					*p = '\0';

+

+					/* Open directory stream and retrieve the first entry */

+					if (dirent_first(dirp)) {

+						/* Directory stream opened successfully */

+						error = 0;

+					}

+					else {

+						/* Cannot retrieve first entry */

+						error = 1;

+						dirent_set_errno(ENOENT);

+					}

+

+				}

+				else {

+					/* Cannot retrieve full path name */

+					dirent_set_errno(ENOENT);

+					error = 1;

+				}

+

+			}

+			else {

+				/* Cannot allocate memory for search pattern */

+				error = 1;

+			}

+

+		}

+		else {

+			/* Cannot allocate _WDIR structure */

+			error = 1;

+		}

+

+		/* Clean up in case of error */

+		if (error  &&  dirp) {

+			_wclosedir(dirp);

+			dirp = NULL;

+		}

+

+		return dirp;

+	}

+

+	/*

+	 * Read next directory entry.

+	 *

+	 * Returns pointer to static directory entry which may be overwritten by

+	 * subsequent calls to _wreaddir().

+	 */

+	static struct _wdirent*

+		_wreaddir(

+			_WDIR *dirp)

+	{

+		struct _wdirent *entry;

+

+		/*

+		 * Read directory entry to buffer.  We can safely ignore the return value

+		 * as entry will be set to NULL in case of error.

+		 */

+		(void)_wreaddir_r(dirp, &dirp->ent, &entry);

+

+		/* Return pointer to statically allocated directory entry */

+		return entry;

+	}

+

+	/*

+	 * Read next directory entry.

+	 *

+	 * Returns zero on success.  If end of directory stream is reached, then sets

+	 * result to NULL and returns zero.

+	 */

+	static int

+		_wreaddir_r(

+			_WDIR *dirp,

+			struct _wdirent *entry,

+			struct _wdirent **result)

+	{

+		WIN32_FIND_DATAW *datap;

+

+		/* Read next directory entry */

+		datap = dirent_next(dirp);

+		if (datap) {

+			size_t n;

+			DWORD attr;

+

+			/*

+			 * Copy file name as wide-character string.  If the file name is too

+			 * long to fit in to the destination buffer, then truncate file name

+			 * to PATH_MAX characters and zero-terminate the buffer.

+			 */

+			n = 0;

+			while (n < PATH_MAX  &&  datap->cFileName[n] != 0) {

+				entry->d_name[n] = datap->cFileName[n];

+				n++;

+			}

+			entry->d_name[n] = 0;

+

+			/* Length of file name excluding zero terminator */

+			entry->d_namlen = n;

+

+			/* File type */

+			attr = datap->dwFileAttributes;

+			if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {

+				entry->d_type = DT_CHR;

+			}

+			else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {

+				entry->d_type = DT_DIR;

+			}

+			else {

+				entry->d_type = DT_REG;

+			}

+

+			/* Reset dummy fields */

+			entry->d_ino = 0;

+			entry->d_off = 0;

+			entry->d_reclen = sizeof(struct _wdirent);

+

+			/* Set result address */

+			*result = entry;

+

+		}

+		else {

+

+			/* Return NULL to indicate end of directory */

+			*result = NULL;

+

+		}

+

+		return /*OK*/0;

+	}

+

+	/*

+	 * Close directory stream opened by opendir() function.  This invalidates the

+	 * DIR structure as well as any directory entry read previously by

+	 * _wreaddir().

+	 */

+	static int

+		_wclosedir(

+			_WDIR *dirp)

+	{

+		int ok;

+		if (dirp) {

+

+			/* Release search handle */

+			if (dirp->handle != INVALID_HANDLE_VALUE) {

+				FindClose(dirp->handle);

+				dirp->handle = INVALID_HANDLE_VALUE;

+			}

+

+			/* Release search pattern */

+			if (dirp->patt) {

+				free(dirp->patt);

+				dirp->patt = NULL;

+			}

+

+			/* Release directory structure */

+			free(dirp);

+			ok = /*success*/0;

+

+		}

+		else {

+

+			/* Invalid directory stream */

+			dirent_set_errno(EBADF);

+			ok = /*failure*/-1;

+

+		}

+		return ok;

+	}

+

+	/*

+	 * Rewind directory stream such that _wreaddir() returns the very first

+	 * file name again.

+	 */

+	static void

+		_wrewinddir(

+			_WDIR* dirp)

+	{

+		if (dirp) {

+			/* Release existing search handle */

+			if (dirp->handle != INVALID_HANDLE_VALUE) {

+				FindClose(dirp->handle);

+			}

+

+			/* Open new search handle */

+			dirent_first(dirp);

+		}

+	}

+

+	/* Get first directory entry (internal) */

+	static WIN32_FIND_DATAW*

+		dirent_first(

+			_WDIR *dirp)

+	{

+		WIN32_FIND_DATAW *datap;

+

+		/* Open directory and retrieve the first entry */

+		dirp->handle = FindFirstFileExW(

+			dirp->patt, FindExInfoStandard, &dirp->data,

+			FindExSearchNameMatch, NULL, 0);

+		if (dirp->handle != INVALID_HANDLE_VALUE) {

+

+			/* a directory entry is now waiting in memory */

+			datap = &dirp->data;

+			dirp->cached = 1;

+

+		}

+		else {

+

+			/* Failed to re-open directory: no directory entry in memory */

+			dirp->cached = 0;

+			datap = NULL;

+

+		}

+		return datap;

+	}

+

+	/*

+	 * Get next directory entry (internal).

+	 *

+	 * Returns

+	 */

+	static WIN32_FIND_DATAW*

+		dirent_next(

+			_WDIR *dirp)

+	{

+		WIN32_FIND_DATAW *p;

+

+		/* Get next directory entry */

+		if (dirp->cached != 0) {

+

+			/* A valid directory entry already in memory */

+			p = &dirp->data;

+			dirp->cached = 0;

+

+		}

+		else if (dirp->handle != INVALID_HANDLE_VALUE) {

+

+			/* Get the next directory entry from stream */

+			if (FindNextFileW(dirp->handle, &dirp->data) != FALSE) {

+				/* Got a file */

+				p = &dirp->data;

+			}

+			else {

+				/* The very last entry has been processed or an error occurred */

+				FindClose(dirp->handle);

+				dirp->handle = INVALID_HANDLE_VALUE;

+				p = NULL;

+			}

+

+		}

+		else {

+

+			/* End of directory stream reached */

+			p = NULL;

+

+		}

+

+		return p;

+	}

+

+	/*

+	 * Open directory stream using plain old C-string.

+	 */

+	static DIR*

+		opendir(

+			const char *dirname)

+	{

+		struct DIR *dirp;

+		int error;

+

+		/* Must have directory name */

+		if (dirname == NULL || dirname[0] == '\0') {

+			dirent_set_errno(ENOENT);

+			return NULL;

+		}

+

+		/* Allocate memory for DIR structure */

+		dirp = (DIR*)malloc(sizeof(struct DIR));

+		if (dirp) {

+			wchar_t wname[PATH_MAX + 1];

+			size_t n;

+

+			/* Convert directory name to wide-character string */

+			error = dirent_mbstowcs_s(

+				&n, wname, PATH_MAX + 1, dirname, PATH_MAX + 1);

+			if (!error) {

+

+				/* Open directory stream using wide-character name */

+				dirp->wdirp = _wopendir(wname);

+				if (dirp->wdirp) {

+					/* Directory stream opened */

+					error = 0;

+				}

+				else {

+					/* Failed to open directory stream */

+					error = 1;

+				}

+

+			}

+			else {

+				/*

+				 * Cannot convert file name to wide-character string.  This

+				 * occurs if the string contains invalid multi-byte sequences or

+				 * the output buffer is too small to contain the resulting

+				 * string.

+				 */

+				error = 1;

+			}

+

+		}

+		else {

+			/* Cannot allocate DIR structure */

+			error = 1;

+		}

+

+		/* Clean up in case of error */

+		if (error  &&  dirp) {

+			free(dirp);

+			dirp = NULL;

+		}

+

+		return dirp;

+	}

+

+	/*

+	 * Read next directory entry.

+	 */

+	static struct dirent*

+		readdir(

+			DIR *dirp)

+	{

+		struct dirent *entry;

+

+		/*

+		 * Read directory entry to buffer.  We can safely ignore the return value

+		 * as entry will be set to NULL in case of error.

+		 */

+		(void)readdir_r(dirp, &dirp->ent, &entry);

+

+		/* Return pointer to statically allocated directory entry */

+		return entry;

+	}

+

+	/*

+	 * Read next directory entry into called-allocated buffer.

+	 *

+	 * Returns zero on success.  If the end of directory stream is reached, then

+	 * sets result to NULL and returns zero.

+	 */

+	static int

+		readdir_r(

+			DIR *dirp,

+			struct dirent *entry,

+			struct dirent **result)

+	{

+		WIN32_FIND_DATAW *datap;

+

+		/* Read next directory entry */

+		datap = dirent_next(dirp->wdirp);

+		if (datap) {

+			size_t n;

+			int error;

+

+			/* Attempt to convert file name to multi-byte string */

+			error = dirent_wcstombs_s(

+				&n, entry->d_name, PATH_MAX + 1, datap->cFileName, PATH_MAX + 1);

+

+			/*

+			 * If the file name cannot be represented by a multi-byte string,

+			 * then attempt to use old 8+3 file name.  This allows traditional

+			 * Unix-code to access some file names despite of unicode

+			 * characters, although file names may seem unfamiliar to the user.

+			 *

+			 * Be ware that the code below cannot come up with a short file

+			 * name unless the file system provides one.  At least

+			 * VirtualBox shared folders fail to do this.

+			 */

+			if (error  &&  datap->cAlternateFileName[0] != '\0') {

+				error = dirent_wcstombs_s(

+					&n, entry->d_name, PATH_MAX + 1,

+					datap->cAlternateFileName, PATH_MAX + 1);

+			}

+

+			if (!error) {

+				DWORD attr;

+

+				/* Length of file name excluding zero terminator */

+				entry->d_namlen = n - 1;

+

+				/* File attributes */

+				attr = datap->dwFileAttributes;

+				if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {

+					entry->d_type = DT_CHR;

+				}

+				else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {

+					entry->d_type = DT_DIR;

+				}

+				else {

+					entry->d_type = DT_REG;

+				}

+

+				/* Reset dummy fields */

+				entry->d_ino = 0;

+				entry->d_off = 0;

+				entry->d_reclen = sizeof(struct dirent);

+

+			}

+			else {

+

+				/*

+				 * Cannot convert file name to multi-byte string so construct

+				 * an erroneous directory entry and return that.  Note that

+				 * we cannot return NULL as that would stop the processing

+				 * of directory entries completely.

+				 */

+				entry->d_name[0] = '?';

+				entry->d_name[1] = '\0';

+				entry->d_namlen = 1;

+				entry->d_type = DT_UNKNOWN;

+				entry->d_ino = 0;

+				entry->d_off = -1;

+				entry->d_reclen = 0;

+

+			}

+

+			/* Return pointer to directory entry */

+			*result = entry;

+

+		}

+		else {

+

+			/* No more directory entries */

+			*result = NULL;

+

+		}

+

+		return /*OK*/0;

+	}

+

+	/*

+	 * Close directory stream.

+	 */

+	static int

+		closedir(

+			DIR *dirp)

+	{

+		int ok;

+		if (dirp) {

+

+			/* Close wide-character directory stream */

+			ok = _wclosedir(dirp->wdirp);

+			dirp->wdirp = NULL;

+

+			/* Release multi-byte character version */

+			free(dirp);

+

+		}

+		else {

+

+			/* Invalid directory stream */

+			dirent_set_errno(EBADF);

+			ok = /*failure*/-1;

+

+		}

+		return ok;

+	}

+

+	/*

+	 * Rewind directory stream to beginning.

+	 */

+	static void

+		rewinddir(

+			DIR* dirp)

+	{

+		/* Rewind wide-character string directory stream */

+		_wrewinddir(dirp->wdirp);

+	}

+

+	/*

+	 * Scan directory for entries.

+	 */

+	static int

+		scandir(

+			const char *dirname,

+			struct dirent ***namelist,

+			int(*filter)(const struct dirent*),

+			int(*compare)(const struct dirent**, const struct dirent**))

+	{

+		struct dirent **files = NULL;

+		size_t size = 0;

+		size_t allocated = 0;

+		const size_t init_size = 1;

+		DIR *dir = NULL;

+		struct dirent *entry;

+		struct dirent *tmp = NULL;

+		size_t i;

+		int result = 0;

+

+		/* Open directory stream */

+		dir = opendir(dirname);

+		if (dir) {

+

+			/* Read directory entries to memory */

+			while (1) {

+

+				/* Enlarge pointer table to make room for another pointer */

+				if (size >= allocated) {

+					void *p;

+					size_t num_entries;

+

+					/* Compute number of entries in the enlarged pointer table */

+					if (size < init_size) {

+						/* Allocate initial pointer table */

+						num_entries = init_size;

+					}

+					else {

+						/* Double the size */

+						num_entries = size * 2;

+					}

+

+					/* Allocate first pointer table or enlarge existing table */

+					p = realloc(files, sizeof(void*) * num_entries);

+					if (p != NULL) {

+						/* Got the memory */

+						files = (dirent**)p;

+						allocated = num_entries;

+					}

+					else {

+						/* Out of memory */

+						result = -1;

+						break;

+					}

+

+				}

+

+				/* Allocate room for temporary directory entry */

+				if (tmp == NULL) {

+					tmp = (struct dirent*) malloc(sizeof(struct dirent));

+					if (tmp == NULL) {

+						/* Cannot allocate temporary directory entry */

+						result = -1;

+						break;

+					}

+				}

+

+				/* Read directory entry to temporary area */

+				if (readdir_r(dir, tmp, &entry) == /*OK*/0) {

+

+					/* Did we get an entry? */

+					if (entry != NULL) {

+						int pass;

+

+						/* Determine whether to include the entry in result */

+						if (filter) {

+							/* Let the filter function decide */

+							pass = filter(tmp);

+						}

+						else {

+							/* No filter function, include everything */

+							pass = 1;

+						}

+

+						if (pass) {

+							/* Store the temporary entry to pointer table */

+							files[size++] = tmp;

+							tmp = NULL;

+

+							/* Keep up with the number of files */

+							result++;

+						}

+

+					}

+					else {

+

+						/*

+						 * End of directory stream reached => sort entries and

+						 * exit.

+						 */

+						qsort(files, size, sizeof(void*),

+							(int(*) (const void*, const void*)) compare);

+						break;

+

+					}

+

+				}

+				else {

+					/* Error reading directory entry */

+					result = /*Error*/ -1;

+					break;

+				}

+

+			}

+

+		}

+		else {

+			/* Cannot open directory */

+			result = /*Error*/ -1;

+		}

+

+		/* Release temporary directory entry */

+		if (tmp) {

+			free(tmp);

+		}

+

+		/* Release allocated memory on error */

+		if (result < 0) {

+			for (i = 0; i < size; i++) {

+				free(files[i]);

+			}

+			free(files);

+			files = NULL;

+		}

+

+		/* Close directory stream */

+		if (dir) {

+			closedir(dir);

+		}

+

+		/* Pass pointer table to caller */

+		if (namelist) {

+			*namelist = files;

+		}

+		return result;

+	}

+

+	/* Alphabetical sorting */

+	static int

+		alphasort(

+			const struct dirent **a, const struct dirent **b)

+	{

+		return strcoll((*a)->d_name, (*b)->d_name);

+	}

+

+	/* Sort versions */

+	static int

+		versionsort(

+			const struct dirent **a, const struct dirent **b)

+	{

+		/* FIXME: implement strverscmp and use that */

+		return alphasort(a, b);

+	}

+

+	/* Convert multi-byte string to wide character string */

+	static int

+		dirent_mbstowcs_s(

+			size_t *pReturnValue,

+			wchar_t *wcstr,

+			size_t sizeInWords,

+			const char *mbstr,

+			size_t count)

+	{

+		int error;

+		int n;

+		size_t len;

+		UINT cp;

+		DWORD flags;

+

+		/* Determine code page for multi-byte string */

+		if (AreFileApisANSI()) {

+			/* Default ANSI code page */

+			cp = GetACP();

+		}

+		else {

+			/* Default OEM code page */

+			cp = GetOEMCP();

+		}

+

+		/*

+		 * Determine flags based on the character set.  For more information,

+		 * please see https://docs.microsoft.com/fi-fi/windows/desktop/api/stringapiset/nf-stringapiset-multibytetowidechar

+		 */

+		switch (cp) {

+		case 42:

+		case 50220:

+		case 50221:

+		case 50222:

+		case 50225:

+		case 50227:

+		case 50229:

+		case 57002:

+		case 57003:

+		case 57004:

+		case 57005:

+		case 57006:

+		case 57007:

+		case 57008:

+		case 57009:

+		case 57010:

+		case 57011:

+		case 65000:

+			/* MultiByteToWideChar does not support MB_ERR_INVALID_CHARS */

+			flags = 0;

+			break;

+

+		default:

+			/*

+			 * Ask MultiByteToWideChar to return an error if a multi-byte

+			 * character cannot be converted to a wide-character.

+			 */

+			flags = MB_ERR_INVALID_CHARS;

+		}

+

+		/* Compute the length of input string without zero-terminator */

+		len = 0;

+		while (mbstr[len] != '\0'  &&  len < count) {

+			len++;

+		}

+

+		/* Convert to wide-character string */

+		n = MultiByteToWideChar(

+			/* Source code page */ cp,

+			/* Flags */ flags,

+			/* Pointer to string to convert */ mbstr,

+			/* Size of multi-byte string */ (int)len,

+			/* Pointer to output buffer */ wcstr,

+			/* Size of output buffer */ sizeInWords - 1

+		);

+

+		/* Ensure that output buffer is zero-terminated */

+		wcstr[n] = '\0';

+

+		/* Return length of wide-character string with zero-terminator */

+		*pReturnValue = (size_t)(n + 1);

+

+		/* Return zero if conversion succeeded */

+		if (n > 0) {

+			error = 0;

+		}

+		else {

+			error = 1;

+		}

+		return error;

+	}

+

+	/* Convert wide-character string to multi-byte string */

+	static int

+		dirent_wcstombs_s(

+			size_t *pReturnValue,

+			char *mbstr,

+			size_t sizeInBytes, /* max size of mbstr */

+			const wchar_t *wcstr,

+			size_t count)

+	{

+		int n;

+		int error;

+		UINT cp;

+		size_t len;

+		BOOL flag = 0;

+		LPBOOL pflag;

+

+		/* Determine code page for multi-byte string */

+		if (AreFileApisANSI()) {

+			/* Default ANSI code page */

+			cp = GetACP();

+		}

+		else {

+			/* Default OEM code page */

+			cp = GetOEMCP();

+		}

+

+		/* Compute the length of input string without zero-terminator */

+		len = 0;

+		while (wcstr[len] != '\0'  &&  len < count) {

+			len++;

+		}

+

+		/*

+		 * Determine if we can ask WideCharToMultiByte to return information on

+		 * broken characters.  For more information, please see

+		 * https://docs.microsoft.com/en-us/windows/desktop/api/stringapiset/nf-stringapiset-widechartomultibyte

+		 */

+		switch (cp) {

+		case CP_UTF7:

+		case CP_UTF8:

+			/*

+			 * WideCharToMultiByte fails if we request information on default

+			 * characters.  This is just a nuisance but doesn't affect the

+			 * conversion: if Windows is configured to use UTF-8, then the default

+			 * character should not be needed anyway.

+			 */

+			pflag = NULL;

+			break;

+

+		default:

+			/*

+			 * Request that WideCharToMultiByte sets the flag if it uses the

+			 * default character.

+			 */

+			pflag = &flag;

+		}

+

+		/* Convert wide-character string to multi-byte character string */

+		n = WideCharToMultiByte(

+			/* Target code page */ cp,

+			/* Flags */ 0,

+			/* Pointer to unicode string */ wcstr,

+			/* Length of unicode string */ (int)len,

+			/* Pointer to output buffer */ mbstr,

+			/* Size of output buffer */ sizeInBytes - 1,

+			/* Default character */ NULL,

+			/* Whether default character was used or not */ pflag

+		);

+

+		/* Ensure that output buffer is zero-terminated */

+		mbstr[n] = '\0';

+

+		/* Return length of multi-byte string with zero-terminator */

+		*pReturnValue = (size_t)(n + 1);

+

+		/* Return zero if conversion succeeded without using default characters */

+		if (n > 0 && flag == 0) {

+			error = 0;

+		}

+		else {

+			error = 1;

+		}

+		return error;

+	}

+

+	/* Set errno variable */

+	static void

+		dirent_set_errno(

+			int error)

+	{

+#if defined(_MSC_VER)  &&  _MSC_VER >= 1400

+

+		/* Microsoft Visual Studio 2005 and later */

+		_set_errno(error);

+

+#else

+

+		/* Non-Microsoft compiler or older Microsoft compiler */

+		errno = error;

+

+#endif

+	}

+

+

+#ifdef __cplusplus

+}

+#endif

+#endif /*DIRENT_H*/#pragma once

diff --git a/app/bin/include/paramfile.h b/app/bin/include/paramfile.h
new file mode 100644
index 0000000..b177b15
--- /dev/null
+++ b/app/bin/include/paramfile.h
@@ -0,0 +1,26 @@
+#ifndef HAVE_PARAMFILE_H
+	#define HAVE_PARAMFILE_H
+	#include <stdbool.h>
+	#include <wlib.h>
+	#include "common.h"
+
+	extern DIST_T curBarScale;
+	extern dynArr_t paramProc_da;
+	extern dynArr_t paramFileInfo_da;
+
+	void ParamCheckSumLine(char * line);
+	wBool_t IsParamValid(int fileInx);
+	bool IsParamFileDeleted(int fileInx);
+	bool IsParamFileFavorite(int fileInx);
+	void SetParamFileState(int index);
+	int ReadParamFile(const char *fileName);
+	int	ReloadDeletedParamFile(int fileindex);
+	void SetParamFileDeleted(int fileInx, bool deleted);
+	void SetParamFileFavorite(int fileInx, bool favorite);
+	char * GetParamFileName(int fileInx);
+	char * GetParamFileContents(int fileInx);
+	bool ReadParams(long key, const char * dirName, const char * fileName);
+
+	#define CONTENTSCOMMAND "CONTENTS"
+	char *GetParameterFileContent(char *file);
+#endif // !HAVE_PARAMFILE_H
diff --git a/app/bin/include/paramfilelist.h b/app/bin/include/paramfilelist.h
new file mode 100644
index 0000000..a1c081d
--- /dev/null
+++ b/app/bin/include/paramfilelist.h
@@ -0,0 +1,32 @@
+#ifndef HAVE_PARAMFILELIST_H
+	#define HAVE_PARAMFILELIST_H
+	#include <stdbool.h>
+	#include "include/paramfile.h"
+
+	typedef struct {
+		char * name;				/** < name of parameter file */
+		char * contents;
+		bool deleted;
+		bool valid;					/** < FALSE for dropped file */
+		bool favorite;
+		enum paramFileState trackState;
+	} paramFileInfo_t;
+	typedef paramFileInfo_t * paramFileInfo_p;
+
+	#define paramFileInfo(N) DYNARR_N( paramFileInfo_t, paramFileInfo_da, N )
+	
+	char *GetParamFileDir(void);
+	void SetParamFileDir(char *fullPath);
+	void LoadParamFileList(void);
+	BOOL_T ReadDefaultParams(const char * dirName);
+	void SaveParamFileList(void);
+	int GetParamFileCount();
+	void UpdateParamFileList(void);
+	void ParamFilesChange(long changes);
+	int LoadParamFile(int files, char ** fileName, void * data);
+	BOOL_T ParamFileListInit(void);
+
+	void SearchUiOk(void * junk);
+	bool ReloadParamFile(wIndex_t index);
+	bool UnloadParamFile(wIndex_t fileIndex);
+#endif // !HAVE_PARAMFILELIST_H
diff --git a/app/bin/include/partcatalog.h b/app/bin/include/partcatalog.h
new file mode 100644
index 0000000..eec9d1e
--- /dev/null
+++ b/app/bin/include/partcatalog.h
@@ -0,0 +1,70 @@
+/** \file partcatalog.h
+* Manage the catalog of track parameter files
+*/
+/*  XTrkCad - Model Railroad CAD
+*  Copyright (C) 2019 Martin Fischer
+*
+*  This program is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program; if not, write to the Free Software
+*  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef HAVE_TRACKCATALOG_H
+#define HAVE_TRACKCATALOG_H
+
+#include <stdbool.h>
+
+#define MAXFILESPERCONTENT	10					/**< count of files with the same content header */
+#define ESTIMATED_CONTENTS_WORDS 10				/**< average count of words in CONTENTS header */
+
+struct sCatalogEntry {
+    struct sCatalogEntry *next;
+    unsigned files;								/**< current count of files */
+    char *fullFileName[MAXFILESPERCONTENT];		/**< fully qualified file name */
+    char *contents;								/**< content field of parameter file */
+    struct sCatalogEntry *indirect;               /**< pointer to another catalog entry */
+};
+
+typedef struct sCatalogEntry CatalogEntry;
+
+struct sIndexEntry {
+    CatalogEntry *value;						/**< catalog entry having the key word in contents */
+    char *keyWord;								/**< keyword */
+};
+
+typedef struct sIndexEntry IndexEntry;
+
+struct sTrackLibrary {
+    CatalogEntry *catalog;						/**< list of files cataloged */
+    IndexEntry *index;							/**< Index for lookup */
+    unsigned wordCount;							/**< How many words indexed */
+    void * words_array;							/**< The array of words */
+    unsigned trackTypeCount;					/**< */
+};
+
+typedef struct sTrackLibrary
+		TrackLibrary;							/**< core data structure for the catalog */
+
+CatalogEntry *InitCatalog(void);
+TrackLibrary *InitLibrary(void);
+TrackLibrary *CreateLibrary(char *directory);
+void DeleteLibrary(TrackLibrary *tracklib);
+bool GetTrackFiles(TrackLibrary *trackLib, char *directory);
+int GetParameterFileInfo(int files, char ** fileName, void * data);
+unsigned CreateLibraryIndex(TrackLibrary *trackLib);
+unsigned SearchLibrary(TrackLibrary *library, char *searchExpression, CatalogEntry *resultEntries);
+unsigned CountCatalogEntries(CatalogEntry *listHeader);
+void EmptyCatalog(CatalogEntry *listHeader);
+unsigned SearchLibrary(TrackLibrary *library, char *searchExpression, CatalogEntry *resultEntries);
+bool FilterKeyword(char *word);
+#endif // !HAVE_TRACKCATALOG_H
diff --git a/app/bin/include/stringxtc.h b/app/bin/include/stringxtc.h
new file mode 100644
index 0000000..cbadd0e
--- /dev/null
+++ b/app/bin/include/stringxtc.h
@@ -0,0 +1,8 @@
+#include <stddef.h>

+

+#ifndef HAVE_STRINGXTC_H

+	#define HAVE_STRINGXTC_H

+	size_t strscpy(char *dest, const char *src, size_t count);

+	char *XtcStrlwr(char *str);

+	int	XtcStricmp(const char *a, const char *b);

+#endif

diff --git a/app/bin/include/utf8convert.h b/app/bin/include/utf8convert.h
new file mode 100644
index 0000000..6a3e678
--- /dev/null
+++ b/app/bin/include/utf8convert.h
@@ -0,0 +1,24 @@
+/*  XTrackCad - Model Railroad CAD
+ *  Copyright (C) 2020 Martin Fischer
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef HAVE_UTF8CONVERT_H
+#include <stdbool.h>
+char *Convert2UTF8(char *string);
+bool RequiresConvToUTF8(char *string);
+void ConvertUTF8ToSystem(unsigned char *in);
+#endif // HAVE_UTF8CONVERT_H