From 65dcf12c82c8bee2960b3f8928cc7ff71b9645d6 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 27 Dec 2014 17:50:28 -0700 Subject: [PATCH] dtsession/SmGlobals: re-add smGD.savePath to generated paths, was lost in mkstemp changes. --- cde/programs/dtsession/SmGlobals.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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); -- 2.25.1