From e8b0be5d7dfbb8805c3c63e58f76e8e89b7c04b8 Mon Sep 17 00:00:00 2001

From: "Richard W.M. Jones" <rjones@redhat.com>

Date: Sat, 7 Feb 2015 16:27:03 +0000

Subject: [PATCH] lib: Change 'program_name' macro to avoid conflict with

 gnulib.

The gnulib 'error' module uses 'program_name'.  On some platforms --

but not Linux / glibc -- it references it as:

  extern char *program_name;

This means when you compile libguestfs on non-glibc (eg. Mac OS X)

gnulib requires 'program_name' as an external string reference, which

we don't provide.

This change doesn't define this string reference for gnulib, but it

does change the name of the macro we use to avoid conflicts if we

eventually need to export 'program_name' as a string.

Thanks: Margaret Lewicka

(cherry picked from commit 5cafedaa45d5993c54bf1827426171d9e23d77ae)

---

 align/scan.c                                  | 14 +++----

 builder/index-validate.c                      | 18 ++++-----

 cat/cat.c                                     |  8 ++--

 cat/filesystems.c                             | 10 ++---

 cat/log.c                                     | 18 ++++-----

 cat/ls.c                                      | 12 +++---

 cat/visit.c                                   |  4 +-

 df/domains.c                                  | 10 ++---

 df/main.c                                     | 14 +++----

 df/parallel.c                                 |  2 +-

 diff/diff.c                                   | 16 ++++----

 edit/edit.c                                   | 12 +++---

 fish/config.c                                 |  6 +--

 fish/fish.c                                   | 54 +++++++++++++--------------

 fish/inspect.c                                |  8 ++--

 fish/options.c                                | 10 ++---

 fish/options.h                                |  6 +--

 fish/uri.c                                    |  8 ++--

 fish/windows.c                                |  4 +-

 format/format.c                               | 14 +++----

 fuse/guestmount.c                             | 22 +++++------

 fuse/guestunmount.c                           | 16 ++++----

 fuse/test-guestmount-fd.c                     | 10 ++---

 fuse/test-guestunmount-fd.c                   |  4 +-

 generator/fish.ml                             |  4 +-

 inspector/inspector.c                         | 32 ++++++++--------

 make-fs/make-fs.c                             | 28 +++++++-------

 p2v/conversion.c                              |  4 +-

 p2v/gui.c                                     | 10 ++---

 p2v/kernel.c                                  | 18 ++++-----

 p2v/main.c                                    | 12 +++---

 p2v/ssh.c                                     |  4 +-

 rescue/rescue.c                               | 20 +++++-----

 src/guestfs-internal-frontend.h               |  6 +--

 tests/charsets/test-charset-fidelity.c        |  2 +-

 tests/mount-local/test-parallel-mount-local.c |  4 +-

 tests/parallel/test-parallel.c                |  2 +-

 tests/qemu/qemu-boot.c                        | 20 +++++-----

 tests/qemu/qemu-speed-test.c                  | 18 ++++-----

 tests/regressions/rhbz790721.c                |  2 +-

 tests/regressions/rhbz914931.c                |  2 +-

 41 files changed, 244 insertions(+), 244 deletions(-)

diff --git a/align/scan.c b/align/scan.c

index e803d8e..4740581 100644

--- a/align/scan.c

+++ b/align/scan.c

@@ -71,7 +71,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: check alignment of virtual machine partitions\n"

@@ -91,8 +91,8 @@ usage (int status)

              "  -V|--version         Display version and exit\n"

              "  -x                   Trace libguestfs API calls\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name);

+             guestfs___program_name, guestfs___program_name, guestfs___program_name,

+             guestfs___program_name);

   }

   exit (status);

 }

@@ -149,7 +149,7 @@ main (int argc, char *argv[])

         uuid = 1;

       } else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

