- up to fit 1.23.1

Changed files:
    gammu-etc_dir.patch -> 1.6

diff --git a/gammu-etc_dir.patch b/gammu-etc_dir.patch
index 7378bd315a636153a5aed1d1fb0a6893482b1ddc..90fb09fd659464df4cb3ec370130e8aeff790015 100644 (file)
--- a/gammu-etc_dir.patch
+++ b/gammu-etc_dir.patch
@@ -1,6 +1,7 @@
---- gammu/common/gsmstate.c.orig       2008-12-16 14:11:54.000000000 +0100
-+++ gammu/common/gsmstate.c    2008-12-21 13:59:48.000000000 +0100
-@@ -971,6 +971,7 @@
+diff -burNp gammu-1.23.1/libgammu/gsmstate.c gammu-1.23.1-dud/libgammu/gsmstate.c
+--- gammu-1.23.1/libgammu/gsmstate.c   2009-02-12 15:05:40.000000000 +0100
++++ gammu-1.23.1-dud/libgammu/gsmstate.c       2009-03-14 21:19:03.565653553 +0100
+@@ -1021,6 +1021,7 @@ GSM_Error GSM_FindGammuRC (INI_Section *

  {
        char configfile[PATH_MAX + 1];
        char *envpath;
  {
        char configfile[PATH_MAX + 1];
        char *envpath;


@@ -8,30 +9,27 @@
        GSM_Error error;
  
        *result = NULL;
        GSM_Error error;
  
        *result = NULL;

-@@ -988,14 +989,24 @@
+@@ -1042,6 +1043,15 @@ GSM_Error GSM_FindGammuRC (INI_Section *

        /* Reset as we're using strcat */
        configfile[0] = 0;
  
        /* Reset as we're using strcat */
        configfile[0] = 0;
  

-+      /* Try user etc dir */
-+      home_etc = getenv("HOME_ETC");
-+      if (home_etc) {
-+              strcat(configfile, home_etc);
-+              strcat(configfile, GAMMURC_NAME);
++        /* Try user etc dir */
++        home_etc = getenv("HOME_ETC");
++        if (home_etc) {
++                strcat(configfile, home_etc);
++                strcat(configfile, GAMMURC_NAME);

 +
 +

-+              error = GSM_TryReadGammuRC(configfile, result);
-+              if (error == ERR_NONE) return ERR_NONE;
-+      } else {
++                error = GSM_TryReadGammuRC(configfile, result);
++                if (error == ERR_NONE) return ERR_NONE;
++        } else {

        /* Try user home */
        /* Try user home */

--      envpath  = getenv("HOME");
--      if (envpath) {
-+          envpath  = getenv("HOME");
-+          if (envpath) {
-               strcat(configfile, envpath);
-               strcat(configfile, GAMMURC_NAME);
- 
+       envpath  = getenv("HOME");
+       if (envpath) {
+@@ -1051,6 +1061,7 @@ GSM_Error GSM_FindGammuRC (INI_Section *

                error = GSM_TryReadGammuRC(configfile, result);
                if (error == ERR_NONE) return ERR_NONE;
                error = GSM_TryReadGammuRC(configfile, result);
                if (error == ERR_NONE) return ERR_NONE;

-+          }

        }
        }

++      }

  
  #if defined(WIN32)
  
  #if defined(WIN32)

+       /* Reset as we're using strcat */