Simple replacement code with hardcoded y/n responses to allow
compilation on systems without rpmatch() such as Cygwin.
Signed-off-by: Francesco Cosoleto <cosoleto@xxxxxxxxx>
---
fdisk/cfdisk.c | 10 +++-------
fdisk/fdisk.c | 1 +
include/rpmatch.h | 9 +++++++++
3 files changed, 13 insertions(+), 7 deletions(-)
create mode 100644 include/rpmatch.h
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 866d02a..95f1864 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 e1221aa..57e645d 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 0000000..59b3bc1
--- /dev/null
+++ b/include/rpmatch.h
@@ -0,0 +1,9 @@
+#ifndef UL_RPMATCH_H
+#define UL_RPMATCH_H
+
+#ifndef HAVE_RPMATCH
+#define rpmatch(r) \
+ (*r == 'y' || *r == 'Y' ? 1 : *r == 'n' || *r == 'N' ? 0 : -1)
+#endif
+
+#endif /* UL_RPMATCH_H */
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
