Imported Upstream version 7.2.4upstream/7.2.4

2 files changed, 29 insertions, 2 deletions

diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index 0dc505a..6b21bc9 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -802,6 +802,30 @@ nvlstGetParams(struct nvlst *lst, struct cnfparamblk *params,
 }
 
 
+/* check if at least one cnfparamval is actually set 
+ * returns 1 if so, 0 otherwise
+ */
+int
+cnfparamvalsIsSet(struct cnfparamblk *params, struct cnfparamvals *vals)
+{
+	int i;
+
+	if(vals == NULL)
+		return 0;
+	if(params->version != CNFPARAMBLK_VERSION) {
+		dbgprintf("nvlstGetParams: invalid param block version "
+			  "%d, expected %d\n",
+			  params->version, CNFPARAMBLK_VERSION);
+		return 0;
+	}
+	for(i = 0 ; i < params->nParams ; ++i) {
+		if(vals[i].bUsed)
+			return 1;
+	}
+	return 0;
+}
+
+
 void
 cnfparamsPrint(struct cnfparamblk *params, struct cnfparamvals *vals)
 {
@@ -2794,7 +2818,8 @@ cnfDoInclude(char *name)
 	if(result == GLOB_NOSPACE || result == GLOB_ABORTED) {
 		char errStr[1024];
 		rs_strerror_r(errno, errStr, sizeof(errStr));
-		getcwd(cwdBuf, sizeof(cwdBuf));
+		if(getcwd(cwdBuf, sizeof(cwdBuf)) == NULL)
+			strcpy(cwdBuf, "??getcwd() failed??");
 		parser_errmsg("error accessing config file or directory '%s' [cwd:%s]: %s",
 				finalName, cwdBuf, errStr);
 		return 1;
@@ -2805,7 +2830,8 @@ cnfDoInclude(char *name)
 		if(stat(cfgFile, &fileInfo) != 0) {
 			char errStr[1024];
 			rs_strerror_r(errno, errStr, sizeof(errStr));
-			getcwd(cwdBuf, sizeof(cwdBuf));
+			if(getcwd(cwdBuf, sizeof(cwdBuf)) == NULL)
+				strcpy(cwdBuf, "??getcwd() failed??");
 			parser_errmsg("error accessing config file or directory '%s' "
 					"[cwd: %s]: %s", cfgFile, cwdBuf, errStr);
 			return 1;
diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h
index 5cfce79..59ce53f 100644
--- a/grammar/rainerscript.h
+++ b/grammar/rainerscript.h
@@ -313,6 +313,7 @@ int cnfparamGetIdx(struct cnfparamblk *params, char *name);
 struct cnfparamvals* nvlstGetParams(struct nvlst *lst, struct cnfparamblk *params,
 	       struct cnfparamvals *vals);
 void cnfparamsPrint(struct cnfparamblk *params, struct cnfparamvals *vals);
+int cnfparamvalsIsSet(struct cnfparamblk *params, struct cnfparamvals *vals);
 void varDelete(struct var *v);
 void cnfparamvalsDestruct(struct cnfparamvals *paramvals, struct cnfparamblk *blk);
 struct cnfstmt * cnfstmtNew(unsigned s_type);