|
 |
b8198f |
From aeabf7344efeb20f515e804d3acc830730d9433b Mon Sep 17 00:00:00 2001
|
|
|
b8198f |
From: Adam Jackson <ajax@redhat.com>
|
|
|
b8198f |
Date: Tue, 21 Jul 2015 09:45:27 -0400
|
|
|
b8198f |
Subject: [PATCH] Default to -nocpp, add -cpp default
|
|
|
b8198f |
|
|
|
b8198f |
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
|
b8198f |
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
|
b8198f |
---
|
|
|
b8198f |
xrdb.c | 16 +++++++++++-----
|
|
|
b8198f |
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
b8198f |
|
|
|
b8198f |
diff --git a/xrdb.c b/xrdb.c
|
|
|
b8198f |
index 24a6aa5..599edb7 100644
|
|
|
b8198f |
--- a/xrdb.c
|
|
|
b8198f |
+++ b/xrdb.c
|
|
|
b8198f |
@@ -746,8 +746,8 @@ Syntax (void)
|
|
|
b8198f |
" -screen do screen-specific resources for one screen\n"
|
|
|
b8198f |
" -screens do screen-specific resources for all screens\n"
|
|
|
b8198f |
" -n show but don't do changes\n"
|
|
|
b8198f |
- " -cpp filename preprocessor to use [%s]\n"
|
|
|
b8198f |
- " -nocpp do not use a preprocessor\n"
|
|
|
b8198f |
+ " -cpp filename preprocessor to use [%s if \"default\" given]\n"
|
|
|
b8198f |
+ " -nocpp do not use a preprocessor [default]\n"
|
|
|
b8198f |
" -query query resources\n"
|
|
|
b8198f |
" -load load resources from file [default]\n"
|
|
|
b8198f |
" -override add in resources from file\n"
|
|
|
b8198f |
@@ -761,7 +761,7 @@ Syntax (void)
|
|
|
b8198f |
" -Dname[=value], -Uname, -Idirectory passed to preprocessor\n"
|
|
|
b8198f |
"\n"
|
|
|
b8198f |
"A - or no input filename represents stdin.\n",
|
|
|
b8198f |
- ProgramName, cpp_program ? cpp_program : "", BACKUP_SUFFIX);
|
|
|
b8198f |
+ ProgramName, cpp_program ? cpp_program : "none", BACKUP_SUFFIX);
|
|
|
b8198f |
exit (1);
|
|
|
b8198f |
}
|
|
|
b8198f |
|
|
|
b8198f |
@@ -855,6 +855,7 @@ main(int argc, char *argv[])
|
|
|
b8198f |
int retainProp = 0;
|
|
|
b8198f |
FILE *fp = NULL;
|
|
|
b8198f |
Bool need_newline;
|
|
|
b8198f |
+ char *cpp = NULL;
|
|
|
b8198f |
|
|
|
b8198f |
ProgramName = argv[0];
|
|
|
b8198f |
|
|
|
b8198f |
@@ -913,13 +914,16 @@ main(int argc, char *argv[])
|
|
|
b8198f |
continue;
|
|
|
b8198f |
} else if (isabbreviation ("-cpp", arg, 2)) {
|
|
|
b8198f |
if (++i >= argc) Syntax ();
|
|
|
b8198f |
- cpp_program = argv[i];
|
|
|
b8198f |
+ if (!strcmp(argv[i], "default"))
|
|
|
b8198f |
+ cpp = cpp_program;
|
|
|
b8198f |
+ else
|
|
|
b8198f |
+ cpp = argv[i];
|
|
|
b8198f |
continue;
|
|
|
b8198f |
} else if (!strcmp ("-n", arg)) {
|
|
|
b8198f |
dont_execute = True;
|
|
|
b8198f |
continue;
|
|
|
b8198f |
} else if (isabbreviation ("-nocpp", arg, 3)) {
|
|
|
b8198f |
- cpp_program = NULL;
|
|
|
b8198f |
+ cpp = NULL;
|
|
|
b8198f |
continue;
|
|
|
b8198f |
} else if (isabbreviation ("-query", arg, 2)) {
|
|
|
b8198f |
oper = OPQUERY;
|
|
|
b8198f |
@@ -991,6 +995,8 @@ main(int argc, char *argv[])
|
|
|
b8198f |
else
|
|
|
b8198f |
filename = arg;
|
|
|
b8198f |
} /* end for */
|
|
|
b8198f |
+
|
|
|
b8198f |
+ cpp_program = cpp;
|
|
|
b8198f |
|
|
|
b8198f |
#ifndef WIN32
|
|
|
b8198f |
while ((i = open("/dev/null", O_RDONLY)) < 3)
|
|
|
b8198f |
--
|
|
|
b8198f |
2.4.3
|
|
|
b8198f |
|