Changeset 43018 for branches/eam_branches/ipp-pstamp-20260421/psModules/src/config/pmConfig.c

Timestamp:

May 11, 2026, 3:21:02 PM (2 months ago)

Author:

eugene

Message:

stiffle excess warnings; plug mem leaks; allow pmConfig to understand ​file:// (like pmConfigConvertFilename)

File:

• branches/eam_branches/ipp-pstamp-20260421/psModules/src/config/pmConfig.c (modified) (1 diff)

branches/eam_branches/ipp-pstamp-20260421/psModules/src/config/pmConfig.c

@@ -1971 +1971 @@
 }
 
+// this function is similar to pmConfigConvertFilename, but that function requires the ipprc to have
+// already been read (since it translates path: entries)
+// XXX EAM : merge duplicate code here
 static psString resolveConfigFile(const char *nameArg)
 {
+    // strip file:// from front of name
+    if (!strncasecmp(nameArg, "file:", strlen("file:"))) {
+        psString newName = psStringCopy(nameArg);
+
+        char *point = newName + strlen("file:");
+        while (*point == '/') {
+            point ++;
+        }
+        char *tmpName = NULL;
+        psStringAppend (&tmpName, "/%s", point);
+        psFree (newName);
+        newName = tmpName;
+
+        if (!checkPath(newName, false, false)) {
+            // let checkPath()'s psError() call float up
+            psError(psErrorCodeLast(), false, "error from checkPath for file:// (%s)", newName);
+            psFree (newName);
+            return NULL;
+        }
+        return newName;
+    }
+
     // if config file name is nebulous path resolve it
     // otherwise just return a copy of the argument