search for: is_window

The patches following do indeed allow you to compile nbdkit.exe, but it does not actually work yet. I'm posting this experimental series more as a work in progress and to get feedback. Note this does not require Windows itself to build or test. You can cross-compile it using mingw64-* packages on Fedora or Debian, and test it [spoiler alert: it fails] using Wine. Rich.

...written by me > > strndup general purpose written by me > > This should do nothing on existing supported platforms. It is only > intended in preparation for porting nbdkit to Windows. > --- > @@ -464,6 +475,15 @@ AS_CASE([$host_os], > AC_MSG_RESULT([$is_windows]) > AC_SUBST([NO_UNDEFINED_ON_WINDOWS]) > AC_SUBST([LINK_LIBNBDKIT_ON_WINDOWS]) > +AM_CONDITIONAL([IS_WINDOWS],[test "x$is_windows" = "xyes"]) > + > +dnl For Windows, look for the mc/windmc utility. > +dnl XXX Do we need to check for mc.exe as well? > +...

...igure.ac b/configure.ac index 0a0ac60a..92e0d4e3 100644 --- a/configure.ac +++ b/configure.ac @@ -412,15 +412,6 @@ AS_CASE([$host_os], AC_MSG_RESULT([$SHARED_LDFLAGS]) AC_SUBST([SHARED_LDFLAGS]) -AC_MSG_CHECKING([if we are on a windows platform]) -AS_CASE([$host_os], - [mingw*|msys*|cygwin*], [is_windows=yes], - [is_windows=no] -) -AC_MSG_RESULT([$is_windows]) -AM_CONDITIONAL([WINDOWS], - [test "x$is_windows" = "xyes"]) - AC_SEARCH_LIBS([getaddrinfo], [network socket]) dnl Check for SELinux socket labelling (optional). diff --git a/tests/Makefile.am b/tests/M...

...re.ac @@ -489,12 +489,18 @@ AS_CASE([$host_os], LIBS="$LIBS -lmsvcrt -lkernel32 -luser32" NO_UNDEFINED_ON_WINDOWS="-no-undefined" IMPORT_LIBRARY_ON_WINDOWS='-Wl,-L$(top_builddir)/server -Wl,-lnbdkit' + SOEXT="dll" ], - [is_windows=no] + [is_windows=no], [ + SOEXT="so" + ] ) AC_MSG_RESULT([$is_windows]) AC_SUBST([NO_UNDEFINED_ON_WINDOWS]) AC_SUBST([IMPORT_LIBRARY_ON_WINDOWS]) +AC_SUBST([SOEXT]) +AC_DEFINE_UNQUOTED([SOEXT],["$SOEXT"],[Extension used for shared objects/DLLs.]) +AC_DEFINE_UN...

Also available here: https://github.com/rwmjones/nbdkit/tree/2020-windows-mingw-nolib After a lot of work I have made the port to Windows work without using a separate library. Instead, on Windows only, we build an "import library" (library of stubs) which resolves references to nbdkit_* functions in the main program and fixes up the plugin, basically the first technique outlined in

...ts = NULL; > + const char *root; > + > + roots = guestfs_inspect_get_roots (g); > + assert (roots); > + assert (roots[0] != NULL); > + assert (roots[1] == NULL); > + root = safe_strdup(g, roots[0]); safe_strdup could be delayed until the actual return later, otherwise if is_windows returns false that string is leaked. > + > + if (is_windows (g, root)) > + return root; > + else > + return NULL; > +} > + I'd inline the whole get_windows_root just before the "while (optind < argc)", like done in cat/cat.c:do_cat. Another option c...

Hi, this series does a couple of code reorganizations/refactoring in code used by tools: the windows path handling code, and the two types of file editing (using editor, and using perl expression). There's still a code duplication between the two variants of file editing, but it is just within a single source, and can be easily solved now (planning as next step). Pino Toscano (13): edit:

This is an incomplete port to Windows. Currently the server compiles and starts up successfully, but goes into an infinite loop when you connect to it. Nevertheless I think the approach is ready for feedback. This being Windows the changes go quite deep. Rich.

