From d1a8285f818eb7e5c3d6a05709ea21a808490b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 19 Mar 2018 19:55:58 +0100
Subject: New upstream version 5.1.0

---
 app/bin/dprmfile.c | 65 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

(limited to 'app/bin/dprmfile.c')

diff --git a/app/bin/dprmfile.c b/app/bin/dprmfile.c
index e9cfc80..24250e7 100644
--- a/app/bin/dprmfile.c
+++ b/app/bin/dprmfile.c
@@ -20,19 +20,18 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <time.h>
-#include "track.h"
-#include "i18n.h"
-
+#include <assert.h>
 #include <stdint.h>
+#include <string.h>
+#include <time.h>
 
-#define PARAM_SUBDIR FILE_SEP_CHAR "params"
-
-/****************************************************************************
- *
- * Param File Management
- *
- */
+#include "custom.h"
+#include "fileio.h"
+#include "i18n.h"
+#include "messages.h"
+#include "param.h"
+#include "paths.h"
+#include "track.h"
 
 typedef struct {
 		char * name;
@@ -83,8 +82,9 @@ static BOOL_T UpdateParamFiles( void )
 	long updateTime;
 	long lastTime;
 
-	sprintf( message, "%s%sxtrkcad.upd", libDir, FILE_SEP_CHAR );
-	updateF = fopen( message, "r" );
+	MakeFullpath(&fileNameP, libDir, "xtrkcad.upd", NULL);
+	updateF = fopen( fileNameP, "r" );
+	free(fileNameP);
 	if ( updateF == NULL )
 		return FALSE;
 	if ( fgets( message, sizeof message, updateF ) == NULL ) {
@@ -95,14 +95,15 @@ static BOOL_T UpdateParamFiles( void )
 	updateTime = atol( message );
 	if ( lastTime >= updateTime )
 		return FALSE;
-	sprintf( fileName, "%s%sparams%s", libDir, FILE_SEP_CHAR, FILE_SEP_CHAR );
-	fileNameP = fileName+strlen(fileName);
-	while ( ( fgets( fileNameP, (fileName+sizeof fileName)-fileNameP, updateF ) ) != NULL ) {
-		Stripcr( fileNameP );
-		InfoMessage( _("Updating %s"), fileNameP );
-		paramF = fopen( fileName, "r" );
+
+	while ( ( fgets( fileName, STR_LONG_SIZE, updateF ) ) != NULL ) {
+		Stripcr( fileName );
+		InfoMessage( _("Updating %s"), fileName );
+		MakeFullpath(&fileNameP, libDir, "params", fileName, NULL);
+		paramF = fopen( fileNameP, "r" );
 		if ( paramF == NULL ) {
-			NoticeMessage( MSG_PRMFIL_OPEN_NEW, _("Ok"), NULL, fileName );
+			NoticeMessage( MSG_PRMFIL_OPEN_NEW, _("Ok"), NULL, fileNameP );
+			free(fileNameP);
 			continue;
 		}
 		contents = NULL;
@@ -115,25 +116,29 @@ static BOOL_T UpdateParamFiles( void )
 		}
 		fclose( paramF );
 		if (contents == NULL) {
-			NoticeMessage( MSG_PRMFIL_NO_CONTENTS, _("Ok"), NULL, fileName );
+			NoticeMessage( MSG_PRMFIL_NO_CONTENTS, _("Ok"), NULL, fileNameP );
+			free(fileNameP);
 			continue;
 		}
 		cp = wPrefGetString( "Parameter File Map", contents );
-		wPrefSetString( "Parameter File Map", contents, fileName );
+		wPrefSetString( "Parameter File Map", contents, fileNameP );
 		if (cp!=NULL && *cp!='\0') {
 			/* been there, done that */
+			free(fileNameP);
 			continue;
 		}
 
 		DYNARR_APPEND( paramFileInfo_t, paramFileInfo_da, 10 );
 		curParamFileIndex = paramFileInfo_da.cnt-1;
-		paramFileInfo(curParamFileIndex).name = MyStrdup( fileName );
+		paramFileInfo(curParamFileIndex).name = MyStrdup( fileNameP );
 		curContents = curSubContents = NULL;
 		paramFileInfo(curParamFileIndex).deleted = FALSE;
 		paramFileInfo(curParamFileIndex).valid = TRUE;
 		paramFileInfo(curParamFileIndex).deletedShadow = 
-		paramFileInfo(curParamFileIndex).deleted = !ReadParams( 0, NULL, fileName );
+		paramFileInfo(curParamFileIndex).deleted = !ReadParams( 0, NULL, fileNameP );
 		paramFileInfo(curParamFileIndex).contents = curContents;
+
+		free(fileNameP);
 	}
 	wPrefSetInteger( "file", "updatetime", updateTime );
 	return TRUE;
@@ -194,6 +199,7 @@ EXPORT void RememberParamFiles( void )
 					*cp = ' ';
 			}
 			wPrefSetString( "Parameter File Names", message, contents );
+			wPrefSetString("Parameter File Map", contents, paramFileInfo(fileInx).name);
 		}
 	}
 	sprintf( message, "File%d", fileNo++ );
@@ -278,8 +284,6 @@ EXPORT int LoadParamFile(
 		char ** fileName,
 		void * data )
 {
-	char * cp;
-	char *name;
 	wIndex_t inx;
 	int i = 0;
 
@@ -354,8 +358,6 @@ static void UpdateParamFileButton(
 	wIndex_t selcnt = wListGetSelectedCount( paramFileL );
 	wIndex_t inx, cnt;
 	
-	void * data;
-	
 	// set the default
 	wButtonSetLabel( paramFileActionB, _("Unload"));
 	paramFilePLs[ I_PRMFILACTION ].context = FALSE;
@@ -400,7 +402,6 @@ static void ParamFileAction( void * action )
 	wIndex_t selcnt = wListGetSelectedCount( paramFileL );
 	wIndex_t inx, cnt;
 	wIndex_t fileInx;
-	void * data;
 	unsigned newDeletedState;
 
 	if( action )
@@ -522,8 +523,10 @@ static void DoParamFiles( void * junk )
 			strcpy( curParamDir, dir );
 		else {
 			// in case there is no preference setting, use the installation's param directory as default
-			strcpy( curParamDir, libDir );
-			strcat( curParamDir, PARAM_SUBDIR );
+			char *str;
+			MakeFullpath(&str, libDir, PARAM_SUBDIR, NULL);
+			strcpy( curParamDir, str );
+			free(str);
 		}
 		mtbox_bm = wIconCreateBitMap( mtbox_width, mtbox_height, mtbox_bits, drawColorBlack );
 		chkbox_bm = wIconCreateBitMap( chkbox_width, chkbox_height, chkbox_bits, drawColorBlack );
-- 
cgit v1.2.3