[med-svn] [conquest-dicom-server] 14/17: Created DebianBaseDir pointing to etcdir

[Pablo Lorenzzoni]

This is an automated email from the git hooks/post-receive script.

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit 7a304fe418939217c1f8f604cfb2b47d7030e767
Author: Pablo Lorenzzoni <spectra at debian.org>
Date:   Sun Feb 2 10:09:38 2014 +0000

    Created DebianBaseDir pointing to etcdir
---
 .../0006-Add-DebianBaseDir-at-dgate.cpp.patch      | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch b/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch
new file mode 100644
index 0000000..8f90f0a
--- /dev/null
+++ b/debian/patches/0006-Add-DebianBaseDir-at-dgate.cpp.patch
@@ -0,0 +1,43 @@
+From: Pablo Lorenzzoni <spectra at debian.org>
+Date: Sat, 1 Feb 2014 18:50:39 +0000
+Subject: Add DebianBaseDir at dgate.cpp
+
+---
+ dgate.cpp |   16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/dgate.cpp b/dgate.cpp
+index 61bba6f..cc440aa 100644
+--- a/dgate.cpp
++++ b/dgate.cpp
+@@ -1108,6 +1108,8 @@ char	RootConfig[64]	=	"sscscp";		// main entry in ini file
+ // Later make everything MAX_PATH or similar?
+ char    BaseDir[256] 	=	"";			// where the files are
+ 
++char    DebianBaseDir[256] 	=	"/etc/conquest-dicom-server/";
++
+ #ifndef	UNIX
+ char	ConfigFile[256]	=	".\\dicom.ini";		// name ini file
+ char	DicomDict[256]	=	".\\dgate.dic";		// name dicomdictionary file
+@@ -21109,16 +21111,12 @@ main ( int	argc, char	*argv[] )
+ 			}
+ 		}
+ 
+-	// no -w: set BaseDir to and get ini file from same directory as binary
++	// no -w: set BaseDir to and get ini file from DebianBaseDir
+ 	if (slen == 0)
+-		{ 
+-		if (strrchr(argv[0], PATHSEPCHAR))
+-			{
+-			strcpy(ConfigFile, argv[0]);
+-			*(strrchr(ConfigFile, PATHSEPCHAR) + 1) = 0;
+-			strcpy(BaseDir, ConfigFile);
+-			strcat(ConfigFile, "dicom.ini");
+-			}
++		{
++		strcpy(BaseDir, DebianBaseDir);
++		strcpy(ConfigFile, DebianBaseDir);
++		strcat(ConfigFile, "dicom.ini");
+ 		}
+ 
+ #ifndef UNIX
diff --git a/debian/patches/series b/debian/patches/series
index 4e5b3f9..098eeaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-List-configfiles-with-path-in-dicom.ini.sqlite.patch
 0004-Add-logfiles-location-to-dicom.ini.sqlite.patch
 0005-Separate-option-and-description-in-PrintOptions.patch
+0006-Add-DebianBaseDir-at-dgate.cpp.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git