From: Francesco Cosoleto <cosoleto@gmail.com>
Date: Sun, 2 Jan 2011 21:58:13 +0000 (+0100)
Subject: include: add fallback for rpmatch()
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e66ac5d344dd038adb664e237c4c2610020f3f62;p=util-linux

include: add fallback for rpmatch()

Simple replacement code with hardcoded y/n responses to allow
compilation on systems without rpmatch() such as Cygwin.

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 866d02af..95f1864d 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -98,6 +98,7 @@
 #endif
 
 #include "nls.h"
+#include "rpmatch.h"
 #include "blkdev.h"
 #include "strutils.h"
 #include "common.h"
@@ -1448,17 +1449,12 @@ get_kernel_geometry(void) {
 
 static int
 said_yes(char answer) {
-#ifdef HAVE_RPMATCH
 	char reply[2];
-	int yn;
 
 	reply[0] = answer;
 	reply[1] = 0;
-	yn = rpmatch(reply);	/* 1: yes, 0: no, -1: ? */
-	if (yn >= 0)
-		return yn;
-#endif
-	return (answer == 'y' || answer == 'Y');
+
+	return (rpmatch(reply) == 1) ? 1 : 0;
 }
 
 static void
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index e1221aaa..57e645d7 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -23,6 +23,7 @@
 #include <limits.h>
 
 #include "nls.h"
+#include "rpmatch.h"
 #include "blkdev.h"
 #include "common.h"
 #include "mbsalign.h"
diff --git a/include/rpmatch.h b/include/rpmatch.h
new file mode 100644
index 00000000..d62634bd
--- /dev/null
+++ b/include/rpmatch.h
@@ -0,0 +1,9 @@
+#ifndef UTIL_LINUX_RPMATCH_H
+#define UTIL_LINUX_RPMATCH_H
+
+#ifndef HAVE_RPMATCH
+#define rpmatch(r) \
+	(*r == 'y' || *r == 'Y' ? 1 : *r == 'n' || *r == 'N' ? 0 : -1)
+#endif
+
+#endif /* UTIL_LINUX_RPMATCH_H */