@@ -168,7 +168,7 @@ main (int argc, char *argv[])

     case 'P':

       if (sscanf (optarg, "%zu", &max_threads) != 1) {

-        fprintf (stderr, _("%s: -P option is not numeric\n"), program_name);

+        fprintf (stderr, _("%s: -P option is not numeric\n"), guestfs___program_name);

         exit (EXIT_FAILURE);

       }

       break;

@@ -226,13 +226,13 @@ main (int argc, char *argv[])

       exit (EXIT_FAILURE);

 #else

     fprintf (stderr, _("%s: compiled without support for libvirt.\n"),

-             program_name);

+             guestfs___program_name);

     exit (EXIT_FAILURE);

 #endif

   } else {                      /* Single guest. */

     if (uuid) {

       fprintf (stderr, _("%s: --uuid option cannot be used with -a or -d\n"),

-               program_name);

+               guestfs___program_name);

       exit (EXIT_FAILURE);

     }

diff --git a/builder/index-validate.c b/builder/index-validate.c

index 782718d..0628a6f 100644

--- a/builder/index-validate.c

+++ b/builder/index-validate.c

@@ -39,7 +39,7 @@ extern int do_parse (struct parse_context *context, FILE *in);

 static void

 usage (int exit_status)

 {

-  printf ("%s index\n", program_name);

+  printf ("%s index\n", guestfs___program_name);

   exit (exit_status);

 }

@@ -83,7 +83,7 @@ main (int argc, char *argv[])

         compat_1_24_1 = 1;

       else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

@@ -115,20 +115,20 @@ main (int argc, char *argv[])

   if (fclose (in) == EOF) {

     fprintf (stderr, _("%s: %s: error closing input file: %m (ignored)\n"),

-             program_name, input);

+             guestfs___program_name, input);

   }

   if (ret != 0) {

     parse_context_free (&context);

     fprintf (stderr, _("%s: '%s' could not be validated, see errors above\n"),

-             program_name, input);

+             guestfs___program_name, input);

     exit (EXIT_FAILURE);

   }

   if (compat_1_24_1 && context.seen_comments) {

     parse_context_free (&context);

     fprintf (stderr, _("%s: %s contains comments which will not work with virt-builder 1.24.1\n"),

-             program_name, input);

+             guestfs___program_name, input);

     exit (EXIT_FAILURE);

   }

@@ -141,7 +141,7 @@ main (int argc, char *argv[])

       if (strchr (sections->name, '_')) {

         parse_context_free (&context);

         fprintf (stderr, _("%s: %s: section [%s] has invalid characters which will not work with virt-builder 1.24.0\n"),

-                 program_name, input, sections->name);

+                 guestfs___program_name, input, sections->name);

         exit (EXIT_FAILURE);

       }

     }

@@ -152,7 +152,7 @@ main (int argc, char *argv[])

             strchr (fields->key, ']')) {

           parse_context_free (&context);

           fprintf (stderr, _("%s: %s: section [%s], field '%s' has invalid characters which will not work with virt-builder 1.24.0\n"),

-                   program_name, input, sections->name, fields->key);

+                   guestfs___program_name, input, sections->name, fields->key);

           exit (EXIT_FAILURE);

         }

       }

@@ -161,7 +161,7 @@ main (int argc, char *argv[])

             strchr (fields->key, ',')) {

           parse_context_free (&context);

           fprintf (stderr, _("%s: %s: section [%s], field '%s' has invalid characters which will not work with virt-builder 1.24.1\n"),

-                   program_name, input, sections->name, fields->key);

+                   guestfs___program_name, input, sections->name, fields->key);

           exit (EXIT_FAILURE);

         }

       }

@@ -172,7 +172,7 @@ main (int argc, char *argv[])

     if (compat_1_24_0 && !seen_sig) {

       parse_context_free (&context);

       fprintf (stderr, _("%s: %s: section [%s] is missing a 'sig' field which will not work with virt-builder 1.24.0\n"),

-               program_name, input, sections->name);

+               guestfs___program_name, input, sections->name);

       exit (EXIT_FAILURE);

     }

   }

