From fd39f820fdbd4fdb9d82cdc6befecdd25904709a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 5 Dec 2009 18:59:36 +0100
Subject: [PATCH] fix mismerge with trunk (progname)

---
 conf/common.rmk             | 2 +-
 util/grub-mkpasswd-pbkdf2.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 395d6b17b..0c6fb0cae 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -650,7 +650,7 @@ password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
 password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 bin_UTILITIES += grub-mkpasswd-pbkdf2
-grub_mkpasswd_pbkdf2_SOURCES = util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
+grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap
 
 include $(srcdir)/conf/gcry.mk
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index ad52aae91..2f7c5efaa 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -19,6 +19,7 @@
 #include <grub/types.h>
 #include <grub/crypto.h>
 #include <grub/util/misc.h>
+#include <grub/i18n.h>
 
 #include <unistd.h>
 #include <stdio.h>
@@ -27,6 +28,7 @@
 #include <getopt.h>
 #include <termios.h>
 
+#include "progname.h"
 
 /* Few functions to make crypto happy.  */
 void *
@@ -120,7 +122,10 @@ main (int argc, char *argv[])
   struct termios s, t;
   int tty_changed;
 
-  progname = "grub-mkpasswd-pbkdf2";
+  set_program_name (argv[0]);
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
 
   /* Check for options.  */
   while (1)
@@ -149,7 +154,7 @@ main (int argc, char *argv[])
 	  return 0;
 	  
 	case 'V':
-	  printf ("%s (%s) %s\n", progname,
+	  printf ("%s (%s) %s\n", program_name,
 		  PACKAGE_NAME, PACKAGE_VERSION);
 	  return 0;