Previously, if the user passed -nocpp and there was a cpp present, cpp would be used. This patch fixes that case.
Signed-off-by: Jeremy Huddleston <[email protected]> --- xrdb.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/xrdb.c b/xrdb.c index 2e5882a..c3ef0fd 100644 --- a/xrdb.c +++ b/xrdb.c @@ -798,6 +798,23 @@ main(int argc, char *argv[]) /* initialize the includes String struct */ addstring(&includes, ""); + /* Pick the default cpp to use. This needs to be done before + * we parse the command line in order to honor -nocpp which sets + * it back to NULL. + */ + if (cpp_program == NULL) { + int number_of_elements + = (sizeof cpp_locations) / (sizeof cpp_locations[0]); + int j; + + for (j = 0; j < number_of_elements; j++) { + if (access(cpp_locations[j], X_OK) == 0) { + cpp_program = cpp_locations[j]; + break; + } + } + } + /* needs to be replaced with XrmParseCommand */ for (i = 1; i < argc; i++) { @@ -892,19 +909,6 @@ main(int argc, char *argv[]) filename = arg; } /* end for */ - /* If cpp to use was not specified, check for ones in default locations */ - if (cpp_program == NULL) { - int number_of_elements - = (sizeof cpp_locations) / (sizeof cpp_locations[0]); - int j; - - for (j = 0; j < number_of_elements; j++) { - if (access(cpp_locations[j], X_OK) == 0) { - cpp_program = cpp_locations[j]; - break; - } - } - } #ifndef WIN32 while ((i = open("/dev/null", O_RDONLY)) < 3) ; /* make sure later freopen won't clobber things */ -- 1.7.3.5 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
