Changeset 19770

Timestamp:

Sep 26, 2008, 5:49:22 PM (18 years ago)

Author:

mwv

Message:

Included <libgen.h> for systems not using GNU <string.h>
Reformated definition of tempName to properly handle "const char*"
and to handle "basename" that may or may not modify the argument passed.
It's a touch ugly, but it should work.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (3 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -6 +6 @@
 #include <unistd.h>
 #include <string.h>
+#include <libgen.h>
 #include <pslib.h>
 #include <psmodules.h>
@@ -193 +194 @@
         return false;
     }
-    const char *tempName = psMetadataLookupStr(NULL, config->arguments, "OUTPUT"); // Name for temporary files
-    tempName = basename(tempName);
+
+    psString outputName = psStringCopy(psMetadataLookupStr(NULL, config->arguments, "OUTPUT")); // Name for temporary files
+    const char *tempName = basename(outputName);
     if (!tempName) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to construct basename for temporary files.");
@@ -393 +395 @@
         weightNames->data[i] = weightName;
     }
+    // Free the outputName that we grabbed above to set up tempName.
+    psFree(outputName);
 
     // Generate convolutions and write them to disk