When running the 'parse' tool, provide Registry file as command-line argument

The 'parse' tool for generating code based on a Registry file can either read
the Registry from stdin or from a file whose name is supplied as a command-line
argument. This tool assumes that if its command-line argument count is 2, then
the argument is a Registry filename (the argument count is 1 if no command-line
arguments are given).

Since future development will add processing for an arbitrary number of
command-line arguments to the parse tool, deciding whether to read the Registry
from stdin based on the argument count is not a viable strategy, so with this
commit, each core's Makefile now passes a filename as the only argument to the
parse tool, and the parse tool itself has been modified to require a
command-line argument.

Author: mgduda

src/core_atmosphere/Makefile

@@ -30,7 +30,7 @@ core_input_gen:
 
 gen_includes: core_reg
 	(if [ ! -d inc ]; then mkdir -p inc; fi) # To generate *.inc files
-	(cd inc; $(REG_PARSE) < ../Registry_processed.xml )
+	(cd inc; $(REG_PARSE) ../Registry_processed.xml )
 
 post_build:
 	if [ ! -e $(ROOT_DIR)/default_inputs ]; then mkdir $(ROOT_DIR)/default_inputs; fi

src/core_init_atmosphere/Makefile

@@ -41,7 +41,7 @@ core_input_gen:
 gen_includes:
 	$(CPP) $(CPPFLAGS) $(CPPINCLUDES) Registry.xml > Registry_processed.xml
 	(if [ ! -d inc ]; then mkdir -p inc; fi) # To generate *.inc files
-	(cd inc; $(REG_PARSE) < ../Registry_processed.xml )
+	(cd inc; $(REG_PARSE) ../Registry_processed.xml )
 
 post_build:
 	if [ ! -e $(ROOT_DIR)/default_inputs ]; then mkdir $(ROOT_DIR)/default_inputs; fi

src/core_landice/Makefile

@@ -31,7 +31,7 @@ core_reg:
 gen_includes:
 	$(CPP) $(CPPFLAGS) $(CPPINCLUDES) Registry.xml > Registry_processed.xml
 	(if [ ! -d inc ]; then mkdir -p inc; fi) # To generate *.inc files
-	(cd inc; $(REG_PARSE) < ../Registry_processed.xml )
+	(cd inc; $(REG_PARSE) ../Registry_processed.xml )
 
 post_build:
 	if [ ! -e $(ROOT_DIR)/default_inputs ]; then mkdir $(ROOT_DIR)/default_inputs; fi

src/core_ocean/Makefile

@@ -31,7 +31,7 @@ core_input_gen:
 gen_includes:
 	$(CPP) $(CPPFLAGS) $(CPPINCLUDES) Registry.xml > Registry_processed.xml
 	(if [ ! -d inc ]; then mkdir -p inc; fi) # To generate *.inc files
-	(cd inc; $(REG_PARSE) < ../Registry_processed.xml )
+	(cd inc; $(REG_PARSE) ../Registry_processed.xml )
 
 post_build:
 	if [ ! -e $(ROOT_DIR)/default_inputs ]; then mkdir $(ROOT_DIR)/default_inputs; fi

src/core_seaice/Makefile

@@ -9,7 +9,7 @@ core_seaice: column_package shared analysis_members model_forward
 gen_includes:
 	$(CPP) $(CPPFLAGS) $(CPPINCLUDES) Registry.xml > Registry_processed.xml
 	(if [ ! -d inc ]; then mkdir -p inc; fi) # To generate *.inc files
-	(cd inc; $(REG_PARSE) < ../Registry_processed.xml )
+	(cd inc; $(REG_PARSE) ../Registry_processed.xml )
 
 core_input_gen:
 	if [ ! -e default_inputs ]; then  mkdir default_inputs; fi

src/core_sw/Makefile

@@ -21,7 +21,7 @@ core_input_gen:
 gen_includes:
 	$(CPP) $(CPPFLAGS) $(CPPINCLUDES) Registry.xml > Registry_processed.xml
 	(if [ ! -d inc ]; then mkdir -p inc; fi) # To generate *.inc files
-	(cd inc; $(REG_PARSE) < ../Registry_processed.xml )
+	(cd inc; $(REG_PARSE) ../Registry_processed.xml )
 
 post_build:
 	if [ ! -e $(ROOT_DIR)/default_inputs ]; then mkdir $(ROOT_DIR)/default_inputs; fi

src/core_test/Makefile

@@ -28,7 +28,7 @@ core_input_gen:
 gen_includes:
 	$(CPP) $(CPPFLAGS) $(CPPINCLUDES) Registry.xml > Registry_processed.xml
 	(if [ ! -d inc ]; then mkdir -p inc; fi) # To generate *.inc files
-	(cd inc; $(REG_PARSE) < ../Registry_processed.xml )
+	(cd inc; $(REG_PARSE) ../Registry_processed.xml )
 
 post_build:
 	if [ ! -e $(ROOT_DIR)/default_inputs ]; then mkdir $(ROOT_DIR)/default_inputs; fi

src/tools/registry/parse.c

@@ -33,11 +33,12 @@ int main(int argc, char ** argv)/*{{{*/
 	struct package * pkgs;
 	int err;
 
-	if (argc != 2) {
-		fprintf(stderr,"Reading registry file from standard input\n");
-		regfile = stdin;
+	if (argc < 2) {
+		fprintf(stderr,"\nUsage: %s <Registry file>\n\n", argv[0]);
+		return 1;
 	}
-	else if (!(regfile = fopen(argv[1], "r"))) {
+
+	if (!(regfile = fopen(argv[1], "r"))) {
 		fprintf(stderr,"\nError: Could not open file %s for reading.\n\n", argv[1]);
 		return 1;
 	}