Remove __progname; add progname set to argv[0] in each main().

This commit is contained in:
stag019
2015-03-09 13:57:04 -04:00
parent 33ae6d8ca3
commit 6438ae2591
5 changed files with 16 additions and 6 deletions

View File

@@ -87,7 +87,6 @@ src/asm/asmy.h: src/asm/asmy.c
mingw: mingw:
$Qenv PATH=/usr/local/mingw32/bin:/bin:/usr/bin:/usr/local/bin \ $Qenv PATH=/usr/local/mingw32/bin:/bin:/usr/bin:/usr/local/bin \
make WARNFLAGS= CC=gcc CFLAGS="-I/usr/local/mingw32/include \ make WARNFLAGS= CC=gcc CFLAGS="-I/usr/local/mingw32/include \
-D__progname=\\\"\\\" \
${CFLAGS}" ${CFLAGS}"
$Qmv rgbasm rgbasm.exe $Qmv rgbasm rgbasm.exe
$Qmv rgblink rgblink.exe $Qmv rgblink rgblink.exe

View File

@@ -19,6 +19,9 @@ void setuplex(void);
int cldefines_index; int cldefines_index;
int cldefines_size; int cldefines_size;
char **cldefines; char **cldefines;
char *progname;
clock_t nStartClock, nEndClock; clock_t nStartClock, nEndClock;
SLONG nLineNo; SLONG nLineNo;
ULONG nTotalLines, nPass, nPC, nIFDepth, nErrors; ULONG nTotalLines, nPass, nPC, nIFDepth, nErrors;
@@ -280,6 +283,8 @@ main(int argc, char *argv[])
if (argc == 1) if (argc == 1)
usage(); usage();
progname = argv[0];
/* yydebug=1; */ /* yydebug=1; */
DefaultOptions.gbgfx[0] = '0'; DefaultOptions.gbgfx[0] = '0';

8
src/extern/err.c vendored
View File

@@ -26,13 +26,11 @@
#include <stdlib.h> #include <stdlib.h>
#include "extern/err.h" #include "extern/err.h"
#ifndef __MINGW32__ extern char *progname;
char *__progname;
#endif
void rgbds_vwarn(const char *fmt, va_list ap) void rgbds_vwarn(const char *fmt, va_list ap)
{ {
fprintf (stderr, "%s: ", __progname); fprintf (stderr, "%s: ", progname);
if (fmt) { if (fmt) {
vfprintf(stderr, fmt, ap); vfprintf(stderr, fmt, ap);
fputs (": ", stderr); fputs (": ", stderr);
@@ -42,7 +40,7 @@ void rgbds_vwarn(const char *fmt, va_list ap)
void rgbds_vwarnx(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); if (fmt) vfprintf(stderr, fmt, ap);
putc('\n', stderr); putc('\n', stderr);
} }

View File

@@ -23,6 +23,8 @@
#include "extern/err.h" #include "extern/err.h"
char *progname;
static void static void
usage(void) usage(void)
{ {
@@ -69,6 +71,8 @@ main(int argc, char *argv[])
int version; /* mask ROM version number */ int version; /* mask ROM version number */
int padvalue; /* to pad the rom with if it changes size */ 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) { while ((ch = getopt(argc, argv, "Cci:jk:l:m:n:p:sr:t:v")) != -1) {
switch (ch) { switch (ch) {
case 'C': case 'C':

View File

@@ -24,6 +24,8 @@ SLONG options = 0;
SLONG fillchar = 0; SLONG fillchar = 0;
char smartlinkstartsymbol[256]; char smartlinkstartsymbol[256];
char *progname;
/* /*
* Print the usagescreen * Print the usagescreen
* *
@@ -52,6 +54,8 @@ main(int argc, char *argv[])
if (argc == 1) if (argc == 1)
usage(); usage();
progname = argv[0];
while ((ch = getopt(argc, argv, "m:n:o:p:s:t")) != -1) { while ((ch = getopt(argc, argv, "m:n:o:p:s:t")) != -1) {
switch (ch) { switch (ch) {
case 'm': case 'm':