...+static char * +from_maybe_windows_path (const char *dir) +{ + CLEANUP_FREE_STRING_LIST char **roots = NULL; + char *path = NULL; + char *root; + + roots = guestfs_inspect_get_roots (g); + assert (roots); + assert (roots[0] != NULL); + assert (roots[1] == NULL); + root = roots[0]; + + if (is_windows (g, root)) { + path = windows_path (g, root, dir, 1 /* readonly */ ); + if (path == NULL) { + guestfs_close (g); + exit (EXIT_FAILURE); + } + return path; + } + + return safe_strdup (g, dir); +} + static int do_ls (const char *dir) { -- 1.9.3

It is modelled after virt-cat. Fixes RHBZ#845234 Maros Zatko (1): virt-ls: support drive letters on Windows cat/ls.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) -- 1.9.3

Fixes RHBZ#845234. v3 changes: Drive letters works if inspection is enabled (-m is not given) v2 changes: Ammended so it doesn't do inspection for every dir to list. Maros Zatko (3): virt-ls: support drive letters on Windows virt-ls: update usage for win drive letters docs: amend virt-ls manpage with win drive letters cat/ls.c | 41 +++++++++++++++++++++++++++++++++++++----

...ILURE); } +static const char * +get_windows_root (void) +{ + CLEANUP_FREE_STRING_LIST char **roots = NULL; + const char *root; + + roots = guestfs_inspect_get_roots (g); + assert (roots); + assert (roots[0] != NULL); + assert (roots[1] == NULL); + root = safe_strdup(g, roots[0]); + + if (is_windows (g, root)) + return root; + else + return NULL; +} + static int do_ls (const char *dir) { -- 1.9.3

It is modelled after virt-cat. Fixes RHBZ#845234 Ammended so it doesn't do inspection for every dir to list. Maros Zatko (1): virt-ls: support drive letters on Windows cat/ls.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) -- 1.9.3

The first patch preserves file mode, UID, GID and SELinux context across edited files. The second patch adds a useful new command in guestfish ('llz') which shows SELinux context (like 'ls -laZ') that was useful when debugging this. Rich.

...atic void edit_files (int argc, char *argv[]); static void edit (const char *filename, const char *root); static char *edit_interactively (const char *tmpfile); static char *edit_non_interactively (const char *tmpfile); -static int copy_attributes (const char *src, const char *dest); static int is_windows (guestfs_h *g, const char *root); static char *windows_path (guestfs_h *g, const char *root, const char *filename); static char *generate_random_name (const char *filename); @@ -361,7 +360,8 @@ edit (const char *filename, const char *root) /* Set the permissions, UID, GID and SELinux contex...

On Mon, Jun 23, 2014 at 12:30:07PM +0100, Richard W.M. Jones wrote: > > Same comment about do_edit_simple as I previously posted about > do_cat_simple. I mean edit_files_simple ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows

...it (argv[i], NULL); +} + +static void edit (const char *filename, const char *root) { CLEANUP_FREE char *filename_to_free = NULL; @@ -318,7 +346,7 @@ edit (const char *filename, const char *root) CLEANUP_FREE char *backupname = NULL; /* Windows? Special handling is required. */ - if (is_windows (g, root)) + if (root != NULL && is_windows (g, root)) filename = filename_to_free = windows_path (g, root, filename); /* Download the file to a temporary. */ diff --git a/edit/virt-edit.pod b/edit/virt-edit.pod index 4c5ae71..ff72d71 100644 --- a/edit/virt-edit.pod +++ b/edit/v...

...unknown-windows-msvc" %"[]u8" = type { i8*, i64 } %Foo96Bits = type <{ i24, i24, i24, i24 }> @link_libc = internal unnamed_addr constant i1 false, align 1 @want_start_symbol = internal unnamed_addr constant i1 true, align 1 @os = internal unnamed_addr constant i6 15, align 1 @is_windows = internal unnamed_addr constant i1 true, align 1 @user_main_fn = internal unnamed_addr global i16 ()* null, align 8 @0 = internal unnamed_addr constant i8* getelementptr inbounds ([24 x i8], [24 x i8]* @1, i64 0, i64 0), align 8 @1 = internal unnamed_addr constant [24 x i8] c"reached unreach...

...s(+), 7 deletions(-) diff --git a/cat/cat.c b/cat/cat.c index e86ecf3..72bf81b 100644 --- a/cat/cat.c +++ b/cat/cat.c @@ -46,6 +46,7 @@ const char *libvirt_uri = NULL; int inspector = 1; static int do_cat (int argc, char *argv[]); +static int do_cat_simple (int argc, char *argv[]); static int is_windows (guestfs_h *g, const char *root); static char *windows_path (guestfs_h *g, const char *root, const char *filename); @@ -70,6 +71,8 @@ usage (int status) " --format[=raw|..] Force disk format for -a option\n" " --help Display brief he...

On Monday 23 June 2014 12:29:07 Richard W.M. Jones wrote: > On Mon, Jun 23, 2014 at 01:00:11PM +0200, Pino Toscano wrote: > > static int > > > > +do_cat_simple (int argc, char *argv[]) > > +{ > > + unsigned errors = 0; > > + int i; > > + > > + for (i = 0; i < argc; ++i) { > > + if (guestfs_download (g, argv[i],