From: Jon Trulson <jon@radscan.com>
Date: Sun, 28 Dec 2014 00:50:28 +0000 (-0700)
Subject: dtsession/SmGlobals: re-add smGD.savePath to generated paths, was lost in mkstemp... 
X-Git-Tag: 2.2.3~60^2~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=65dcf12c82c8bee2960b3f8928cc7ff71b9645d6;p=oweals%2Fcde.git

dtsession/SmGlobals: re-add smGD.savePath to generated paths, was lost in mkstemp changes.
---

diff --git a/cde/programs/dtsession/SmGlobals.c b/cde/programs/dtsession/SmGlobals.c
index 8a0f68ed..51eeeef9 100644
--- a/cde/programs/dtsession/SmGlobals.c
+++ b/cde/programs/dtsession/SmGlobals.c
@@ -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);