diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-15 18:13:26 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-15 18:13:26 +0200 |
| commit | 8bff2715bfdfd2e6ce0c707f1310b169d4e454d0 (patch) | |
| tree | 50c4dfdb2e4daa5b8c94697261ff8081389b449c /bin | |
| parent | c9f37f069c6e294e58c64c9f5ad94f0bd3e2fd02 (diff) | |
libcompat: Add a helper to get/set OS error state
On Unix like OSes, this saves/restores errno, on Windows both errno
and GetLastError state are saved/restored.
This should make it simpler to preserve that across function calls.
Additionally, while tracking down uses of GetLastError, some places
where the error code was printed out directly where replaced with
instances of w32_perror.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/rdsquashfs/src/restore_fstree.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/rdsquashfs/src/restore_fstree.c b/bin/rdsquashfs/src/restore_fstree.c index ea9d4f1..d80d24b 100644 --- a/bin/rdsquashfs/src/restore_fstree.c +++ b/bin/rdsquashfs/src/restore_fstree.c @@ -20,7 +20,10 @@ static int create_node(const sqfs_tree_node_t *n, const char *name, int flags) switch (n->inode->base.mode & S_IFMT) { case S_IFDIR: if (!CreateDirectoryW(wpath, NULL)) { - if (GetLastError() != ERROR_ALREADY_EXISTS) + os_error_t err = get_os_error_state(); + set_os_error_state(err); + + if (err.w32_errno != ERROR_ALREADY_EXISTS) goto fail; } break; @@ -41,12 +44,12 @@ static int create_node(const sqfs_tree_node_t *n, const char *name, int flags) free(wpath); return 0; fail: { - DWORD err = GetLastError(); + os_error_t err = get_os_error_state(); free(wpath); - SetLastError(err); + set_os_error_state(err); w32_perror(name); - if (err == ERROR_FILE_EXISTS) { + if (err.w32_errno == ERROR_FILE_EXISTS) { fputs("\nHINT: this could be caused by case " "sensitivity on Windows.\n", stderr); } |