diff --git a/cat/cat.c b/cat/cat.c

index ec9c81f..a9de790 100644

--- a/cat/cat.c

+++ b/cat/cat.c

@@ -51,7 +51,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: display files in a virtual machine\n"

@@ -73,8 +73,8 @@ usage (int status)

              "  -V|--version         Display version and exit\n"

              "  -x                   Trace libguestfs API calls\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name);

+             guestfs___program_name, guestfs___program_name, guestfs___program_name,

+             guestfs___program_name);

   }

   exit (status);

 }

@@ -136,7 +136,7 @@ main (int argc, char *argv[])

         OPTION_format;

       } else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

diff --git a/cat/filesystems.c b/cat/filesystems.c

index f9f887a..19b494e 100644

--- a/cat/filesystems.c

+++ b/cat/filesystems.c

@@ -85,7 +85,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: list filesystems, partitions, block devices, LVM in a VM\n"

@@ -122,8 +122,8 @@ usage (int status)

              "                       Display LVM volume groups\n"

              "  -x                   Trace libguestfs API calls\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name);

+             guestfs___program_name, guestfs___program_name, guestfs___program_name,

+             guestfs___program_name);

   }

   exit (status);

 }

@@ -237,7 +237,7 @@ main (int argc, char *argv[])

         output |= OUTPUT_VGS;

       } else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

@@ -301,7 +301,7 @@ main (int argc, char *argv[])

    */

   if (human && csv) {

     fprintf (stderr, _("%s: you cannot use -h and --csv options together.\n"),

-             program_name);

+             guestfs___program_name);

     exit (EXIT_FAILURE);

   }

diff --git a/cat/log.c b/cat/log.c

index 0d8dab0..7c2595b 100644

--- a/cat/log.c

+++ b/cat/log.c

@@ -60,7 +60,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: display log files in a virtual machine\n"

@@ -80,8 +80,8 @@ usage (int status)

              "  -V|--version         Display version and exit\n"

              "  -x                   Trace libguestfs API calls\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name);

+             guestfs___program_name, guestfs___program_name, guestfs___program_name,

+             guestfs___program_name);

   }

   exit (status);

 }

@@ -138,7 +138,7 @@ main (int argc, char *argv[])

         OPTION_format;

       } else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

@@ -241,7 +241,7 @@ do_log (void)

     fprintf (stderr,

              _("%s: Windows Event Log for pre-Vista guests is not supported.\n"),

-             program_name);

+             guestfs___program_name);

     return -1;

   }

@@ -349,7 +349,7 @@ do_log_journal (void)

       if (strftime (buf, sizeof buf, "%b %d %H:%M:%S",

                     localtime_r (&t, &tm)) <= 0) {

         fprintf (stderr, _("%s: could not format journal entry timestamp\n"),

-                 program_name);

+                 guestfs___program_name);

         errors++;

         continue;

       }

@@ -418,7 +418,7 @@ do_log_windows_evtx (void)

                        "in order to parse Windows Event Logs.  If you cannot install this, then\n"

                        "use virt-copy-out(1) to copy the contents of /Windows/System32/winevt/Logs\n"

                        "from this guest, and examine in a binary file viewer.\n"),

-             program_name);

+             guestfs___program_name);

     return -1;

   }

@@ -434,7 +434,7 @@ do_log_windows_evtx (void)

                             GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1,

                             -1) <= 0) {

     fprintf (stderr, _("%s: Windows Event Log file (%s) not found\n"),

-             program_name, filename);

+             guestfs___program_name, filename);

     return -1;

   }

