From: Francesco Cosoleto <cosoleto@gmail.com>
Date: Fri, 8 Apr 2011 13:51:49 +0000 (+0200)
Subject: isosize: use program_invocation_short_name
X-Git-Tag: v2.20-rc1~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c0ecdd4e817a9d8ef89eb81110ba9446dc216d5;p=thirdparty%2Futil-linux.git

isosize: use program_invocation_short_name

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
---

diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index d00e4f0e06..cba107c829 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -24,6 +24,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
+#include <errno.h>
 
 #include "nls.h"
 #include "c.h"
@@ -117,7 +118,6 @@ struct iso_primary_descriptor {
     unsigned char unused5                   [ISODCL (1396, 2048)];
 };
 
-const char *progname;
 int divisor = 0;
 
 static void
@@ -159,17 +159,13 @@ main(int argc, char * argv[]) {
 	int j, ct;
 	char *p;
 
-	progname = argv[0];
-	if ((p = strrchr(progname, '/')) != NULL)
-		progname = p+1;
-
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
 	if (argc >= 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
+		printf(_("%s (%s)\n"), program_invocation_short_name, PACKAGE_STRING);
 		exit(0);
 	}
 
@@ -195,7 +191,7 @@ main(int argc, char * argv[]) {
 
 	if (ct <= 0) {
 		fprintf(stderr, _("Usage: %s [-x] [-d <num>] iso9660-image\n"),
-			progname);
+			program_invocation_short_name);
 		exit(1);
 	}