- updated gettext BR

[packages/gammu.git] / gammu-etc_dir.patch

diff --git a/gammu-etc_dir.patch b/gammu-etc_dir.patch
index 1781540e02afdd46a34e5a537c4986623040f396..bc1a60f3a93e4852f2e4ba0bfee66e043a6338bc 100644 (file)
--- a/gammu-etc_dir.patch
+++ b/gammu-etc_dir.patch
@@ -1,30 +1,35 @@
-diff -Nru gammu/common/gsmstate.c gammu.new/common/gsmstate.c
---- gammu/common/gsmstate.c    Sat Nov 30 20:15:12 2002
-+++ gammu.new/common/gsmstate.c        Sat Mar 29 12:29:07 2003
-@@ -705,6 +705,7 @@
-       CFG_Header      *cfg_info;
-         char          *homedir;
-         char          rcfile[201];
-+      char            *etc_dir;
+--- gammu-1.28.92/libgammu/gsmstate.c~ 2010-10-04 15:28:55.000000000 +0200
++++ gammu-1.28.92/libgammu/gsmstate.c  2010-10-05 11:15:22.047837669 +0200
+@@ -1085,6 +1085,7 @@
+ {
+       char configfile[PATH_MAX + 1];
+       char *envpath;
++      char *home_etc;
+       GSM_Error error;
+ #if defined(HAVE_GETPWUID) && defined(HAVE_GETUID)
+       struct passwd *pwent;
+@@ -1126,6 +1127,16 @@
+               }
+       }
  
- #if defined(WIN32) || defined(DJGPP)
-         homedir = getenv("HOMEDRIVE");
-@@ -713,9 +714,15 @@
-         strncat(rcfile, homedir ? homedir : "", 200);
-         strncat(rcfile, "\\gammurc", 200);
- #else
--        homedir = getenv("HOME");
--        if (homedir) strncpy(rcfile, homedir, 200);
--        strncat(rcfile, "/.gammurc", 200);
-+        etc_dir = getenv("ETC_DIR");
-+        if (etc_dir) {
-+                strncpy(rcfile, etc_dir, 200);
-+                strncat(rcfile, "/gammurc", 200);
-+        } else {
-+                homedir = getenv("HOME");
-+                if (homedir) strncpy(rcfile, homedir, 200);
-+                strncat(rcfile, "/.gammurc", 200);
-+        }
- #endif
++      /* 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 {
++
+       /* Try home from environment */
+       envpath  = getenv("HOME");
+       if (envpath) {
+@@ -1135,6 +1146,7 @@
+               error = GSM_TryReadGammuRC(configfile, result);
+               if (error == ERR_NONE) return ERR_NONE;
+       }
++      }
  
-         if ((cfg_info = CFG_ReadFile(rcfile, false)) == NULL) {
+ #if defined(HAVE_GETPWUID) && defined(HAVE_GETUID)
+       /* Tru home from passwd */