X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=8af2b0728fff2e016226dccba72e6ce5daac2926;hp=a57541f99711d94b474df35e69400269cbaf45e2;hb=8c26ca707e56d9848e52076ad3f7c26ea7fa338d;hpb=2a33c303e30fd740f740e21632fd06b9e414b0c7 diff --git a/src/add_image.c b/src/add_image.c index a57541f9..8af2b072 100644 --- a/src/add_image.c +++ b/src/add_image.c @@ -23,35 +23,22 @@ #include "config.h" -#if defined(__CYGWIN__) || defined(__WIN32__) -# include -# include -# include -# ifdef ERROR -# undef ERROR -# endif -# include "security.h" -#else -# include -# include -# include "timestamp.h" -#endif - #ifdef __WIN32__ -#include +# include "win32.h" +#else +# include +# include +# include +# include "timestamp.h" #endif #include "wimlib_internal.h" #include "dentry.h" #include "lookup_table.h" #include "xml.h" + #include #include - -#ifndef __WIN32__ -#include -#endif - #include #include #include @@ -60,9 +47,6 @@ #include #endif -#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000 -#define WIMLIB_ADD_IMAGE_FLAG_SOURCE 0x40000000 - /* * Adds the dentry tree and security data for a new image to the image metadata * array of the WIMStruct. @@ -114,439 +98,7 @@ err: } -#if defined(__CYGWIN__) || defined(__WIN32__) - -static u64 FILETIME_to_u64(const FILETIME *ft) -{ - return ((u64)ft->dwHighDateTime << 32) | (u64)ft->dwLowDateTime; -} - - -static int build_dentry_tree(struct wim_dentry **root_ret, - const char *root_disk_path, - struct wim_lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg); - -static int win32_get_short_name(struct wim_dentry *dentry, - const wchar_t *path_utf16) -{ - WIN32_FIND_DATAW dat; - if (FindFirstFileW(path_utf16, &dat) && - dat.cAlternateFileName[0] != L'\0') - { - size_t short_name_len = wcslen(dat.cAlternateFileName) * 2; - size_t n = short_name_len + sizeof(wchar_t); - dentry->short_name = MALLOC(n); - if (!dentry->short_name) - return WIMLIB_ERR_NOMEM; - memcpy(dentry->short_name, dat.cAlternateFileName, n); - dentry->short_name_len = short_name_len; - } - return 0; -} - -static int win32_get_security_descriptor(struct wim_dentry *dentry, - struct sd_set *sd_set, - const wchar_t *path_utf16) -{ - SECURITY_INFORMATION requestedInformation; - DWORD lenNeeded = 0; - BOOL status; - DWORD err; - - requestedInformation = DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION | - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION; - /* Request length of security descriptor */ - status = GetFileSecurityW(path_utf16, requestedInformation, - NULL, 0, &lenNeeded); - err = GetLastError(); - if (!status && err == ERROR_INSUFFICIENT_BUFFER) { - DWORD len = lenNeeded; - char buf[len]; - if (GetFileSecurityW(path_utf16, requestedInformation, - (PSECURITY_DESCRIPTOR)buf, len, &lenNeeded)) - { - int security_id = sd_set_add_sd(sd_set, buf, len); - if (security_id < 0) - return WIMLIB_ERR_NOMEM; - else { - dentry->d_inode->i_security_id = security_id; - return 0; - } - } else { - err = GetLastError(); - } - } - ERROR("Win32 API: Failed to read security descriptor of \"%ls\"", - path_utf16); - win32_error(err); - return WIMLIB_ERR_READ; -} - -/* Reads the directory entries of directory using a Win32 API and recursively - * calls build_dentry_tree() on them. */ -static int win32_recurse_directory(struct wim_dentry *root, - const char *root_disk_path, - struct wim_lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - struct sd_set *sd_set, - const wchar_t *path_utf16, - size_t path_utf16_nchars) -{ - WIN32_FIND_DATAW dat; - HANDLE hFind; - DWORD err; - int ret; - - { - /* Begin reading the directory by calling FindFirstFileW. - * Unlike UNIX opendir(), FindFirstFileW has file globbing built - * into it. But this isn't what we actually want, so just add a - * dummy glob to get all entries. */ - wchar_t pattern_buf[path_utf16_nchars + 3]; - memcpy(pattern_buf, path_utf16, - path_utf16_nchars * sizeof(wchar_t)); - pattern_buf[path_utf16_nchars] = L'/'; - pattern_buf[path_utf16_nchars + 1] = L'*'; - pattern_buf[path_utf16_nchars + 2] = L'\0'; - hFind = FindFirstFileW(pattern_buf, &dat); - } - if (hFind == INVALID_HANDLE_VALUE) { - err = GetLastError(); - if (err == ERROR_FILE_NOT_FOUND) { - return 0; - } else { - ERROR("Win32 API: Failed to read directory \"%s\"", - root_disk_path); - win32_error(err); - return WIMLIB_ERR_READ; - } - } - ret = 0; - do { - /* Skip . and .. entries */ - if (!(dat.cFileName[0] == L'.' && - (dat.cFileName[1] == L'\0' || - (dat.cFileName[1] == L'.' && dat.cFileName[2] == L'\0')))) - { - struct wim_dentry *child; - - char *utf8_name; - size_t utf8_name_nbytes; - ret = utf16_to_utf8((const char*)dat.cFileName, - wcslen(dat.cFileName) * sizeof(wchar_t), - &utf8_name, - &utf8_name_nbytes); - if (ret) - goto out_find_close; - - char name[strlen(root_disk_path) + 1 + utf8_name_nbytes + 1]; - sprintf(name, "%s/%s", root_disk_path, utf8_name); - FREE(utf8_name); - ret = build_dentry_tree(&child, name, lookup_table, - sd, config, add_image_flags, - progress_func, sd_set); - if (ret) - goto out_find_close; - if (child) - dentry_add_child(root, child); - } - } while (FindNextFileW(hFind, &dat)); - err = GetLastError(); - if (err != ERROR_NO_MORE_FILES) { - ERROR("Win32 API: Failed to read directory \"%s\"", root_disk_path); - win32_error(err); - if (ret == 0) - ret = WIMLIB_ERR_READ; - } -out_find_close: - FindClose(hFind); - return ret; -} - -/* Load a reparse point into a WIM inode. It is just stored in memory. - * - * @hFile: Open handle to a reparse point, with permission to read the reparse - * data. - * - * @inode: WIM inode for the reparse point. - * - * @lookup_table: Stream lookup table for the WIM; an entry will be added to it - * for the reparse point unless an entry already exists for - * the exact same data stream. - * - * @path: External path to the parse point (UTF-8). Used for error messages - * only. - * - * Returns 0 on success; nonzero on failure. */ -static int win32_capture_reparse_point(HANDLE hFile, - struct wim_inode *inode, - struct wim_lookup_table *lookup_table, - const char *path) -{ - /* "Reparse point data, including the tag and optional GUID, - * cannot exceed 16 kilobytes." - MSDN */ - char reparse_point_buf[16 * 1024]; - DWORD bytesReturned; - - if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT, - NULL, 0, reparse_point_buf, - sizeof(reparse_point_buf), &bytesReturned, NULL)) - { - DWORD err = GetLastError(); - ERROR("Win32 API: Failed to get reparse data of \"%s\"", path); - win32_error(err); - return WIMLIB_ERR_READ; - } - if (bytesReturned < 8) { - ERROR("Reparse data on \"%s\" is invalid", path); - return WIMLIB_ERR_READ; - } - inode->i_reparse_tag = *(u32*)reparse_point_buf; - return inode_add_ads_with_data(inode, "", - (const u8*)reparse_point_buf + 8, - bytesReturned - 8, lookup_table); -} - -/* Calculate the SHA1 message digest of a Win32 data stream, which may be either - * an unnamed or named data stream. - * - * @path: Path to the file, with the stream noted at the end for named - * streams. UTF-16LE encoding. - * - * @hash: On success, the SHA1 message digest of the stream is written to - * this location. - * - * Returns 0 on success; nonzero on failure. - */ -static int win32_sha1sum(const wchar_t *path, u8 hash[SHA1_HASH_SIZE]) -{ - HANDLE hFile; - SHA_CTX ctx; - u8 buf[32768]; - DWORD bytesRead; - int ret; - - hFile = win32_open_file_readonly(path); - if (hFile == INVALID_HANDLE_VALUE) - return WIMLIB_ERR_OPEN; - - sha1_init(&ctx); - for (;;) { - if (!ReadFile(hFile, buf, sizeof(buf), &bytesRead, NULL)) { - ret = WIMLIB_ERR_READ; - goto out_close_handle; - } - if (bytesRead == 0) - break; - sha1_update(&ctx, buf, bytesRead); - } - ret = 0; - sha1_final(hash, &ctx); -out_close_handle: - CloseHandle(hFile); - return ret; -} - -/* Scans an unnamed or named stream of a Win32 file (not a reparse point - * stream); calculates its SHA1 message digest and either creates a `struct - * wim_lookup_table_entry' in memory for it, or uses an existing 'struct - * wim_lookup_table_entry' for an identical stream. - * - * @path_utf16: Path to the file (UTF-16LE). - * - * @path_utf16_nchars: Number of 2-byte characters in @path_utf16. - * - * @inode: WIM inode to save the stream into. - * - * @lookup_table: Stream lookup table for the WIM. - * - * @dat: A `WIN32_FIND_STREAM_DATA' structure that specifies the - * stream name. - * - * Returns 0 on success; nonzero on failure. - */ -static int win32_capture_stream(const wchar_t *path_utf16, - size_t path_utf16_nchars, - struct wim_inode *inode, - struct wim_lookup_table *lookup_table, - WIN32_FIND_STREAM_DATA *dat) -{ - struct wim_ads_entry *ads_entry; - u8 hash[SHA1_HASH_SIZE]; - struct wim_lookup_table_entry *lte; - int ret; - wchar_t *p, *colon; - bool is_named_stream; - wchar_t *spath; - size_t spath_nchars; - DWORD err; - - /* The stream name should be returned as :NAME:TYPE */ - p = dat->cStreamName; - if (*p != L':') - goto out_invalid_stream_name; - p += 1; - colon = wcschr(p, L':'); - if (colon == NULL) - goto out_invalid_stream_name; - - if (wcscmp(colon + 1, L"$DATA")) { - /* Not a DATA stream */ - ret = 0; - goto out; - } - - is_named_stream = (p != colon); - if (is_named_stream) { - /* Allocate an ADS entry for the named stream. */ - char *utf8_stream_name; - size_t utf8_stream_name_len; - ret = utf16_to_utf8((const char *)p, - (colon - p) * sizeof(wchar_t), - &utf8_stream_name, - &utf8_stream_name_len); - if (ret) - goto out; - ads_entry = inode_add_ads(inode, utf8_stream_name); - FREE(utf8_stream_name); - if (!ads_entry) { - ret = WIMLIB_ERR_NOMEM; - goto out; - } - } - - /* Create a UTF-16 string @spath that gives the filename, then a colon, - * then the stream name. Or, if it's an unnamed stream, just the - * filename. It is MALLOC()'ed so that it can be saved in the - * wim_lookup_table_entry if needed. */ - *colon = '\0'; - spath_nchars = path_utf16_nchars; - if (is_named_stream) - spath_nchars += colon - p + 1; - - spath = MALLOC((spath_nchars + 1) * sizeof(wchar_t)); - memcpy(spath, path_utf16, path_utf16_nchars * sizeof(wchar_t)); - if (is_named_stream) { - spath[path_utf16_nchars] = L':'; - memcpy(&spath[path_utf16_nchars + 1], p, (colon - p) * sizeof(wchar_t)); - } - spath[spath_nchars] = L'\0'; - - ret = win32_sha1sum(spath, hash); - if (ret) { - err = GetLastError(); - ERROR("Win32 API: Failed to read \"%ls\" to calculate SHA1sum", - path_utf16); - win32_error(err); - goto out_free_spath; - } - - lte = __lookup_resource(lookup_table, hash); - if (lte) { - /* Use existing wim_lookup_table_entry that has the same SHA1 - * message digest */ - lte->refcnt++; - } else { - /* Make a new wim_lookup_table_entry */ - lte = new_lookup_table_entry(); - if (!lte) { - ret = WIMLIB_ERR_NOMEM; - goto out_free_spath; - } - lte->file_on_disk = (char*)spath; - spath = NULL; - lte->resource_location = RESOURCE_WIN32; - lte->resource_entry.original_size = (uint64_t)dat->StreamSize.QuadPart; - lte->resource_entry.size = (uint64_t)dat->StreamSize.QuadPart; - copy_hash(lte->hash, hash); - lookup_table_insert(lookup_table, lte); - } - if (is_named_stream) - ads_entry->lte = lte; - else - inode->i_lte = lte; -out_free_spath: - FREE(spath); -out: - return ret; -out_invalid_stream_name: - ERROR("Invalid stream name: \"%ls:%ls\"", path_utf16, dat->cStreamName); - ret = WIMLIB_ERR_READ; - goto out; -} - -/* Scans a Win32 file for unnamed and named data streams (not reparse point - * streams). - * - * @path_utf16: Path to the file (UTF-16LE). - * - * @path_utf16_nchars: Number of 2-byte characters in @path_utf16. - * - * @inode: WIM inode to save the stream into. - * - * @lookup_table: Stream lookup table for the WIM. - * - * Returns 0 on success; nonzero on failure. - */ -static int win32_capture_streams(const wchar_t *path_utf16, - size_t path_utf16_nchars, - struct wim_inode *inode, - struct wim_lookup_table *lookup_table) -{ - WIN32_FIND_STREAM_DATA dat; - int ret; - HANDLE hFind; - DWORD err; - - hFind = FindFirstStreamW(path_utf16, FindStreamInfoStandard, &dat, 0); - if (hFind == INVALID_HANDLE_VALUE) { - err = GetLastError(); - - /* Seems legal for this to return ERROR_HANDLE_EOF on reparse - * points and directories */ - if ((inode->i_attributes & - (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY)) - && err == ERROR_HANDLE_EOF) - { - return 0; - } else { - ERROR("Win32 API: Failed to look up data streams of \"%ls\"", - path_utf16); - win32_error(err); - return WIMLIB_ERR_READ; - } - } - do { - ret = win32_capture_stream(path_utf16, - path_utf16_nchars, - inode, lookup_table, - &dat); - if (ret) - goto out_find_close; - } while (FindNextStreamW(hFind, &dat)); - err = GetLastError(); - if (err != ERROR_HANDLE_EOF) { - ERROR("Win32 API: Error reading data streams from \"%ls\"", path_utf16); - win32_error(err); - ret = WIMLIB_ERR_READ; - } -out_find_close: - FindClose(hFind); - return ret; -} - -#endif - +#ifndef __WIN32__ /* * build_dentry_tree(): * Recursively builds a tree of WIM dentries from an on-disk directory @@ -581,14 +133,14 @@ out_find_close: * the on-disk files during a call to wimlib_write() or * wimlib_overwrite(). */ -static int build_dentry_tree(struct wim_dentry **root_ret, - const char *root_disk_path, - struct wim_lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg) +static int unix_build_dentry_tree(struct wim_dentry **root_ret, + const char *root_disk_path, + struct wim_lookup_table *lookup_table, + struct wim_security_data *sd, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg) { struct wim_dentry *root = NULL; int ret = 0; @@ -620,7 +172,6 @@ static int build_dentry_tree(struct wim_dentry **root_ret, progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } -#if !defined(__CYGWIN__) && !defined(__WIN32__) /* UNIX version of capturing a directory tree */ struct stat root_stbuf; int (*stat_fn)(const char *restrict, struct stat *restrict); @@ -789,9 +340,11 @@ static int build_dentry_tree(struct wim_dentry **root_ret, || (result->d_name[1] == '.' && result->d_name[2] == '\0'))) continue; strcpy(name + len + 1, result->d_name); - ret = build_dentry_tree(&child, name, lookup_table, - NULL, config, add_image_flags, - progress_func, NULL); + ret = unix_build_dentry_tree(&child, name, + lookup_table, + NULL, config, + add_image_flags, + progress_func, NULL); if (ret != 0) break; if (child) @@ -841,126 +394,6 @@ static int build_dentry_tree(struct wim_dentry **root_ret, ret = WIMLIB_ERR_READLINK; } } -#else - /* Win32 version of capturing a directory tree */ - - wchar_t *path_utf16; - size_t path_utf16_nchars; - struct sd_set *sd_set; - DWORD err; - - if (extra_arg == NULL) { - sd_set = alloca(sizeof(struct sd_set)); - sd_set->rb_root.rb_node = NULL, - sd_set->sd = sd; - } else { - sd_set = extra_arg; - } - - ret = utf8_to_utf16(root_disk_path, strlen(root_disk_path), - (char**)&path_utf16, &path_utf16_nchars); - if (ret) - goto out_destroy_sd_set; - path_utf16_nchars /= sizeof(wchar_t); - - HANDLE hFile = win32_open_file_readonly(path_utf16); - if (hFile == INVALID_HANDLE_VALUE) { - err = GetLastError(); - ERROR("Win32 API: Failed to open \"%s\"", root_disk_path); - win32_error(err); - ret = WIMLIB_ERR_OPEN; - goto out_free_path_utf16; - } - - BY_HANDLE_FILE_INFORMATION file_info; - if (!GetFileInformationByHandle(hFile, &file_info)) { - err = GetLastError(); - ERROR("Win32 API: Failed to get file information for \"%s\"", - root_disk_path); - win32_error(err); - ret = WIMLIB_ERR_STAT; - goto out_close_handle; - } - - /* Create a WIM dentry */ - root = new_dentry_with_timeless_inode(path_basename(root_disk_path)); - if (!root) { - if (errno == EILSEQ) - ret = WIMLIB_ERR_INVALID_UTF8_STRING; - else if (errno == ENOMEM) - ret = WIMLIB_ERR_NOMEM; - else - ret = WIMLIB_ERR_ICONV_NOT_AVAILABLE; - goto out_close_handle; - } - - /* Start preparing the associated WIM inode */ - inode = root->d_inode; - - inode->i_attributes = file_info.dwFileAttributes; - inode->i_creation_time = FILETIME_to_u64(&file_info.ftCreationTime); - inode->i_last_write_time = FILETIME_to_u64(&file_info.ftLastWriteTime); - inode->i_last_access_time = FILETIME_to_u64(&file_info.ftLastAccessTime); - inode->i_ino = ((u64)file_info.nFileIndexHigh << 32) | - (u64)file_info.nFileIndexLow; - - inode->i_resolved = 1; - add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE); - - /* Get DOS name and security descriptor (if any). */ - ret = win32_get_short_name(root, path_utf16); - if (ret) - goto out_close_handle; - ret = win32_get_security_descriptor(root, sd_set, path_utf16); - if (ret) - goto out_close_handle; - - if (inode_is_directory(inode)) { - /* Directory (not a reparse point) --- recurse to children */ - - /* But first... directories may have alternate data streams that - * need to be captured. */ - ret = win32_capture_streams(path_utf16, - path_utf16_nchars, - inode, - lookup_table); - if (ret) - goto out_close_handle; - ret = win32_recurse_directory(root, - root_disk_path, - lookup_table, - sd, - config, - add_image_flags, - progress_func, - sd_set, - path_utf16, - path_utf16_nchars); - } else if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) { - /* Reparse point: save the reparse tag and data */ - ret = win32_capture_reparse_point(hFile, - inode, - lookup_table, - root_disk_path); - } else { - /* Not a directory, not a reparse point; capture the default - * file contents and any alternate data streams. */ - ret = win32_capture_streams(path_utf16, - path_utf16_nchars, - inode, - lookup_table); - } -out_close_handle: - CloseHandle(hFile); -out_free_path_utf16: - FREE(path_utf16); -out_destroy_sd_set: - if (extra_arg == NULL) - destroy_sd_set(sd_set); -#endif - /* The below lines of code are common to both UNIX and Win32 builds. It - * simply returns the captured directory tree if the capture was - * successful, or frees it if the capture was unsuccessful. */ out: if (ret == 0) *root_ret = root; @@ -968,6 +401,7 @@ out: free_dentry_tree(root, lookup_table); return ret; } +#endif /* !__WIN32__ */ enum pattern_type { NONE = 0, @@ -1146,19 +580,6 @@ static int capture_config_set_prefix(struct capture_config *config, return 0; } -static bool path_matches_pattern(const char *path, const char *pattern) -{ -#ifdef __WIN32__ - return PathMatchSpecA(path, pattern); -#else - return fnmatch(pattern, path, FNM_PATHNAME - #ifdef FNM_CASEFOLD - | FNM_CASEFOLD - #endif - ) == 0; -#endif -} - static bool match_pattern(const char *path, const char *path_basename, const struct pattern_list *list) { @@ -1177,7 +598,12 @@ static bool match_pattern(const char *path, const char *path_basename, string = path_basename; } - if (path_matches_pattern(string, pat)) { + if (fnmatch(pat, string, FNM_PATHNAME + #ifdef FNM_CASEFOLD + | FNM_CASEFOLD + #endif + ) == 0) + { DEBUG("`%s' matches the pattern \"%s\"", string, pat); return true; @@ -1232,7 +658,7 @@ static const char *canonicalize_target_path(char *target_path) return target_path; } -#if defined(__CYGWIN__) || defined(__WIN32__) +#ifdef __WIN32__ static void zap_backslashes(char *s) { while (*s) { @@ -1251,7 +677,7 @@ static void canonicalize_targets(struct wimlib_capture_source *sources, DEBUG("Canonicalizing { source: \"%s\", target=\"%s\"}", sources->fs_source_path, sources->wim_target_path); -#if defined(__CYGWIN__) || defined(__WIN32__) +#ifdef __WIN32__ /* The Windows API can handle forward slashes. Just get rid of * backslashes to avoid confusing other parts of the library * code. */ @@ -1504,11 +930,15 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, return WIMLIB_ERR_UNSUPPORTED; #endif } else { - capture_tree = build_dentry_tree; + #ifdef __WIN32__ + capture_tree = win32_build_dentry_tree; + #else + capture_tree = unix_build_dentry_tree; + #endif extra_arg = NULL; } -#if defined(__CYGWIN__) || defined(__WIN32__) +#ifdef __WIN32__ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) { ERROR("Capturing UNIX-specific data is not supported on Windows"); return WIMLIB_ERR_INVALID_PARAM; @@ -1572,11 +1002,10 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, } else { size_t i; -#if defined(__CYGWIN__) || defined(__WIN32__) - win32_acquire_privilege(SE_BACKUP_NAME); - win32_acquire_privilege(SE_SECURITY_NAME); - win32_acquire_privilege(SE_TAKE_OWNERSHIP_NAME); -#endif + #ifdef __WIN32__ + win32_acquire_capture_privileges(); + #endif + root_dentry = NULL; i = 0; do { @@ -1670,10 +1099,8 @@ out_free_security_data: out_destroy_capture_config: destroy_capture_config(&config); out: -#if defined(__CYGWIN__) || defined(__WIN32__) - win32_release_privilege(SE_BACKUP_NAME); - win32_release_privilege(SE_SECURITY_NAME); - win32_release_privilege(SE_TAKE_OWNERSHIP_NAME); +#ifdef __WIN32__ + win32_release_capture_privileges(); #endif return ret; }