From adb70e66cffcd47255fc61f109d617b48f7fddd2 Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Sat, 15 Feb 2020 11:02:07 +0000
Subject: win32: rework device file detection

Improve get_dev_type() and use it to dectect /dev/null in mingw_xopen().

Saves 64 bytes.
---
 win32/mingw.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/win32/mingw.c b/win32/mingw.c
index bada160da..0863dc841 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -157,13 +157,11 @@ static int rand_fd = -1;
 int get_dev_type(const char *filename)
 {
 	int i;
-	const char *devname[NOT_DEVICE] = { "null", "zero", "urandom" };
 
 	if (filename && !strncmp(filename, "/dev/", 5)) {
-		for (i=0; i<NOT_DEVICE; ++i ) {
-			if (!strcmp(filename+5, devname[i])) {
-				return i;
-			}
+		i = index_in_strings("null\0zero\0urandom\0", filename+5);
+		if (i != -1) {
+			return i;
 		}
 	}
 
@@ -224,7 +222,7 @@ int mingw_xopen(const char *pathname, int flags)
 #undef fopen
 FILE *mingw_fopen (const char *filename, const char *otype)
 {
-	if (filename && !strcmp(filename, "/dev/null"))
+	if (get_dev_type(filename) == DEV_NULL)
 		filename = "nul";
 	return fopen(filename, otype);
 }
-- 
cgit v1.2.3-55-g6feb