search for: size_r

...c12d81e735f0c0. --- lib/inspect-icon.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c index 5c7da0476..725af574b 100644 --- a/lib/inspect-icon.c +++ b/lib/inspect-icon.c @@ -67,6 +67,7 @@ static char *icon_cirros (guestfs_h *g, size_t *size_r); static char *icon_voidlinux (guestfs_h *g, size_t *size_r); static char *icon_altlinux (guestfs_h *g, size_t *size_r); static char *icon_gentoo (guestfs_h *g, size_t *size_r); +static char *icon_openmandriva (guestfs_h *g, size_t *size_r); #if CAN_DO_WINDOWS static char *icon_windows (guestf...

...best hit so far... --- lib/inspect-icon.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c index 623591aa6..e785a2172 100644 --- a/lib/inspect-icon.c +++ b/lib/inspect-icon.c @@ -66,6 +66,7 @@ static char *icon_cirros (guestfs_h *g, size_t *size_r); #endif static char *icon_voidlinux (guestfs_h *g, size_t *size_r); static char *icon_altlinux (guestfs_h *g, size_t *size_r); +static char *icon_gentoo (guestfs_h *g, size_t *size_r); #if CAN_DO_WINDOWS static char *icon_windows (guestfs_h *g, const char *root, size_t *size_r); #endif @@ -1...

See individual patches. Pino Toscano (3): inspect: bump size limit for Mageia guests inspect: factor out find_png helper function inspect: revamp icon extraction for *SUSE guests lib/inspect-icon.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) -- 2.20.1

...const char *name)); static char *_listxattrs (const char *path, ssize_t (*listxattr) (const char *path, char *list, size_t size), ssize_t *size); +static char *_getxattr (const char *name, const char *path, ssize_t (*getxattr) (const char *path, const char *name, void *value, size_t size), size_t *size_r); guestfs_int_xattr_list * do_getxattrs (const char *path) @@ -448,6 +449,15 @@ do_internal_lxattrlist (const char *path, char *const *names) char * do_getxattr (const char *path, const char *name, size_t *size_r) { + return _getxattr (name, path, getxattr, size_r); +} + +static char * +_ge...

From: Michael Scherer <misc at zarb.org> Without this, configure will always enable erlang, no matter what argument are passed. Now, we can disable it, even if configure still need the erlang compiler for some obscure reason. --- configure.ac | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 337a3ed..e0bed2f 100644 ---

Hi, the libguestfs library uses a number of external tools; for some of them, we search for them at build time, enabling some feature only if found, and later on assuming at runtime they are installed. However, the situation is more complex than that: - hardcoding the full path means that there is an incoherency in the way some of the tools are used, as some other tools (e.g. qemu-img) are

...src/inspect-icon.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/inspect-icon.c b/src/inspect-icon.c index fb998c2..c83ba13 100644 --- a/src/inspect-icon.c +++ b/src/inspect-icon.c @@ -318,24 +318,21 @@ icon_fedora (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) * * Conveniently the RHEL clones also have the same file with the * same name, but containing their own logos. Sense prevails! + * + * Use a generic 100K limit for all the images, as logos in the + * RHEL clones have different sizes. */ static char * icon_rhel (guestfs_h *g, struct insp...

...++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/inspect-icon.c b/src/inspect-icon.c index c298dd7..3893fba 100644 --- a/src/inspect-icon.c +++ b/src/inspect-icon.c @@ -141,7 +141,8 @@ guestfs_impl_inspect_get_icon (guestfs_h *g, const char *root, size_t *size_r, break; case OS_DISTRO_UBUNTU: - r = icon_ubuntu (g, fs, &size); + if (!highquality) + r = icon_ubuntu (g, fs, &size); break; case OS_DISTRO_MAGEIA: @@ -349,12 +350,29 @@ icon_debian (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) return...

Hi, the libguestfs library uses a number of external tools; for some of them, we search for them at build time, enabling some feature only if found, and later on assuming at runtime they are installed. However, the situation is more complex than that: - hardcoding the full path means that there is an incoherency in the way some of the tools are used, as some other tools (e.g. qemu-img) are

...Chen. --- lib/inspect-icon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c index 84d4e4a..695f038 100644 --- a/lib/inspect-icon.c +++ b/lib/inspect-icon.c @@ -455,7 +455,7 @@ icon_voidlinux (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) return get_png (g, fs, VOIDLINUX_ICON, size_r, 20480); } -#define ALTLINUX_ICON "/usr/share/doc/alt-docs/altlogo.png" +#define ALTLINUX_ICON "/usr/share/icons/hicolor/64x64/apps/altlinux.png" static char * icon_altlinux (guestfs_h *g, struct inspect_fs *fs, size_t *si...

Commits 3c27f3d91e1566854747bbe844186783fc84f3a8 and 1b6f0daa9ae7fcc94e389232d0c397816cda973d added an internal API for running commands asynchronously. It is only used by the copy-in and copy-out APIs. Unfortunately this made the command code very complex: it was almost impossible to redirect stderr to a file, and there were a lot of long-range dependencies through the file. It was also buggy:

...bigger than 3K. --- lib/inspect-icon.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c index 0cc8e92ad..623591aa6 100644 --- a/lib/inspect-icon.c +++ b/lib/inspect-icon.c @@ -354,12 +354,16 @@ icon_mageia (guestfs_h *g, size_t *size_r) return get_png (g, MAGEIA_ICON, size_r, 10240); } -#define OPENSUSE_ICON "/usr/share/icons/hicolor/24x24/apps/distributor.png" - static char * icon_opensuse (guestfs_h *g, size_t *size_r) { - return get_png (g, OPENSUSE_ICON, size_r, 2048); + const char *icons[] = { + &quot...

