From db782fab40411c531295966c103d6256f8a2d805 Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Thu, 4 Nov 2004 11:31:05 +0000
Subject: [PATCH] Workaround for newer glibc

---
 zsnes/src/linux/zloaderw.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/zsnes/src/linux/zloaderw.c b/zsnes/src/linux/zloaderw.c
index 739c3d56..21acd6fb 100644
--- a/zsnes/src/linux/zloaderw.c
+++ b/zsnes/src/linux/zloaderw.c
@@ -339,15 +339,14 @@ printf("Hello the gui should now be off.");
 	}
 
 	/* execute rom filename: file.x */
-	if  (optopt == '?')
+	/* getopt permutates argv until all non options are at the end of argv.	*/
+	/* since we only expect one non option, it should be the last argument.	*/
+	if ( optind == argc - 1 && argv[optind] != NULL)
 	{
-		if (argv[optind] != NULL)
-		{
-			fvar=&fname;
-			fvar[0] = strlen(argv[optind]);
-			strncpy(&fvar[1], argv[optind],127);
-			makeextension();
-		}
+		fvar=&fname;
+		fvar[0] = strlen(argv[optind]);
+		strncpy(&fvar[1], argv[optind],127);
+		makeextension();
 	}
 
 	zstart();