X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib_tchar.h;h=d8c6915c7024104475760213fd50f7f9148c698b;hp=f0b17f01e51d06feda1f35b270994e1226a168c7;hb=723d5dbc1705200082f640453f19233a386bc655;hpb=14cf34971b351167d88adb009051a3513e627f32

diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h
index f0b17f01..d8c6915c 100644
--- a/include/wimlib_tchar.h
+++ b/include/wimlib_tchar.h
@@ -15,21 +15,24 @@ typedef wchar_t tchar;
 #  define T(text) _T(text) /* Make a string literal into a wide string */
 #  define TS "ls" /* Format a string of "tchar" */
 #  define TC "lc" /* Format a "tchar" */
-#  define WS "ls" /* Format a UTF-16LE string (same as above) */
 
 /* For Windows builds, the following definitions replace the "tchar" functions
  * with the "wide-character" functions. */
 #  define tmemchr	wmemchr
 #  define tmemcpy	wmemcpy
+#  define tmemmove	wmemmove
 #  define tmempcpy	wmempcpy
+#  define tstrcat	wcscat
 #  define tstrcpy	wcscpy
 #  define tprintf	wprintf
 #  define tsprintf	swprintf
 #  define tfprintf	fwprintf
 #  define tvfprintf	vfwprintf
-#  define istalpha	iswalpha
-#  define istspace	iswspace
+#  define istalpha(c)	iswalpha((wchar_t)(c))
+#  define istspace(c)	iswspace((wchar_t)(c))
+#  define totlower(c)	towlower((wchar_t)(c))
 #  define tstrcmp	wcscmp
+#  define tstrncmp	wcsncmp
 #  define tstrchr	wcschr
 #  define tstrpbrk	wcspbrk
 #  define tstrrchr	wcsrchr
@@ -51,6 +54,8 @@ typedef wchar_t tchar;
 #  define tstrerror	_wcserror
 #  define taccess	_waccess
 #  define tstrdup	wcsdup
+#  define ttempnam	_wtempnam
+#  define tgetenv	_wgetenv
 /* The following "tchar" functions do not have exact wide-character equivalents
  * on Windows so require parameter rearrangement or redirection to a replacement
  * function defined ourselves. */
@@ -58,7 +63,7 @@ typedef wchar_t tchar;
 #  define tmkdir(path, mode) _wmkdir(path)
 #  define tstrerror_r   win32_strerror_r_replacement
 #  define trename	win32_rename_replacement
-#  define ttruncate	win32_truncate_replacement
+#  define tglob		win32_wglob
 #else /* __WIN32__ */
 /* For non-Windows builds, the "tchar" type will be one byte and will specify a
  * string in the locale-dependent multibyte encoding.  However, only UTF-8 is
@@ -70,24 +75,23 @@ typedef char tchar;
 #  define TS "s"       /* Similarly, a string of "tchar" is printed just as a
 			  normal string. */
 #  define TC "c"       /* Print a single character */
-#  define WS "W"       /* UTF-16LE strings must be printed using a special
-			  extension implemented by wimlib itself.  Note that
-			  "ls" will not work here because a string of wide
-			  characters on non-Windows systems is typically not
-			  UTF-16LE. */
 /* For non-Windows builds, replace the "tchar" functions with the regular old
  * string functions. */
 #  define tmemchr	memchr
 #  define tmemcpy	memcpy
+#  define tmemmove	memmove
 #  define tmempcpy	mempcpy
+#  define tstrcat	strcat
 #  define tstrcpy	strcpy
 #  define tprintf	printf
 #  define tsprintf	sprintf
 #  define tfprintf	fprintf
 #  define tvfprintf	vfprintf
-#  define istalpha	isalpha
-#  define istspace	isspace
+#  define istalpha(c)	isalpha((unsigned char)(c))
+#  define istspace(c)	isspace((unsigned char)(c))
+#  define totlower(c)	tolower((unsigned char)(c))
 #  define tstrcmp	strcmp
+#  define tstrncmp	strncmp
 #  define tstrchr	strchr
 #  define tstrpbrk	strpbrk
 #  define tstrrchr	strrchr
@@ -109,11 +113,13 @@ typedef char tchar;
 #  define tstrtoul	strtoul
 #  define tmkdir	mkdir
 #  define tstrdup	strdup
+#  define ttempnam	tempnam
+#  define tgetenv	getenv
 #  define TSTRDUP	STRDUP
 #  define tstrerror_r	strerror_r
 #  define trename	rename
-#  define ttruncate	truncate
 #  define taccess	access
+#  define tglob		glob
 #endif /* !__WIN32__ */
 
 #endif /* _WIMLIB_TCHAR_H */