...x_mail_read_binary_to_cache (_mail=0x5555557e3b48, part=0x5555557e4678, include_hdr=<optimized out>, reason=<optimized out>, binary_r=0x7fffffffdc16, converted_r=0x7fffffffdc17) at index-mail-binary.c:395 #8 0x00007ffff7b39c8b in index_mail_get_binary_size (lines_r=0x7fffffffdcc4, size_r=0x7fffffffdd20, include_hdr=false, part=0x5555557e4678, _mail=0x5555557e3b48) at index-mail-binary.c:497 #9 index_mail_get_binary_stream (_mail=0x5555557e3b48, part=0x5555557e4678, include_hdr=<optimized out>, size_r=0x7fffffffdd20, lines_r=0x7fffffffdcc4, binary_r=<optimized ou...

This patch series changes a small part of the library to use __attribute__((cleanup(...))) to automatically free memory when pointers go out of the current scope. In general terms this seems to be a small win although you do have to use it carefully. For functions where you can completely get rid of the "exit code paths", it can simplify things. For a good example, see the

...fs->package_management = OS_PACKAGE_MANAGEMENT_UNKNOWN; break; diff --git a/src/inspect-icon.c b/src/inspect-icon.c index 2f084b7..e8edee0 100644 --- a/src/inspect-icon.c +++ b/src/inspect-icon.c @@ -61,6 +61,7 @@ static char *icon_opensuse (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) #if CAN_DO_CIRROS static char *icon_cirros (guestfs_h *g, struct inspect_fs *fs, size_t *size_r); #endif +static char *icon_voidlinux (guestfs_h *g, struct inspect_fs *fs, size_t *size_r); #if CAN_DO_WINDOWS static char *icon_windows (guestfs_h *g, struct inspect_fs *fs, size_t *size_r); #en...

..._memdup guestfs_safe_memdup @@ -5396,8 +5398,20 @@ check_state (guestfs_h *g, const char *caller) pr " /* caller will free this */\n"; pr " return safe_memdup (g, &ret.%s, sizeof (ret.%s));\n" n n | RBufferOut n -> - pr " *size_r = ret.%s.%s_len;\n" n n; - pr " return ret.%s.%s_val; /* caller will free */\n" n n + pr " /* RBufferOut is tricky: If the buffer is zero-length, then\n"; + pr " * _val might be NULL here. To make the API saner for\n"; + pr " * calle...

...dx at entry=4) at index-mail.c:68 #6 0x00007fc4a69d94a7 in index_mail_get_fixed_field (mail=0x7fc4a8128cd0, field=<optimized out>, data=<optimized out>, data_size=8) at index-mail.c:130 #7 0x00007fc4a69d9fed in index_mail_get_cached_virtual_size (mail=mail at entry=0x7fc4a8128cd0, size_r=size_r at entry=0x7ffe23a98b20) at index-mail.c:403 #8 0x00007fc4a6987c1b in maildir_mail_get_virtual_size (_mail=0x7fc4a8128cd0, size_r=0x7ffe23a98b20) at maildir-mail.c:388 #9 0x00007fc4a69d9719 in index_mail_update_access_parts (mail=mail at entry=0x7fc4a8128cd0) at index-mail.c:1490 #10 0x000...

...+++ b/p2v.h @@ -125,9 +125,6 @@ extern char *get_if_addr (const char *if_name); extern char *get_if_vendor (const char *if_name, int truncate); extern void wait_network_online (const struct config *); -/* whole-file.c */ -extern int read_whole_file (const char *filename, char **data_r, size_t *size_r); - /* virt-v2v version and features (read from remote). */ extern char *v2v_version; diff --git a/whole-file.c b/whole-file.c deleted file mode 100644 index 156bb9b..0000000 --- a/whole-file.c +++ /dev/null @@ -1,94 +0,0 @@ -/* libguestfs - * Copyright (C) 2011-2019 Red Hat Inc. - * - * This l...

...\Draft \*)] Flags permitted. * 8 EXISTS * 0 RECENT * OK [UIDVALIDITY 1212140311] UIDs valid * OK [UIDNEXT 9] Predicted next UID 01 OK [READ-WRITE] Select completed. A003 APPEND SPAM () {2} + OK ab Program received signal SIGSEGV, Segmentation fault. 0x100929f4 in mail_get_physical_size (mail=0x0, size_r=0xbfeaf030) at mail.c:100 100 return p->v.get_physical_size(mail, size_r); (gdb) bt #0 0x100929f4 in mail_get_physical_size (mail=0x0, size_r=0xbfeaf030) at mail.c:100 #1 0x0fe29be0 in quota_try_alloc (ctx=0x101707a8, mail=0x0, too_large_r=0xbfeaf060) at quota.c:818 #2 0x0fe303dc in quot...

This patch set fixes a two year old bug in guestfish, namely that the 'glob' command does not expand /dev/* patterns. https://bugzilla.redhat.com/show_bug.cgi?id=635971 Rich.