search for: have_libconfig

...*path = NULL; + + if (asprintf (&path, "%s/%s", home, home_filename) == -1) { + perror ("asprintf"); + exit (EXIT_FAILURE); + } + + read_config_from_file (path); } - config_destroy (&conf); + read_config_from_file (etc_filename); } #else /* !HAVE_LIBCONFIG */ -- 1.8.3.1

...- fish/man.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fish/config.c b/fish/config.c index c1d34fb..66d2810 100644 --- a/fish/config.c +++ b/fish/config.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #ifdef HAVE_LIBCONFIG #include <libconfig.h> diff --git a/fish/keys.c b/fish/keys.c index deb627f..ec15c8f 100644 --- a/fish/keys.c +++ b/fish/keys.c @@ -1,5 +1,5 @@ /* libguestfs - guestfish and guestmount shared option parsing - * Copyright (C) 2010 Red Hat Inc. + * Copyright (C) 2010-2011 Red Hat Inc. * *...

...c:d:e:m:vVx"; static const struct option long_options[] = { { "add", 1, 0, 'a' }, { "backup", 1, 0, 'b' }, diff --git a/fish/config.c b/fish/config.c index 0c3471a..8f10ad4 100644 --- a/fish/config.c +++ b/fish/config.c @@ -45,8 +45,8 @@ #ifdef HAVE_LIBCONFIG #define GLOBAL_CONFIG_FILENAME "libguestfs-tools.conf" -static const char *home_filename = /* $HOME/ */ ".libguestfs-tools.rc"; -static const char *etc_filename = "/etc/" GLOBAL_CONFIG_FILENAME; +static const char home_filename[] = /* $HOME/ */ ".libguestfs-too...

...ibraries.m4 b/m4/guestfs_misc_libraries.m4 index 9b22670..4ae0576 100644 --- a/m4/guestfs_misc_libraries.m4 +++ b/m4/guestfs_misc_libraries.m4 @@ -74,12 +74,41 @@ PKG_CHECK_MODULES([LIBCONFIG], [libconfig],[ [AC_MSG_WARN([libconfig not found, some features will be disabled])]) AM_CONDITIONAL([HAVE_LIBCONFIG],[test "x$LIBCONFIG_LIBS" != "x"]) -dnl Check for gtk2 library, used by virt-p2v. -PKG_CHECK_MODULES([GTK2], [gtk+-2.0], [ - AC_SUBST([GTK2_CFLAGS]) - AC_SUBST([GTK2_LIBS]) -], - [AC_MSG_WARN([gtk2 not found, virt-p2v will be disabled])]) +dnl Check for Gtk 2 or 3 lib...

This version of the Gtk 2/3 patch gets alignment and padding mostly right. I still can't work out how to vertically align labels in the middle of a cell in a GtkGrid. The GtkTextView in the final dialog is still broken. Rich.

... and a small initial patch which makes it easier to test virt-p2v without having to start up a virtual machine. There is still a bug in Gtk 3 where the GtkTextView on the final (running) dialog ignores gtk_widget_set_size_request and so the window appears just a single pixel high. Rich.

This is basically the same as what I posted earlier today. The main difference is I split out the GDK thread sychronization (removal of) changes from the other Gtk 2/3 changes, which should make it a bit easier to review. Gtk 3 is still not quite perfect. Apart from the problem with the GtkTextView noted before, there are also vertical alignment and padding problems with labels in GtkGrid

Two (not related to each other) refactorings: Patches 1-12 split configure.ac into smaller files using the m4_include mechanism. Patches 13-15 split out parts of guestfs.pod (ie. guestfs(3)) into three new manual pages: guestfs-hacking(3) - how to extend and contribute to libguestfs guestfs-internals(3) - architecture and internals guestfs-security(3) - security and CVEs Patch 16 is a

Version 1 of the patch, for discussion, but not to be applied. It does work, but needs a lot more testing. This removes all the psychopathic gettextify cruft, and replaces it with a 99 line Makefile.am. A large win, I think. The third patch implements gettext support in the OCaml tools. The fourth patch is just for illustration. It shows the consequent changes to libguestfs.pot and the po

...drv->next = drvs; diff --git a/fish/config.c b/fish/config.c index 51014bf..4463d9f 100644 --- a/fish/config.c +++ b/fish/config.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <error.h> #include <libintl.h> #ifdef HAVE_LIBCONFIG @@ -68,10 +69,8 @@ read_config_from_file (const char *filename) exit (EXIT_FAILURE); } - if (fclose (fp) == -1) { - perror (filename); - exit (EXIT_FAILURE); - } + if (fclose (fp) == -1) + error (EXIT_FAILURE, errno, "fclose: %s", filename); co...