gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 18:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report "<stdin>" or "<stdout>" when using "-" as a filename placeholder (#1297)

Browse Source 
Also fix a memory leak with `targetFileNames`
This commit is contained in:
Sylvie
2024-02-18 11:07:25 -05:00
committed by GitHub
parent c07f3da9a1
commit 8a49a0b714
7 changed files with 64 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asm/main.cpp
View File

@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
dependFileName = musl_optarg;
}
if (dependfile == NULL)
err("Failed to open dependfile %s", dependFileName);
err("Failed to open dependfile \"%s\"", dependFileName);
break;
case 'o':
@@ -362,8 +362,9 @@ int main(int argc, char *argv[])
memcpy(&targetFileName[targetFileNameLen], newTarget, newTargetLen);
if (depType == 'Q')
free(newTarget);
if (targetFileNameLen > 0)
targetFileName[targetFileNameLen - 1] = ' ';
targetFileNameLen += newTargetLen;
targetFileName[targetFileNameLen - 1] = ' ';
break;
}
break;
@@ -376,10 +377,8 @@ int main(int argc, char *argv[])
}
}
if (targetFileName == NULL)
targetFileName = objectName;
else
targetFileName[targetFileNameLen - 1] = '\0'; // Overwrite the last space
if (!targetFileName && objectName)
targetFileName = strdup(objectName);
if (argc == musl_optind) {
fputs("FATAL: Please specify an input file (pass `-` to read from standard input)\n", stderr);
@@ -415,6 +414,7 @@ int main(int argc, char *argv[])
if (dependfile)
fclose(dependfile);
free(targetFileName);
sect_CheckUnionClosed();

14
src/asm/output.cpp
View File

@@ -42,7 +42,7 @@ struct Assertion {
struct Assertion *next;
};
char *objectName;
const char *objectName;
struct Section *sectionList;
@@ -480,13 +480,15 @@ static void registerUnregisteredSymbol(struct Symbol *symbol, void *)
void out_WriteObject(void)
{
FILE *f;
if (strcmp(objectName, "-") != 0)
f = fopen(objectName, "wb");
else
f = fdopen(STDOUT_FILENO, "wb");
if (strcmp(objectName, "-")) {
f = fopen(objectName, "wb");
} else {
objectName = "<stdout>";
f = fdopen(STDOUT_FILENO, "wb");
}
if (!f)
err("Couldn't write file '%s'", objectName);
err("Failed to open object file '%s'", objectName);
// Also write symbols that weren't written above
sym_ForEach(registerUnregisteredSymbol, NULL);