aboutsummaryrefslogtreecommitdiff
path: root/lib/io
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-12 19:40:41 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-15 13:38:25 +0200
commit2694532a5479d157903b6c600d9b1d5c145a4e4c (patch)
tree2a9088f44f51994170032c0ae76aca21e9f1c4aa /lib/io
parent1f506a17903f5eeaded9065e42726c1a09dc6f89 (diff)
libio: replace OSTREAM_OPEN_* flags with SQFS_FILE_OPEN_* flags
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/io')
-rw-r--r--lib/io/src/unix/ostream.c7
-rw-r--r--lib/io/src/win32/istream.c3
-rw-r--r--lib/io/src/win32/ostream.c25
3 files changed, 22 insertions, 13 deletions
diff --git a/lib/io/src/unix/ostream.c b/lib/io/src/unix/ostream.c
index bc69f32..7093cc2 100644
--- a/lib/io/src/unix/ostream.c
+++ b/lib/io/src/unix/ostream.c
@@ -5,6 +5,7 @@
* Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
*/
#include "../internal.h"
+#include "sqfs/io.h"
typedef struct {
ostream_t base;
@@ -49,7 +50,7 @@ static int realize_sparse(file_ostream_t *file)
if (file->sparse_count == 0)
return 0;
- if (file->flags & OSTREAM_OPEN_NO_SPARSE) {
+ if (file->flags & SQFS_FILE_OPEN_NO_SPARSE) {
bufsz = file->sparse_count > 1024 ? 1024 : file->sparse_count;
buffer = calloc(1, bufsz);
if (buffer == NULL)
@@ -179,7 +180,7 @@ ostream_t *ostream_open_file(const char *path, int flags)
ostream_t *out;
int fd;
- if (flags & OSTREAM_OPEN_OVERWRITE) {
+ if (flags & SQFS_FILE_OPEN_OVERWRITE) {
fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
} else {
fd = open(path, O_WRONLY | O_CREAT | O_EXCL, 0644);
@@ -195,5 +196,5 @@ ostream_t *ostream_open_file(const char *path, int flags)
ostream_t *ostream_open_stdout(void)
{
return ostream_open_handle("stdout", STDOUT_FILENO,
- OSTREAM_OPEN_NO_SPARSE);
+ SQFS_FILE_OPEN_NO_SPARSE);
}
diff --git a/lib/io/src/win32/istream.c b/lib/io/src/win32/istream.c
index 46bed30..d140142 100644
--- a/lib/io/src/win32/istream.c
+++ b/lib/io/src/win32/istream.c
@@ -153,10 +153,11 @@ fail_free:
istream_t *istream_open_file(const char *path)
{
- WCHAR *wpath = path_to_windows(path);
+ WCHAR *wpath = NULL;
istream_t *out;
HANDLE hnd;
+ wpath = path_to_windows(path);
if (wpath == NULL)
return NULL;
diff --git a/lib/io/src/win32/ostream.c b/lib/io/src/win32/ostream.c
index edbefc7..26d6f96 100644
--- a/lib/io/src/win32/ostream.c
+++ b/lib/io/src/win32/ostream.c
@@ -5,6 +5,7 @@
* Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
*/
#include "../internal.h"
+#include "sqfs/io.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -43,7 +44,7 @@ static int realize_sparse(file_ostream_t *file)
if (file->sparse_count == 0)
return 0;
- if (file->flags & OSTREAM_OPEN_NO_SPARSE) {
+ if (file->flags & SQFS_FILE_OPEN_NO_SPARSE) {
bufsz = file->sparse_count > 1024 ? 1024 : file->sparse_count;
buffer = calloc(1, bufsz);
@@ -175,24 +176,30 @@ fail_free:
ostream_t *ostream_open_file(const char *path, int flags)
{
- WCHAR *wpath = path_to_windows(path);
int access_flags, creation_mode;
+ WCHAR *wpath = NULL;
ostream_t *out;
HANDLE hnd;
- if (wpath == NULL)
- return NULL;
-
access_flags = GENERIC_WRITE;
- if (flags & OSTREAM_OPEN_OVERWRITE) {
+ if (flags & SQFS_FILE_OPEN_OVERWRITE) {
creation_mode = CREATE_ALWAYS;
} else {
creation_mode = CREATE_NEW;
}
- hnd = CreateFileW(wpath, access_flags, 0, NULL, creation_mode,
- FILE_ATTRIBUTE_NORMAL, NULL);
+ if (flags & SQFS_FILE_OPEN_NO_CHARSET_XFRM) {
+ hnd = CreateFileA(path, access_flags, 0, NULL, creation_mode,
+ FILE_ATTRIBUTE_NORMAL, NULL);
+ } else {
+ wpath = path_to_windows(path);
+ if (wpath == NULL)
+ return NULL;
+
+ hnd = CreateFileW(wpath, access_flags, 0, NULL, creation_mode,
+ FILE_ATTRIBUTE_NORMAL, NULL);
+ }
if (hnd == INVALID_HANDLE_VALUE) {
w32_perror(path);
@@ -213,5 +220,5 @@ ostream_t *ostream_open_stdout(void)
{
HANDLE hnd = GetStdHandle(STD_OUTPUT_HANDLE);
- return ostream_open_handle("stdout", hnd, OSTREAM_OPEN_NO_SPARSE);
+ return ostream_open_handle("stdout", hnd, SQFS_FILE_OPEN_NO_SPARSE);
}