@@ -466,7 +466,7 @@ do_log_windows_evtx (void)

   if (status) {

     char buf[256];

     fprintf (stderr, "%s: %s\n",

-             program_name,

+             guestfs___program_name,

              guestfs___exit_status_to_string (status, "evtxdump.py",

                                               buf, sizeof buf));

     return -1;

diff --git a/cat/ls.c b/cat/ls.c

index 2cb4e74..8d7dfc9 100644

--- a/cat/ls.c

+++ b/cat/ls.c

@@ -81,7 +81,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: list files in a virtual machine\n"

@@ -114,8 +114,8 @@ usage (int status)

              "  -V|--version         Display version and exit\n"

              "  -x                   Trace libguestfs API calls\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name);

+             guestfs___program_name, guestfs___program_name, guestfs___program_name,

+             guestfs___program_name);

   }

   exit (status);

 }

@@ -226,7 +226,7 @@ main (int argc, char *argv[])

         enable_uids = 1;

       } else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

@@ -332,7 +332,7 @@ main (int argc, char *argv[])

       (csv || human || enable_uids || enable_times || enable_extra_stats ||

        checksum)) {

     fprintf (stderr, _("%s: used a flag which can only be combined with -lR mode\nFor more information, read the virt-ls(1) man page.\n"),

-             program_name);

+             guestfs___program_name);

     exit (EXIT_FAILURE);

   }

@@ -341,7 +341,7 @@ main (int argc, char *argv[])

    */

   if (human && csv) {

     fprintf (stderr, _("%s: you cannot use -h and --csv options together.\n"),

-             program_name);

+             guestfs___program_name);

     exit (EXIT_FAILURE);

   }

diff --git a/cat/visit.c b/cat/visit.c

index 49b779e..8588f31 100644

--- a/cat/visit.c

+++ b/cat/visit.c

@@ -100,7 +100,7 @@ _visit (guestfs_h *g, int depth, const char *dir,

     if (xattrs->val[xattrp].attrval_len == 0) {

       fprintf (stderr, _("%s: error getting extended attrs for %s %s\n"),

-               program_name, dir, names[i]);

+               guestfs___program_name, dir, names[i]);

       return -1;

     }

     /* attrval is not \0-terminated. */

@@ -110,7 +110,7 @@ _visit (guestfs_h *g, int depth, const char *dir,

     attrval[xattrs->val[xattrp].attrval_len] = '\0';

     if (sscanf (attrval, "%zu", &nr_xattrs) != 1) {

       fprintf (stderr, _("%s: error: cannot parse xattr count for %s %s\n"),

-               program_name, dir, names[i]);

+               guestfs___program_name, dir, names[i]);

       return -1;

     }

diff --git a/df/domains.c b/df/domains.c

index b2d9537..8943ebc 100644

--- a/df/domains.c

+++ b/df/domains.c

@@ -82,7 +82,7 @@ get_all_libvirt_domains (const char *libvirt_uri)

     err = virGetLastError ();

     fprintf (stderr,

              _("%s: could not connect to libvirt (code %d, domain %d): %s\n"),

-             program_name, err->code, err->domain, err->message);

+             guestfs___program_name, err->code, err->domain, err->message);

     exit (EXIT_FAILURE);

   }

@@ -91,7 +91,7 @@ get_all_libvirt_domains (const char *libvirt_uri)

     err = virGetLastError ();

     fprintf (stderr,

              _("%s: could not get number of running domains (code %d, domain %d): %s\n"),

-             program_name, err->code, err->domain, err->message);

+             guestfs___program_name, err->code, err->domain, err->message);

     exit (EXIT_FAILURE);

   }

@@ -101,7 +101,7 @@ get_all_libvirt_domains (const char *libvirt_uri)

     err = virGetLastError ();

     fprintf (stderr,

              _("%s: could not list running domains (code %d, domain %d): %s\n"),

-             program_name, err->code, err->domain, err->message);

+             guestfs___program_name, err->code, err->domain, err->message);

     exit (EXIT_FAILURE);

   }

@@ -112,7 +112,7 @@ get_all_libvirt_domains (const char *libvirt_uri)

     err = virGetLastError ();

     fprintf (stderr,

              _("%s: could not get number of inactive domains (code %d, domain %d): %s\n"),

-             program_name, err->code, err->domain, err->message);

