--- SIDPlayer/src/main_sdl.cpp	2001/01/16 16:53:26	1.5
+++ SIDPlayer/src/main_sdl.cpp	2001/04/01 12:13:49	1.8
@@ -1,7 +1,7 @@
 /*
  *  main_sdl.cpp - SIDPlayer SDL main program
  *
- *  SIDPlayer (C) Copyright 1996-2000 Christian Bauer
+ *  SIDPlayer (C) Copyright 1996-2001 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 
 static void usage(const char *prg_name)
 {
-	printf("Usage: %s [OPTION...] FILE [song_number]]\n", prg_name);
+	printf("Usage: %s [OPTION...] FILE [song_number]\n", prg_name);
 	PrefsPrintUsage();
 	exit(0);
 }
@@ -69,22 +69,23 @@ int main(int argc, char **argv)
 	int32 selected_speed = PrefsFindInt32("speed");
 
 	// Parse non-option arguments
-	if (argc < 2)
-		usage(argv[0]);
-	char *file_name = argv[argc - 1];
+	const char *file_name = NULL;
 	int song = 0;
-	if (argc >= 3) {
-		bool only_numbers = true;
-		for (int i=0; i<strlen(file_name); i++)
-			if (!isdigit(file_name[i])) {
-				only_numbers = false;
-				break;
-			}
-		if (only_numbers) {
-			song = atoi(file_name);
-			file_name = argv[argc - 2];
+	for (int i=1; i<argc; i++) {
+		if (strcmp(argv[i], "--help") == 0)
+			usage(argv[0]);
+		else if (argv[i][0] == '-') {
+			fprintf(stderr, "Unrecognized option '%s'\n", argv[i]);
+			usage(argv[0]);
+		} else {
+			if (file_name == NULL)
+				file_name = argv[i];  // First non-option argument is file name
+			else
+				song = atoi(argv[i]); // Second non-option argument is song number
 		}
 	}
+	if (file_name == NULL)
+		usage(argv[0]);
 
 	// Load given PSID file
 	if (!LoadPSIDFile(file_name)) {