From 1498febe8d3dadad22538333dbd8d893bfc30a66 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 24 Nov 2013 04:09:38 +0100
Subject: [PATCH] Using PROGNAME for browser(1) as well

---
 src/browser.c   |  5 ++++-
 src/callbacks.c |  4 +++-
 src/main.c      | 10 +++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/browser.c b/src/browser.c
index 624f8b8..e6ca5d1 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -45,6 +45,9 @@ static char const _license[] =
 #include "common.c"
 
 /* constants */
+#ifndef PROGNAME
+# define PROGNAME	"browser"
+#endif
 #ifndef PREFIX
 # define PREFIX		"/usr/local"
 #endif
@@ -765,7 +768,7 @@ int browser_error(Browser * browser, char const * message, int ret)
 
 static int _browser_error(char const * message, int ret)
 {
-	fprintf(stderr, "%s: %s\n", "browser", message);
+	fprintf(stderr, "%s: %s\n", PROGNAME, message);
 	return ret;
 }
 
diff --git a/src/callbacks.c b/src/callbacks.c
index e38e4d2..3e53650 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -39,7 +39,9 @@
 #define _(string) gettext(string)
 
 /* constants */
-#define PROGNAME "browser"
+#ifndef PROGNAME
+# define PROGNAME "browser"
+#endif
 #define COMMON_DND
 #define COMMON_EXEC
 #define COMMON_SYMLINK
diff --git a/src/main.c b/src/main.c
index 5b71f16..468ea62 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,6 +26,9 @@
 #define _(string) gettext(string)
 
 /* constants */
+#ifndef PROGNAME
+# define PROGNAME	"browser"
+#endif
 #ifndef PREFIX
 # define PREFIX		"/usr/local"
 #endif
@@ -47,7 +50,7 @@ static int _usage(void);
 /* error */
 static int _error(char const * message, int ret)
 {
-	fputs("browser: ", stderr);
+	fputs(PROGNAME ": ", stderr);
 	perror(message);
 	return ret;
 }
@@ -57,9 +60,10 @@ static int _error(char const * message, int ret)
 static int _usage(void)
 {
 #if GTK_CHECK_VERSION(2, 6, 0)
-	fputs(_("Usage: browser [-D|-I|-L|-T] [directory...]\n"), stderr);
+	fprintf(stderr, _("Usage: %s [-D|-I|-L|-T] [directory...]\n"),
+			PROGNAME);
 #else
-	fputs(_("Usage: browser [-D] [directory...]\n"), stderr);
+	fprintf(stderr, _("Usage: %s [-D] [directory...]\n"), PROGNAME);
 #endif
 	return 1;
 }