+             guestfs___program_name, err->code, err->domain, err->message);

     exit (EXIT_FAILURE);

   }

@@ -122,7 +122,7 @@ get_all_libvirt_domains (const char *libvirt_uri)

     err = virGetLastError ();

     fprintf (stderr,

              _("%s: could not list inactive domains (code %d, domain %d): %s\n"),

-             program_name, err->code, err->domain, err->message);

+             guestfs___program_name, err->code, err->domain, err->message);

     exit (EXIT_FAILURE);

   }

diff --git a/df/main.c b/df/main.c

index bddf2a9..fef1006 100644

--- a/df/main.c

+++ b/df/main.c

@@ -64,7 +64,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: display free space on virtual filesystems\n"

@@ -88,8 +88,8 @@ usage (int status)

              "  -V|--version         Display version and exit\n"

              "  -x                   Trace libguestfs API calls\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name);

+             guestfs___program_name, guestfs___program_name, guestfs___program_name,

+             guestfs___program_name);

   }

   exit (status);

 }

@@ -153,7 +153,7 @@ main (int argc, char *argv[])

         uuid = 1;

       } else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

@@ -180,7 +180,7 @@ main (int argc, char *argv[])

     case 'P':

       if (sscanf (optarg, "%zu", &max_threads) != 1) {

-        fprintf (stderr, _("%s: -P option is not numeric\n"), program_name);

+        fprintf (stderr, _("%s: -P option is not numeric\n"), guestfs___program_name);

         exit (EXIT_FAILURE);

       }

       break;

@@ -260,7 +260,7 @@ main (int argc, char *argv[])

    */

   if (human && csv) {

     fprintf (stderr, _("%s: you cannot use -h and --csv options together.\n"),

-             program_name);

+             guestfs___program_name);

     exit (EXIT_FAILURE);

   }

@@ -277,7 +277,7 @@ main (int argc, char *argv[])

     free_domains ();

 #else

     fprintf (stderr, _("%s: compiled without support for libvirt.\n"),

-             program_name);

+             guestfs___program_name);

     exit (EXIT_FAILURE);

 #endif

   }

diff --git a/df/parallel.c b/df/parallel.c

index 6d2e1cf..f7a628b 100644

--- a/df/parallel.c

+++ b/df/parallel.c

@@ -259,7 +259,7 @@ worker_thread (void *thread_data_vp)

 static void

 thread_failure (const char *fn, int err)

 {

-  fprintf (stderr, "%s: %s: %s\n", program_name, fn, strerror (err));

+  fprintf (stderr, "%s: %s: %s\n", guestfs___program_name, fn, strerror (err));

 }

 #endif /* HAVE_LIBVIRT */

diff --git a/diff/diff.c b/diff/diff.c

index ad371b0..304ce84 100644

--- a/diff/diff.c

+++ b/diff/diff.c

@@ -89,7 +89,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: list differences between virtual machines\n"

@@ -125,8 +125,8 @@ usage (int status)

              "  -x                   Trace libguestfs API calls\n"

              "  --xattrs             Display extended attributes\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name);

+             guestfs___program_name, guestfs___program_name, guestfs___program_name,

+             guestfs___program_name);

   }

   exit (status);

 }

@@ -258,7 +258,7 @@ main (int argc, char *argv[])

         enable_xattrs = 1;

       } else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

@@ -315,7 +315,7 @@ main (int argc, char *argv[])

   if (drvs == NULL || drvs2 == NULL) {

     fprintf (stderr,

              _("%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"),

-             program_name, program_name);

+             guestfs___program_name, guestfs___program_name);

     usage (EXIT_FAILURE);

   }

