Merge branch 'master' of github.com:epics-modules/autosave

MarkRivers · MarkRivers · commit f62f3c08967b · 2020-01-26T07:43:33.000-06:00
diff --git a/asApp/src/dbrestore.c b/asApp/src/dbrestore.c
@@ -1640,7 +1640,12 @@ static void myDbLoadRecordsHook(const char* fname, const char* macro) {
 					}
 				}
 				n = epicsSnprintf(requestFileCmd, MAXSTRING, "file %s %s", requestFileName, macroString);
-				if (n < MAXSTRING) appendToFile(pitem->filename, requestFileCmd);
+				if (n < MAXSTRING) {
+					appendToFile(pitem->filename, requestFileCmd);
+				} else {
+					printf("myDbLoadRecordsHook: Can't include %s; requestFileCmd is too long (n = %i, MAXSTRING = %i)\n", 
+					requestFileName, n, MAXSTRING);
+				}
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1640,7 +1640,12 @@ static void myDbLoadRecordsHook(const char* fname, const char* macro) {`
`1640`	`1640`	`}`
`1641`	`1641`	`}`
`1642`	`1642`	`n = epicsSnprintf(requestFileCmd, MAXSTRING, "file %s %s", requestFileName, macroString);`
`1643`		`- if (n < MAXSTRING) appendToFile(pitem->filename, requestFileCmd);`
	`1643`	`+ if (n < MAXSTRING) {`
	`1644`	`+ appendToFile(pitem->filename, requestFileCmd);`
	`1645`	`+ } else {`
	`1646`	`+ printf("myDbLoadRecordsHook: Can't include %s; requestFileCmd is too long (n = %i, MAXSTRING = %i)\n",`
	`1647`	`+ requestFileName, n, MAXSTRING);`
	`1648`	`+ }`
`1644`	`1649`	`}`
`1645`	`1650`	`}`
`1646`	`1651`	`}`