dtsession/SmGlobals: re-add smGD.savePath to generated paths, was lost in mkstemp...
authorJon Trulson <jon@radscan.com>
Sun, 28 Dec 2014 00:50:28 +0000 (17:50 -0700)
committerJon Trulson <jon@radscan.com>
Sun, 28 Dec 2014 00:50:28 +0000 (17:50 -0700)
cde/programs/dtsession/SmGlobals.c

index 8a0f68eddc1b700fcf8fbe0e1967b7f19730c6a2..51eeeef96da40f9e7044bd2c8b7b436ee072b1ac 100644 (file)
@@ -1113,10 +1113,13 @@ SetSavePath(
 
                 strcpy(savedOldDir, smGD.etcPath);
 
-                len = strlen(smGD.restoreSession) + strlen("XXXXXX") + 2;
+                len = strlen(smGD.savePath) + strlen(smGD.restoreSession) 
+                  + strlen("XXXXXX") + 3;
                tmpName = (char *) XtCalloc(1, len);
 
-               sprintf(tmpName, "%s.XXXXXX", smGD.restoreSession);
+               sprintf(tmpName, "%s/%s.XXXXXX", smGD.savePath, 
+                        smGD.restoreSession);
+
                 if ((tfd = mkstemp(tmpName)) == -1)
                   {
                     PrintErrnoError(DtError, smNLS.cantCreateDirsString);
@@ -1178,9 +1181,11 @@ SetSavePath(
            {
               int len, tfd;
 
-              len = strlen(smGD.restoreSession) + strlen("XXXXXX") + 2;
+              len = strlen(smGD.savePath) + strlen(smGD.restoreSession) 
+                + strlen("XXXXXX") + 3;
               tmpName = (char *) XtCalloc(1, len);
-              sprintf(tmpName, "%s.XXXXXX", smGD.restoreSession);
+              sprintf(tmpName, "%s/%s.XXXXXX", smGD.savePath, 
+                      smGD.restoreSession);
 
               strcpy (savedOldDir, smGD.etcPath);