[SCM] jackeq/master: Refresh 03-pathmax.patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 35e35836191ca64bab6804d1b93ed3165849c984
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Nov 25 17:10:05 2010 +0100

    Refresh 03-pathmax.patch.

diff --git a/debian/patches/03-pathmax.patch b/debian/patches/03-pathmax.patch
index 238641c..76da6c0 100644
--- a/debian/patches/03-pathmax.patch
+++ b/debian/patches/03-pathmax.patch
@@ -1,41 +1,54 @@
 Description: Avoid unconditionalized use of PATH_MAX to fix build failure
  on hurd architecture.
+ The variable conffile is declared but not used.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: https://sourceforge.net/support/tracker.php?aid=3102139
 ---
- src/main.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ src/main.c |   11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
 
 --- jackeq.orig/src/main.c
 +++ jackeq/src/main.c
-@@ -32,8 +32,9 @@ gboolean update_meters(gpointer data);
+@@ -62,11 +62,12 @@ static void help()
  
  int main(int argc, char *argv[])
  {
 -    char rcfile[PATH_MAX], title[128];
 +    char *rcfile, title[128];
      int fd;
+     int run;
+     int sig;
+     sigset_t allsignals;
 +    size_t rcfile_size;
- 
- 
- #ifdef ENABLE_NLS
-@@ -50,7 +51,10 @@ int main(int argc, char *argv[])
+     	
+     int opt;
+     int option_index;
+@@ -153,7 +154,10 @@ int main(int argc, char *argv[])
  
      /* look for the rcfile, if its there parse it */
  
--    snprintf(rcfile, PATH_MAX, "%s/%s", getenv("HOME"), ".jackeqrc");
-+    /* $HOME + 10 + 1 = $HOME + "/.jackeqrc" + '\0' */
-+    rcfile_size = strlen(getenv("HOME")) + 11;
+-    snprintf(rcfile, PATH_MAX, "%s/%s/%s", getenv("HOME"), JACKHOME, JACKRC);
++    /* $HOME + JACKHOME + JACKRC + 3 = $HOME + '/' JACKHOME + '/' + JACKRC + '\0' */
++    rcfile_size = strlen(getenv("HOME")) + strlen(JACKHOME) + strlen(JACKRC) + 3;
 +    rcfile = malloc(rcfile_size);
-+    snprintf(rcfile, rcfile_size, "%s/%s", getenv("HOME"), ".jackeqrc");
-     if ((fd = open(rcfile, O_RDONLY)) >= 0) {	close(fd);
++    snprintf(rcfile, rcfile_size, "%s/%s/%s", getenv("HOME"), JACKHOME, JACKRC);
+     if ((fd = open(rcfile, O_RDONLY)) >= 0) {	
+ 	close(fd);
  	printf("Using jackeqrc file: %s\n", rcfile);
- 	gtk_rc_parse(rcfile);
-@@ -76,6 +80,7 @@ int main(int argc, char *argv[])
+@@ -216,6 +220,7 @@ int main(int argc, char *argv[])
      process_init();
      g_timeout_add(100, update_meters, NULL);
      gtk_main();
 +    free(rcfile);
+     
  
-     return 0;
- }
+     return 0;	
+@@ -252,7 +257,7 @@ void getSettings()
+ //  gsize length;
+   GtkWidget *slider;
+   GtkWidget *button;
+-  char name[255],channelName[255], conffile[PATH_MAX], vname[5];
++  char name[255],channelName[255], *conffile, vname[5];
+   int i,g;
+   
+ //  printf("in getSettings\n"); 

-- 
jackeq packaging