search for: output_int64_uid

Hi, we needed these changes when we had to build a guest image compatible with a starting guest image but not backed by it in any way? We needed some tool to check our progress, comparing original and? rebuilt (from scratch) images, and virt-diff seemed the best option, but? we had to soften the comparison to reduce the noise in the output. I added some options to ignore certain informations when

...nt64_perms (file->stat->st_mode & 07777); + output_int64_perms (file->stat_orig->st_mode & 07777); - output_int64_size (file->stat->st_size); + output_int64_size (file->stat_orig->st_size); /* Display extra fields when enabled. */ if (enable_uids) { - output_int64_uid (file->stat->st_uid); - output_int64_uid (file->stat->st_gid); + output_int64_uid (file->stat_orig->st_uid); + output_int64_uid (file->stat_orig->st_gid); } if (enable_times) { if (atime) - output_int64_time (file->stat->st_atime_sec, file-&g...

...nt64_perms (file->stat->st_mode & 07777); + output_int64_perms (file->stat_orig->st_mode & 07777); - output_int64_size (file->stat->st_size); + output_int64_size (file->stat_orig->st_size); /* Display extra fields when enabled. */ if (enable_uids) { - output_int64_uid (file->stat->st_uid); - output_int64_uid (file->stat->st_gid); + output_int64_uid (file->stat_orig->st_uid); + output_int64_uid (file->stat_orig->st_gid); } if (enable_times) { if (atime) - output_int64_time (file->stat->st_atime_sec, file-&g...

--- diff/diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff/diff.c b/diff/diff.c index f4b25e9..ad371b0 100644 --- a/diff/diff.c +++ b/diff/diff.c @@ -1108,7 +1108,7 @@ output_int64_uid (int64_t i) { next_field (); /* csv doesn't need escaping */ - if (printf ("%4" PRIi64, i) < 0) { + if (printf (csv ? "%" PRIi64 : "%4" PRIi64, i) < 0) { perror ("printf"); exit (EXIT_FAILURE); } -- 1.9.3

...(-) diff --git a/cat/ls.c b/cat/ls.c index 9161fb6..151c11d 100644 --- a/cat/ls.c +++ b/cat/ls.c @@ -37,6 +37,7 @@ #include "options.h" #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;...

...mp; 07777); > + output_int64_perms (file->stat_orig->st_mode & 07777); > > - output_int64_size (file->stat->st_size); > + output_int64_size (file->stat_orig->st_size); > > /* Display extra fields when enabled. */ > if (enable_uids) { > - output_int64_uid (file->stat->st_uid); > - output_int64_uid (file->stat->st_gid); > + output_int64_uid (file->stat_orig->st_uid); > + output_int64_uid (file->stat_orig->st_gid); > } > > if (enable_times) { > if (atime) > - output_int64_time...

....c @@ -71,7 +71,7 @@ static void output_int64 (int64_t); static void output_int64_dev (int64_t); static void output_int64_perms (int64_t); static void output_int64_size (int64_t); -static void output_int64_time (int64_t); +static void output_int64_time (int64_t secs, int64_t nsecs); static void output_int64_uid (int64_t); static void output_string (const char *); static void output_string_link (const char *); @@ -449,7 +449,7 @@ do_ls_R (const char *dir) return 0; } -static int show_file (const char *dir, const char *name, const struct guestfs_stat *stat, const struct guestfs_xattr_list *xattrs, v...

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

...(-) diff --git a/cat/ls.c b/cat/ls.c index 9161fb6..b7a99b2 100644 --- a/cat/ls.c +++ b/cat/ls.c @@ -37,6 +37,7 @@ #include "options.h" #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 const char *get_windows_root (); + static void __attribute__((noreturn)) usage (int status) { @@ -176,6 +179,7 @@ main (int argc, char *argv[]) #define MODE_LS_R 2 #define MODE_LS_L...

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

...164b3 100644 > --- a/cat/ls.c > +++ b/cat/ls.c > @@ -37,6 +37,7 @@ > > #include "options.h" > #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 const char *get_windows_root (); > + > static void __attribute__((noreturn)) > usage (int status) > { > @@ -176,6 +179,7 @@ main (int argc, char *arg...

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

...(-) diff --git a/cat/ls.c b/cat/ls.c index 9161fb6..1a164b3 100644 --- a/cat/ls.c +++ b/cat/ls.c @@ -37,6 +37,7 @@ #include "options.h" #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 const char *get_windows_root (); + static void __attribute__((noreturn)) usage (int status) { @@ -176,6 +179,7 @@ main (int argc, char *argv[]) #define MODE_LS_R 2 #define MODE_LS_L...

...+ error (EXIT_FAILURE, errno, "strftime"); r = printf ("%s", buf); } - if (r < 0) { - perror ("printf"); - exit (EXIT_FAILURE); - } + if (r < 0) + error (EXIT_FAILURE, errno, "printf"); } static void @@ -759,10 +726,8 @@ output_int64_uid (int64_t i) { next_field (); /* csv doesn't need escaping */ - if (printf ("%4" PRIi64, i) < 0) { - perror ("printf"); - exit (EXIT_FAILURE); - } + if (printf ("%4" PRIi64, i) < 0) + error (EXIT_FAILURE, errno, "printf"); } st...