From 6438ae2591701f598a343dbe8b6bc0570d1ee716 Mon Sep 17 00:00:00 2001
From: stag019 <stag019@gmail.com>
Date: Mon, 9 Mar 2015 13:57:04 -0400
Subject: [PATCH] Remove __progname; add progname set to argv[0] in each
 main().

---
 Makefile         | 1 -
 src/asm/main.c   | 5 +++++
 src/extern/err.c | 8 +++-----
 src/fix/main.c   | 4 ++++
 src/link/main.c  | 4 ++++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ba197193..b84a311e 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,6 @@ src/asm/asmy.h: src/asm/asmy.c
 mingw:
 	$Qenv PATH=/usr/local/mingw32/bin:/bin:/usr/bin:/usr/local/bin \
 		make WARNFLAGS= CC=gcc CFLAGS="-I/usr/local/mingw32/include \
-			-D__progname=\\\"\\\" \
 			${CFLAGS}"
 	$Qmv rgbasm rgbasm.exe
 	$Qmv rgblink rgblink.exe
diff --git a/src/asm/main.c b/src/asm/main.c
index 5b19b5ee..99a7cc39 100644
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -19,6 +19,9 @@ void setuplex(void);
 int cldefines_index;
 int cldefines_size;
 char **cldefines;
+
+char *progname;
+
 clock_t nStartClock, nEndClock;
 SLONG nLineNo;
 ULONG nTotalLines, nPass, nPC, nIFDepth, nErrors;
@@ -280,6 +283,8 @@ main(int argc, char *argv[])
 	if (argc == 1)
 		usage();
 
+	progname = argv[0];
+
 	/* yydebug=1; */
 
 	DefaultOptions.gbgfx[0] = '0';
diff --git a/src/extern/err.c b/src/extern/err.c
index 2328c7ba..4d346a34 100644
--- a/src/extern/err.c
+++ b/src/extern/err.c
@@ -26,13 +26,11 @@
 #include <stdlib.h>
 #include "extern/err.h"
 
-#ifndef __MINGW32__
-char *__progname;
-#endif
+extern char *progname;
 
 void rgbds_vwarn(const char *fmt, va_list ap)
 {
-	fprintf (stderr, "%s: ", __progname);
+	fprintf (stderr, "%s: ", progname);
 	if (fmt) {
 		vfprintf(stderr, fmt, ap);
 		fputs (": ", stderr);
@@ -42,7 +40,7 @@ void rgbds_vwarn(const char *fmt, va_list ap)
 
 void rgbds_vwarnx(const char *fmt, va_list ap)
 {
-	fprintf (stderr, "%s: ", __progname);
+	fprintf (stderr, "%s: ", progname);
 	if (fmt) vfprintf(stderr, fmt, ap);
 	putc('\n', stderr);
 }
diff --git a/src/fix/main.c b/src/fix/main.c
index f634ce57..d1560748 100644
--- a/src/fix/main.c
+++ b/src/fix/main.c
@@ -23,6 +23,8 @@
 
 #include "extern/err.h"
 
+char *progname;
+
 static void
 usage(void)
 {
@@ -69,6 +71,8 @@ main(int argc, char *argv[])
 	int version;   /* mask ROM version number */
 	int padvalue;  /* to pad the rom with if it changes size */
 
+	progname = argv[0];
+
 	while ((ch = getopt(argc, argv, "Cci:jk:l:m:n:p:sr:t:v")) != -1) {
 		switch (ch) {
 		case 'C':
diff --git a/src/link/main.c b/src/link/main.c
index d59d8fd8..954d0234 100644
--- a/src/link/main.c
+++ b/src/link/main.c
@@ -24,6 +24,8 @@ SLONG options = 0;
 SLONG fillchar = 0;
 char smartlinkstartsymbol[256];
 
+char *progname;
+
 /*
  * Print the usagescreen
  *
@@ -52,6 +54,8 @@ main(int argc, char *argv[])
 	if (argc == 1)
 		usage();
 
+	progname = argv[0];
+
 	while ((ch = getopt(argc, argv, "m:n:o:p:s:t")) != -1) {
 		switch (ch) {
 		case 'm':