Makefile.am: Fix EXTRA_DIST

[wimlib] / programs / imagex-win32.c

diff --git a/programs/imagex-win32.c b/programs/imagex-win32.c
index a0cbc33dec91fd5d3c648d2ccae3fd16ed3203fd..083c1453a9dc1d034721770e55ca28c7b8b38586 100644 (file)
--- a/programs/imagex-win32.c
+++ b/programs/imagex-win32.c
@@ -5,119 +5,11 @@
 #endif
 
 #include "imagex-win32.h"
-#include <assert.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <io.h>
 #include <stdio.h>
-#include <string.h>
 #include <windows.h>
 
-/* Replacement for glob() in Windows native builds that operates on wide
- * characters.  */
-int
-win32_wglob(const wchar_t *pattern, int flags,
-           int (*errfunc)(const wchar_t *epath, int eerrno),
-           glob_t *pglob)
-{
-       WIN32_FIND_DATAW dat;
-       DWORD err;
-       HANDLE hFind;
-       int ret;
-       size_t nspaces;
-
-       const wchar_t *backslash, *end_slash;
-       size_t prefix_len;
-
-       backslash = wcsrchr(pattern, L'\\');
-       end_slash = wcsrchr(pattern, L'/');
-
-       if (backslash > end_slash)
-               end_slash = backslash;
-
-       if (end_slash)
-               prefix_len = end_slash - pattern + 1;
-       else
-               prefix_len = 0;
-
-       /* This function does not support all functionality of the POSIX glob(),
-        * so make sure the parameters are consistent with supported
-        * functionality. */
-       assert(errfunc == NULL);
-       assert((flags & GLOB_ERR) == GLOB_ERR);
-       assert((flags & ~(GLOB_NOSORT | GLOB_ERR)) == 0);
-
-       hFind = FindFirstFileW(pattern, &dat);
-       if (hFind == INVALID_HANDLE_VALUE) {
-               err = GetLastError();
-               if (err == ERROR_FILE_NOT_FOUND) {
-                       errno = 0;
-                       return GLOB_NOMATCH;
-               } else {
-                       /* The other possible error codes for FindFirstFile()
-                        * are undocumented. */
-                       errno = EIO;
-                       return GLOB_ABORTED;
-               }
-       }
-       pglob->gl_pathc = 0;
-       pglob->gl_pathv = NULL;
-       nspaces = 0;
-       do {
-               wchar_t *path;
-               if (pglob->gl_pathc == nspaces) {
-                       size_t new_nspaces;
-                       wchar_t **pathv;
-
-                       new_nspaces = nspaces * 2 + 1;  
-                       pathv = realloc(pglob->gl_pathv,
-                                       new_nspaces * sizeof(pglob->gl_pathv[0]));
-                       if (!pathv)
-                               goto oom;
-                       pglob->gl_pathv = pathv;
-                       nspaces = new_nspaces;
-               }
-               size_t filename_len = wcslen(dat.cFileName);
-               size_t len_needed = prefix_len + filename_len;
-
-               path = malloc((len_needed + 1) * sizeof(wchar_t));
-               if (!path)
-                       goto oom;
-
-               wmemcpy(path, pattern, prefix_len);
-               wmemcpy(path + prefix_len, dat.cFileName, filename_len + 1);
-               pglob->gl_pathv[pglob->gl_pathc++] = path;
-       } while (FindNextFileW(hFind, &dat));
-       err = GetLastError();
-       CloseHandle(hFind);
-       if (err == ERROR_NO_MORE_FILES) {
-               errno = 0;
-               return 0;
-       } else {
-               /* Other possible error codes for FindNextFile() are
-                * undocumented */
-               errno = EIO;
-               ret = GLOB_ABORTED;
-               goto fail_globfree;
-       }
-oom:
-       CloseHandle(hFind);
-       errno = ENOMEM;
-       ret = GLOB_NOSPACE;
-fail_globfree:
-       globfree(pglob);
-       return ret;
-}
-
-void
-globfree(glob_t *pglob)
-{
-       size_t i;
-       for (i = 0; i < pglob->gl_pathc; i++)
-               free(pglob->gl_pathv[i]);
-       free(pglob->gl_pathv);
-}
-
 /* Convert a string from the "current Windows codepage" to UTF-16LE.  */
 wchar_t *
 win32_mbs_to_wcs(const char *mbs, size_t mbs_nbytes, size_t *num_wchars_ret)