@@ -324,13 +324,13 @@ main (int argc, char *argv[])

    */

   if (human && csv) {

     fprintf (stderr, _("%s: you cannot use -h and --csv options together.\n"),

-             program_name);

+             guestfs___program_name);

     exit (EXIT_FAILURE);

   }

   if (optind != argc) {

     fprintf (stderr, _("%s: extra arguments on the command line\n"),

-             program_name);

+             guestfs___program_name);

     usage (EXIT_FAILURE);

   }

@@ -737,7 +737,7 @@ diff (struct file *file1, guestfs_h *g1, struct file *file2, guestfs_h *g2)

     fprintf (stderr, "%s\n", cmd);

   r = system (cmd);

   if (!WIFEXITED (r) || WEXITSTATUS (r) != 0) {

-    fprintf (stderr, _("%s: external diff command failed\n"), program_name);

+    fprintf (stderr, _("%s: external diff command failed\n"), guestfs___program_name);

     goto out;

   }

diff --git a/edit/edit.c b/edit/edit.c

index 20b2963..cc88eb1 100644

--- a/edit/edit.c

+++ b/edit/edit.c

@@ -61,7 +61,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: Edit a file in a virtual machine\n"

@@ -85,8 +85,8 @@ usage (int status)

              "  -V|--version         Display version and exit\n"

              "  -x                   Trace libguestfs API calls\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name);

+             guestfs___program_name, guestfs___program_name, guestfs___program_name,

+             guestfs___program_name);

   }

   exit (status);

 }

@@ -153,7 +153,7 @@ main (int argc, char *argv[])

         OPTION_format;

       } else {

         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),

-                 program_name, long_options[option_index].name, option_index);

+                 guestfs___program_name, long_options[option_index].name, option_index);

         exit (EXIT_FAILURE);

       }

       break;

@@ -165,7 +165,7 @@ main (int argc, char *argv[])

     case 'b':

       if (backup_extension) {

         fprintf (stderr, _("%s: -b option given multiple times\n"),

-                 program_name);

+                 guestfs___program_name);

         exit (EXIT_FAILURE);

       }

       backup_extension = optarg;

@@ -182,7 +182,7 @@ main (int argc, char *argv[])

     case 'e':

       if (perl_expr) {

         fprintf (stderr, _("%s: -e option given multiple times\n"),

-                 program_name);

+                 guestfs___program_name);

         exit (EXIT_FAILURE);

       }

       perl_expr = optarg;

diff --git a/fish/config.c b/fish/config.c

index 7d319ad..cec0ae3 100644

--- a/fish/config.c

+++ b/fish/config.c

@@ -57,13 +57,13 @@ read_config_from_file (const char *filename)

     /*

     if (verbose)

       fprintf (stderr, "%s: reading configuration from %s\n",

-               program_name, filename);

+               guestfs___program_name, filename);

     */

     if (config_read (&conf, fp) == CONFIG_FALSE) {

       fprintf (stderr,

                _("%s: %s: line %d: error parsing configuration file: %s\n"),

-               program_name, filename, config_error_line (&conf),

+               guestfs___program_name, filename, config_error_line (&conf),

                config_error_text (&conf));

       exit (EXIT_FAILURE);

     }

@@ -165,7 +165,7 @@ parse_config (void)

   if (verbose)

     fprintf (stderr,

              _("%s: compiled without libconfig, guestfish configuration file ignored\n"),

-             program_name);

+             guestfs___program_name);

   */

 }

diff --git a/fish/fish.c b/fish/fish.c

index 6d07f36..db68804 100644

--- a/fish/fish.c

+++ b/fish/fish.c

@@ -103,7 +103,7 @@ usage (int status)

 {

   if (status != EXIT_SUCCESS)

     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-             program_name);

+             guestfs___program_name);

   else {

     fprintf (stdout,

            _("%s: guest filesystem shell\n"

@@ -152,9 +152,9 @@ usage (int status)

              "run again without -i and use 'run' + 'list-filesystems' + 'mount' cmds.\n"

              "\n"

              "For more information, see the manpage %s(1).\n"),

-             program_name, program_name, program_name,

-             program_name, program_name, program_name,