* gnulib/progname.c: New file (imported from Gnulib).

* gnulib/progname.h: Likewise.
        * conf/i386-pc.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
        * util/i386/pc/grub-mkimage.c: Include `"progname.h"'.
        (usage): Replace `progname' with `program_name'.
        (main): Use set_program_name() for program name initialization.
This commit is contained in:
Robert Millan 2009-11-17 10:40:43 +00:00
parent ab502ec59d
commit 548643e528
5 changed files with 150 additions and 4 deletions

View file

@ -37,6 +37,8 @@
#define _GNU_SOURCE 1
#include <getopt.h>
#include "progname.h"
#ifdef ENABLE_LZMA
#include <grub/lib/LzmaEnc.h>
@ -316,7 +318,7 @@ static void
usage (int status)
{
if (status)
fprintf (stderr, _("Try ``%s --help'' for more information.\n"), progname);
fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name);
else
printf ("\
Usage: grub-mkimage [OPTION]... [MODULES]\n\
@ -348,8 +350,7 @@ main (int argc, char *argv[])
char *config = NULL;
FILE *fp = stdout;
progname = "grub-mkimage";
set_program_name (argv[0]);
textdomain (PACKAGE);
while (1)