gnokii ChangeLog common/cfgreader.c

[Pawel Kot]

CVSROOT:        /cvsroot/gnokii
Module name:    gnokii
Changes by:     Pawel Kot <pkot>        06/06/17 20:00:02

Modified files:
        .              : ChangeLog 
        common         : cfgreader.c 

Log message:
        global gnokiirc-file is looked under %SYSTEMROOT%, looking from current 
working directory is a bad idea (Jari Turkia)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnokii/ChangeLog?cvsroot=gnokii&r1=1.1196&r2=1.1197
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/cfgreader.c?cvsroot=gnokii&r1=1.73&r2=1.74

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnokii/gnokii/ChangeLog,v
retrieving revision 1.1196
retrieving revision 1.1197
diff -u -b -r1.1196 -r1.1197
--- ChangeLog   11 Jun 2006 20:41:38 -0000      1.1196
+++ ChangeLog   17 Jun 2006 20:00:01 -0000      1.1197
@@ -50,6 +50,8 @@
       missed calls or dialled numbers)                  (Pawel Kot)
     o support date fields in phonebook export and format them
       sanely in raw format                              (Pawel Kot)
+    o global gnokiirc-file is looked under %SYSTEMROOT%, looking
+      from current working directory is a bad idea    (Jari Turkia)
  * nk6510 driver updates
     o handle calendar extended parameters writing       (Pawel Kot)
     o support for Symbian phones (identifier 'symbian'), generic

Index: common/cfgreader.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/cfgreader.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- common/cfgreader.c  11 Jun 2006 20:41:39 -0000      1.73
+++ common/cfgreader.c  17 Jun 2006 20:00:01 -0000      1.74
@@ -1,6 +1,6 @@
 /*
 
-  $Id: cfgreader.c,v 1.73 2006/06/11 20:41:39 deller Exp $
+  $Id: cfgreader.c,v 1.74 2006/06/17 20:00:01 pkot Exp $
 
   G N O K I I
 
@@ -540,7 +540,12 @@
        char *homedir;
        char rcfile[MAX_PATH_LEN];
 #ifdef WIN32
-       const char globalrc[] = "gnokiirc";
+       char globalrc[MAX_PATH_LEN];
+       char *systemroot;
+
+       systemroot = getenv("SYSTEMROOT");
+       strncpy(globalrc, systemroot ? systemroot : "", MAX_PATH_LEN);
+       strncat(globalrc, "\\gnokiirc", MAX_PATH_LEN);
 
        homedir = getenv("HOMEDRIVE");
        strncpy(rcfile, homedir ? homedir : "", MAX_PATH_LEN);