search for: windows_path

Call windows_path with the actual path to resolve, instead of a null pointer ('filename' is still null at that point), so Windows paths can be properly resolved. --- cat/tail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cat/tail.c b/cat/tail.c index 8785d45..51da5fc 100644 --- a/cat...

Hi, this patch series fixes some issues discovered by Coverity. Most of them are memory leaks, usually on error; there are also invalid memory access issues. Thanks, Pino Toscano (11): java: link libguestfs_jni against libutils java: fix invalid memory access for FBuffer in struct lists daemon: tsk: properly use GUESTFS_MAX_CHUNK_SIZE edit: fix small memory leak on error java: fix

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:

...ot; #include "visit.h" +#include "windows.h" /* Currently open libguestfs handle. */ guestfs_h *g; @@ -76,6 +77,8 @@ static void output_int64_uid (int64_t); static void output_string (const char *); static void output_string_link (const char *); +static char *from_maybe_windows_path (const char *); + static void __attribute__((noreturn)) usage (int status) { @@ -374,7 +377,7 @@ main (int argc, char *argv[]) unsigned errors = 0; while (optind < argc) { - const char *dir = argv[optind]; + const char *dir = from_maybe_windows_path(argv[optind]); switch...

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

Proposed patches to fix https://bugzilla.redhat.com/show_bug.cgi?id=858126

...71,10 +375,18 @@ main (int argc, char *argv[]) free_drives (drvs); free_mps (mps); + win_root = get_windows_root (); + unsigned errors = 0; while (optind < argc) { - const char *dir = argv[optind]; + CLEANUP_FREE const char *dir; + + if (win_root != NULL) { + dir = windows_path (g, win_root, argv[optind], 1 /* readonly */ ); + } else { + dir = safe_strdup (g, argv[optind]); + } switch (mode) { case 0: /* no -l or -R option */ @@ -409,6 +421,24 @@ main (int argc, char *argv[]) exit (errors == 0 ? EXIT_SUCCESS : EXIT_FAILURE);...

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

...free_drives (drvs); > free_mps (mps); > > + > unsigned errors = 0; > > while (optind < argc) { > - const char *dir = argv[optind]; > + CLEANUP_FREE const char *dir; > + > + if (inspector == 1 && win_root != NULL) { > + dir = windows_path (g, win_root, argv[optind], 1 /* readonly */ ); > + } else { > + dir = safe_strdup (g, argv[optind]); > + } > > switch (mode) { > case 0: /* no -l or -R option */ > @@ -409,6 +422,24 @@ main (int argc, char *argv[]) > exit (error...

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 +++++++++++++++++++++++++++++++++++++----

...data structures, no longer needed after this point. */ free_drives (drvs); free_mps (mps); + unsigned errors = 0; while (optind < argc) { - const char *dir = argv[optind]; + CLEANUP_FREE const char *dir; + + if (inspector == 1 && win_root != NULL) { + dir = windows_path (g, win_root, argv[optind], 1 /* readonly */ ); + } else { + dir = safe_strdup (g, argv[optind]); + } switch (mode) { case 0: /* no -l or -R option */ @@ -409,6 +422,24 @@ main (int argc, char *argv[]) exit (errors == 0 ? EXIT_SUCCESS : EXIT_FAILURE);...

I thought that this was only for older versions (I'm using 1.1.14 - sorry for not mentioning). I get the same window and the same ouput when started from that dir or with 'wine start 'windows_path'.[/code]

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.

...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 context of the new * file to match the old file (RHBZ#788641)....

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

...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/virt-edit.pod @@ -164,6 +164,42 @@ security problem with malicious guests (CVE-2010-3851). Read key or passphrase...

...dex 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 help\n" " --keys-from-stdin Read pas...

...is required. */ + windows = is_windows (g, root); + } + + /* Check files here. */ + processed = 0; + for (i = 0; i < argc; ++i) { + CLEANUP_FREE char *filename = NULL; + CLEANUP_FREE_STATNS struct guestfs_statns *stat = NULL; + + if (windows) { + filename = windows_path (g, root, filename, 1 /* readonly */); + if (filename == NULL) + return -1; /* windows_path printed an error */ + } + else { + filename = strdup (argv[i]); + if (filename == NULL) { + perror ("malloc"); + return -1; + } +...

Since v2: - Fix the things that Pino mentioned, except the recursion. - Implement Windows support. For Windows support to be sane, I had to inline the add_and_mount code. Rich.

Hi, attached there is a prototype of patch for adding a new copy-attributes command. Such command would allow copy the attributes of a "file" to another, so for example in guestfish: copy-attributes foo bar permissions:true xattributes:false would only copy the permissions of foo to bar, not copying its extended attributes too. Just few notes: - my first daemon command, so