Merge pull request #11 from olli4/master

mdietze · web-flow · commit 4f93253931a3 · 2023-04-05T07:43:43.000-04:00
Add support for Windows-style carriage return line feed in input files
diff --git a/SIPNEToptsIn/frontend.c b/SIPNEToptsIn/frontend.c
@@ -153,7 +153,7 @@ int main(int argc, char *argv[]) {
 
     // do each run, output to fileName#.out
     runNum = 1;
-    while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)) { 
+    while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0) && (strcmp(line, "\r\n") != 0)) { 
       // get next set of parameter values and do next run
       sprintf(outFile, "%s%d.out", argv[optind + 3], runNum);
       out = openFile(outFile, "w");
@@ -201,7 +201,7 @@ int main(int argc, char *argv[]) {
 
     for (k = 0; k < 2; k++) {
       runNum = 1;
-      while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)) { 
+      while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0) && (strcmp(line, "\r\n") != 0)) { 
 	// get next set of parameter values and do next run
 	if (numToSkip > 0) {
 	  strtok(line, " \t"); // read and ignore first value
diff --git a/SIPNETparamsChange/frontend.c b/SIPNETparamsChange/frontend.c
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) {
 
     // do each run, output to fileName#.out
     runNum = 1;
-    while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)) { 
+    while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0) && (strcmp(line, "\r\n") != 0)) { 
       // get next set of parameter values and do next run
       sprintf(outFile, "%s%d.out", argv[optind + 3], runNum);
       out = openFile(outFile, "w");
@@ -199,7 +199,7 @@ int main(int argc, char *argv[]) {
 
     for (k = 0; k < 2; k++) {
       runNum = 1;
-      while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)) { 
+      while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0) && (strcmp(line, "\r\n") != 0)) { 
 	// get next set of parameter values and do next run
 	if (numToSkip > 0) {
 	  strtok(line, " \t"); // read and ignore first value
diff --git a/SIPNETparamsChange/parameterSort.c b/SIPNETparamsChange/parameterSort.c
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
  	
  	while( (fgets(line,256,fileIn) != NULL) | (counter<NUM_PARAMS) )  { 
  	 
-  		if ( (strncmp(line,"*",1)!=0) & (strncmp(line,"\n",1)!=0) ) {
+  		if ( (strncmp(line,"*",1)!=0) & (strncmp(line,"\n",1)!=0) & (strncmp(line,"\r",1)!=0) ) {
   			strcpy(paramList[counter],line);
   			
   			//if (counter==NUM_PARAMETERS-1) strcat(niwots[counter],"\n");
diff --git a/Sites/Niwot/niwot.out b/Sites/Niwot/niwot.out
diff --git a/frontend.c b/frontend.c
@@ -185,24 +185,24 @@ int main(int argc, char *argv[]) {
 
     // first find number of changeable parameters:
     fgets(line, sizeof(line), pChange);
-    strtok(line, " \t\n"); // read and ignore first token -- split on space, tab & newline
+    strtok(line, " \t\n\r"); // read and ignore first token -- split on space, tab, newline & carriage return
     numChangeableParams = 1; // assume at least one changeableParam
-    while (strtok(NULL, " \t\n") != NULL) // now count # of remaining tokens (i.e. # of parameter names)
+    while (strtok(NULL, " \t\n\r") != NULL) // now count # of remaining tokens (i.e. # of parameter names)
       numChangeableParams++;
 
     // now allocate space for array and find the param indices:
     indices = (int *)malloc(numChangeableParams * sizeof(int));
     rewind(pChange);
     fgets(line, sizeof(line), pChange);
-    paramName = strtok(line, " \t\n");  // get the first item
+    paramName = strtok(line, " \t\n\r");  // get the first item
     for (i = 0; i < numChangeableParams; i++)  {
       indices[i] = locateParam(spatialParams, paramName);
       if (indices[i] == -1)  {
 	printf("Invalid parameter '%s'\n", paramName);
 	printf("Please fix first line of %s and re-run\n", mcParamFile);
 	exit(1);
       }
-      paramName = strtok(NULL, " \t\n");  /* get the next item (note: the last time this is called, we'll have paramName = NULL;
+      paramName = strtok(NULL, " \t\n\r");  /* get the next item (note: the last time this is called, we'll have paramName = NULL;
 					   that's okay, because we just ignore it */
     }
 
@@ -212,7 +212,7 @@ int main(int argc, char *argv[]) {
 
       runNum = 1;
       out = NULL;
-      while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)) { 
+      while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0) && (strcmp(line, "\r\n") != 0)) { 
 	// get next set of parameter values and do next run
 
 	if (doMainOutput)  {
@@ -268,7 +268,7 @@ int main(int argc, char *argv[]) {
 
       for (k = 0; k < 2; k++) {
 	runNum = 1;
-	while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)) { 
+	while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0) && (strcmp(line, "\r\n") != 0)) { 
 	  // get next set of parameter values and do next run
 	  if (numToSkip > 0) {
 	    strtok(line, " \t"); // read and ignore first value
diff --git a/frontendGirdle.c b/frontendGirdle.c
@@ -154,7 +154,7 @@ int main(int argc, char *argv[]) {
 
     // do each run, output to fileName#.out
     runNum = 1;
-    while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)) { 
+    while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)  && (strcmp(line, "\r\n") != 0)) { 
       // get next set of parameter values and do next run
       sprintf(outFile, "%s%d.out", argv[optind + 3], runNum);
       out = openFile(outFile, "w");
@@ -202,7 +202,7 @@ int main(int argc, char *argv[]) {
 
     for (k = 0; k < 2; k++) {
       runNum = 1;
-      while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0)) { 
+      while((fgets(line, sizeof(line), pChange) != NULL) && (strcmp(line, "\n") != 0) && (strcmp(line, "\r\n") != 0)) { 
 	// get next set of parameter values and do next run
 	if (numToSkip > 0) {
 	  strtok(line, " \t"); // read and ignore first value
diff --git a/namelistInput.c b/namelistInput.c
@@ -126,7 +126,7 @@ void readNamelistInputs(NamelistInputs *namelistInputs, const char *fileName)  {
 
   
   strcpy(allSeparators, SEPARATORS);
-  strcat(allSeparators, "\n");
+  strcat(allSeparators, "\n\r");
   infile = openFile(fileName, "r");
 
   while(fgets(line, sizeof(line), infile) != NULL)  {  // while not EOF or error
diff --git a/paramchange.c b/paramchange.c
@@ -534,7 +534,7 @@ int countLines(char *fileName) {
 
   f = openFile(fileName, "r");
   numLines = 0;
-  while ((fgets(line, sizeof(line), f) != NULL) && (strcmp(line, "\n") != 0)) // read & ignore
+  while ((fgets(line, sizeof(line), f) != NULL) && (strcmp(line, "\n") != 0) && (strcmp(line, "\r\n") != 0)) // read & ignore
     numLines++;
 
   fclose(f);
diff --git a/spatialParams.c b/spatialParams.c
@@ -198,7 +198,7 @@ void initializeOneSpatialParam(SpatialParams *spatialParams, char *name, double
         spatialParamFile is open and file pointer points to 2nd line (after the numLocs line)
  */
 void readSpatialParams(SpatialParams *spatialParams, FILE *paramFile, FILE *spatialParamFile)  {
-  const char *SEPARATORS = " \t\n"; // characters that can separate values in parameter files
+  const char *SEPARATORS = " \t\n\r"; // characters that can separate values in parameter files
   const char *COMMENT_CHARS = "!";  // comment characters (ignore everything after this on a line)
 
   char line[256];
diff --git a/transpose.c b/transpose.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include "util.h"
 
-#define SEPARATORS " \t\n"  // valid separators between items on a line
+#define SEPARATORS " \t\n\r"  // valid separators between items on a line
 
 
 void usage(char *progName)  {
diff --git a/txttobin.c b/txttobin.c
@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
   numPerLine = 0;
 
   status = strtok(line, " \t");
-  while (status != NULL && strcmp(status, "\n") != 0) { // more tokens that aren't "\n"
+  while (status != NULL && strcmp(status, "\n") != 0 && strcmp(status, "\r\n") != 0) { // more tokens that aren't "\n"
     numPerLine++;
     status = strtok(NULL, " \t"); // find next token, if it exists
   }
diff --git a/util.c b/util.c
@@ -197,7 +197,7 @@ int stripComment(char *line, const char *commentChars)  {
   }
   
   // determine length without any leading blanks
-  lenTrim = strlen(line) - strspn(line, " \t\n");
+  lenTrim = strlen(line) - strspn(line, " \t\n\r");
   return (lenTrim == 0);
 }
   
