vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix mismerge with trunk (progname)

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-05 18:59:36 +01:00
parent 7d624c2949
commit fd39f820fd
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/common.rmk
View file

@ -650,7 +650,7 @@ password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS) password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
bin_UTILITIES += grub-mkpasswd-pbkdf2 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 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap
include $(srcdir)/conf/gcry.mk include $(srcdir)/conf/gcry.mk

9
util/grub-mkpasswd-pbkdf2.c
View file

@ -19,6 +19,7 @@
#include <grub/types.h> #include <grub/types.h>
#include <grub/crypto.h> #include <grub/crypto.h>
#include <grub/util/misc.h> #include <grub/util/misc.h>
#include <grub/i18n.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
@ -27,6 +28,7 @@
#include <getopt.h> #include <getopt.h>
#include <termios.h> #include <termios.h>
#include "progname.h"
/* Few functions to make crypto happy. */ /* Few functions to make crypto happy. */
void * void *
@ -120,7 +122,10 @@ main (int argc, char *argv[])
struct termios s, t; struct termios s, t;
int tty_changed; int tty_changed;
progname = "grub-mkpasswd-pbkdf2"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* Check for options. */ /* Check for options. */
while (1) while (1)
@ -149,7 +154,7 @@ main (int argc, char *argv[])
return 0; return 0;
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, printf ("%s (%s) %s\n", program_name,
PACKAGE_NAME, PACKAGE_VERSION); PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;