Reuse the usage.name for printing version info

src/asm/main.cpp

@@ -296,7 +296,7 @@ static void parseArg(int ch, char *arg) {
 
 		// LCOV_EXCL_START
 	case 'V':
-		printf("rgbasm %s\n", get_package_version_string());
+		printf("%s %s\n", usage.name.c_str(), get_package_version_string());
 		exit(0);
 
 	case 'v':
@@ -381,7 +381,7 @@ static void verboseOutputConfig() {
 
 	style_Set(stderr, STYLE_MAGENTA, false);
 
-	fprintf(stderr, "rgbasm %s\n", get_package_version_string());
+	fprintf(stderr, "%s %s\n", usage.name.c_str(), get_package_version_string());
 
 	printVVVVVVerbosity();
 

src/fix/main.cpp

@@ -252,7 +252,7 @@ static void parseArg(int ch, char *arg) {
 
 		// LCOV_EXCL_START
 	case 'V':
-		printf("rgbfix %s\n", get_package_version_string());
+		printf("%s %s\n", usage.name.c_str(), get_package_version_string());
 		exit(0);
 
 	case 'v':

src/gfx/main.cpp

@@ -409,7 +409,7 @@ static void parseArg(int ch, char *arg) {
 
 		// LCOV_EXCL_START
 	case 'V':
-		printf("rgbgfx %s\n", get_package_version_string());
+		printf("%s %s\n", usage.name.c_str(), get_package_version_string());
 		exit(0);
 
 	case 'v':
@@ -481,7 +481,7 @@ static void verboseOutputConfig() {
 
 	style_Set(stderr, STYLE_MAGENTA, false);
 
-	fprintf(stderr, "rgbgfx %s\n", get_package_version_string());
+	fprintf(stderr, "%s %s\n", usage.name.c_str(), get_package_version_string());
 
 	printVVVVVVerbosity();
 

src/link/main.cpp

@@ -283,7 +283,7 @@ static void parseArg(int ch, char *arg) {
 
 		// LCOV_EXCL_START
 	case 'V':
-		printf("rgblink %s\n", get_package_version_string());
+		printf("%s %s\n", usage.name.c_str(), get_package_version_string());
 		exit(0);
 
 	case 'v':
@@ -330,7 +330,7 @@ static void verboseOutputConfig() {
 
 	style_Set(stderr, STYLE_MAGENTA, false);
 
-	fprintf(stderr, "rgblink %s\n", get_package_version_string());
+	fprintf(stderr, "%s %s\n", usage.name.c_str(), get_package_version_string());
 
 	printVVVVVVerbosity();
 

src/link/object.cpp

@@ -420,19 +420,15 @@ void obj_ReadFile(std::string const &filePath, size_t fileID) {
 	}
 	Defer closeFile{[&] { fclose(file); }};
 
-	// First, check if the object is a RGBDS object or a SDCC one. If the first byte is 'R',
+	// First, check if the object is a RGBDS object, a SDCC one, or neither.
-	// we'll assume it's a RGBDS object file, and otherwise, that it's a SDCC object file.
+	// A single `ungetc` is guaranteed to work.
-	int c = getc(file);
+	switch (ungetc(getc(file), file)) {
-
-	ungetc(c, file); // Guaranteed to work
-	switch (c) {
 	case EOF:
 		fatal("File \"%s\" is empty!", fileName);
 
-	case 'R':
+	case 'X':
-		break;
+	case 'D':
-
+	case 'Q': {
-	default:
 		// This is (probably) a SDCC object file, defer the rest of detection to it.
 		// Since SDCC does not provide line info, everything will be reported as coming from the
 		// object file. It's better than nothing.
@@ -450,11 +446,16 @@ void obj_ReadFile(std::string const &filePath, size_t fileID) {
 		return;
 	}
 
-	// Begin by reading the magic bytes
+	case 'R':
-	int matchedElems;
+		// Check the magic byte signature for a RGB object file.
+		if (char magic[literal_strlen(RGBDS_OBJECT_VERSION_STRING)];
+		    fread(magic, 1, sizeof(magic), file) == sizeof(magic)
+		    && !memcmp(magic, RGBDS_OBJECT_VERSION_STRING, sizeof(magic))) {
+			break;
+		}
+		[[fallthrough]];
 
-	if (fscanf(file, RGBDS_OBJECT_VERSION_STRING "%n", &matchedElems) == 1
+	default:
-	    && matchedElems != literal_strlen(RGBDS_OBJECT_VERSION_STRING)) {
 		fatal("%s: Not a RGBDS object file", fileName);
 	}