From 27c1b37c210ea2f96034f39a63c680b5868d4358 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Wed, 6 Jun 1990 16:01:03 +0000
Subject: [PATCH] change flag -xs to -i, -xm to -m

---
 util/cpp/cpp.6     | 4 ++--
 util/cpp/main.c    | 2 +-
 util/cpp/options.c | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/util/cpp/cpp.6 b/util/cpp/cpp.6
index 99e6508f6..02e9d50bc 100644
--- a/util/cpp/cpp.6
+++ b/util/cpp/cpp.6
@@ -49,10 +49,10 @@ If \fIfile\fP is given, generate preprocessor output on standard output,
 and generate the list of makefile dependencies on file \fIfile\fP.
 .IP -\fBA\fR[\fIfile\fR]
 identical to the -d option.
-.IP -\fBxs\fR
+.IP -\fBi\fR
 when generating makefile dependencies, do not include files from
 /usr/include.
-.IP -\fBxm\fR
+.IP -\fBm\fR
 when generating makefile dependencies, generate them in the following format:
 .RS
 .IP "file.o: file1.h"
diff --git a/util/cpp/main.c b/util/cpp/main.c
index ef3fd796e..63cfe9d50 100644
--- a/util/cpp/main.c
+++ b/util/cpp/main.c
@@ -140,7 +140,7 @@ add_dependency(s)
 dependency(s, source)
 	char *s, *source;
 {
-	if (options['s'] && !strncmp(s, "/usr/include/", 13)) {
+	if (options['i'] && !strncmp(s, "/usr/include/", 13)) {
 		return;
 	}
 	if (options['m'] && source) {
diff --git a/util/cpp/options.c b/util/cpp/options.c
index 00e6e721a..1090dfb5e 100644
--- a/util/cpp/options.c
+++ b/util/cpp/options.c
@@ -28,7 +28,6 @@ do_option(text)
 {
 	switch(*text++)	{
 	case '-':
-	case 'x':
 		options[*text] = 1;
 		break;
 	case 'u':
@@ -54,6 +53,11 @@ do_option(text)
 			do_preprocess = 0;
 		}
 		break;
+	case 'm':
+	case 'i':
+		options[*(text-1)] = 1;
+		break;
+
 	case 'D' :	/* -Dname :	predefine name		*/
 	{
 		register char *cp = text, *name, *mactext;