Changeset 28217 for trunk/ppSub/src/ppSubDefineOutput.c

Timestamp:

Jun 4, 2010, 9:35:09 AM (16 years ago)

Author:

Paul Price

Message:

Fix ticket 1168: provide basename of files rather than entire path (which gets truncated).

File:

• trunk/ppSub/src/ppSubDefineOutput.c (modified) (1 diff)

trunk/ppSub/src/ppSubDefineOutput.c

@@ -71 +71 @@
     pmFPAfile *refFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.REF"); // Reference file
     pmFPAfile *inFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT"); // Input file
+
+    // We should be using the GNU version of basename() which doesn't modify its argument, but just in case,
+    // we'll copy the string.
+    psString refName = psStringCopy(refFile->filename); // Filename of reference
+    const char *refBase = basename(refName);            // Basename of reference
     psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.REFERENCE", 0,
-                     "Subtraction reference", refFile->filename);
+                     "Subtraction reference", refBase);
+    psFree(refName);
+    psString inName = psStringCopy(inFile->filename);   // Filename of input
+    const char *inBase = basename(inName);              // Basename of input
     psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.INPUT", 0,
-                     "Subtraction input", inFile->filename);
+                     "Subtraction input", inBase);
+    psFree(inName);
+
     ppSubVersionHeader(outHDU->header);
-
 
     outRO->analysis = psMetadataCopy(outRO->analysis, analysis);