From 21b2504aedf2faea144c81a00dbf19261a7ce85f Mon Sep 17 00:00:00 2001
From: Roland Lutz <rlutz@hedmen.org>
Date: Mon, 4 Sep 2017 15:44:02 +0200
Subject: icemulti: Report program name in error messages

---
 icemulti/icemulti.cc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'icemulti')

diff --git a/icemulti/icemulti.cc b/icemulti/icemulti.cc
index c8cf5c2..32719d3 100644
--- a/icemulti/icemulti.cc
+++ b/icemulti/icemulti.cc
@@ -21,10 +21,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define log(...) fprintf(stderr, __VA_ARGS__);
 #define info(...) do { if (log_level > 0) fprintf(stderr, __VA_ARGS__); } while (0)
-#define error(...) do { fprintf(stderr, "Error: " __VA_ARGS__); exit(EXIT_FAILURE); } while (0)
+#define error(...) do { fprintf(stderr, "%s: ", program_short_name); fprintf(stderr, __VA_ARGS__); exit(EXIT_FAILURE); } while (0)
+
+static char *program_short_name;
 
 int log_level = 0;
 
@@ -187,6 +190,12 @@ int main(int argc, char **argv)
     std::unique_ptr<Image> images[NUM_IMAGES];
     const char *outfile_name = NULL;
 
+    program_short_name = strrchr(argv[0], '/');
+    if (program_short_name == NULL)
+        program_short_name = argv[0];
+    else
+        program_short_name++;
+
     for (int i = 1; i < argc; i++)
     {
 	if (argv[i][0] == '-' && argv[i][1]) {
-- 
cgit v1.2.3