diff options
author | marcus <marcus@FreeBSD.org> | 2004-02-13 06:02:52 +0000 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2004-02-13 06:02:52 +0000 |
commit | c1f1fd5d75c198788d62127daede81d351630473 (patch) | |
tree | 9e65959e59e5cd42e9f818c8148e948084ebefc6 /www/plugger/files | |
parent | 00be60f7d08d81be6af760cbe94079108a292819 (diff) | |
download | FreeBSD-ports-c1f1fd5d75c198788d62127daede81d351630473.zip FreeBSD-ports-c1f1fd5d75c198788d62127daede81d351630473.tar.gz |
Add the correct patch for plugger.c. I accidentally cvs rm'd this patch
instead of the pluggerrc patch, then cvs add'd the old revision, and forgot
to repatch. Long story short, I messed up, and this fixes it.
Reported by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Pointy hat to: me
Diffstat (limited to 'www/plugger/files')
-rw-r--r-- | www/plugger/files/patch-plugger.c | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/www/plugger/files/patch-plugger.c b/www/plugger/files/patch-plugger.c index ee9a2bb..a50ecd7 100644 --- a/www/plugger/files/patch-plugger.c +++ b/www/plugger/files/patch-plugger.c @@ -1,44 +1,11 @@ ---- plugger.c.orig Sun Mar 24 20:58:49 2002 -+++ plugger.c Sun Mar 24 21:06:15 2002 -@@ -437,33 +437,31 @@ - D("find_helper_file '%s'\n",basename); - if((tmp=getenv("HOME")) && strlen(tmp)<8000) - { -- sprintf(fname,"%s/.netscape/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+11+strlen(basename)+1,"%s/.netscape/%s",tmp,basename); - if(cb(fname,data)) return 1; -- sprintf(fname,"%s/.mozilla/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+10+strlen(basename)+1,"%s/.mozilla/%s",tmp,basename); - if(cb(fname,data)) return 1; -- sprintf(fname,"%s/.opera/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+8+strlen(basename)+1,"%s/.opera/%s",tmp,basename); - if(cb(fname,data)) return 1; - } +--- plugger.c.old Wed Feb 11 16:15:56 2004 ++++ plugger.c Wed Feb 11 16:17:04 2004 +@@ -189,7 +189,7 @@ + int signum; + alarm(0); + if(!(THIS->flags & H_DAEMON)) +- setpgrp(); ++ setpgrp(0, 0); - if((tmp=getenv("MOZILLA_HOME")) && strlen(tmp)<8000) - { -- sprintf(fname,"%s/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+1+strlen(basename)+1,"%s/%s",tmp,basename); - if(cb(fname, data)) return 1; - } + for(signum=0;signum<NSIG;signum++) signal(signum, SIG_DFL); - if((tmp=getenv("OPERA_DIR")) && strlen(tmp)<8000) - { -- sprintf(fname,"%s/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+1+strlen(basename)+1,"%s/%s",tmp,basename); - if(cb(fname, data)) return 1; - } - -- sprintf(fname,"/usr/local/netscape/%s",basename); -+ snprintf(fname,strlen(basename)+5+1,"/etc/%s",basename); - if(cb(fname, data)) return 1; -- sprintf(fname,"/etc/%s",basename); -+ snprintf(fname,strlen(basename)+9+1,"/usr/etc/%s",basename); - if(cb(fname, data)) return 1; -- sprintf(fname,"/usr/etc/%s",basename); -- if(cb(fname, data)) return 1; -- sprintf(fname,"/usr/local/etc/%s",basename); -+ snprintf(fname,strlen(basename)+15+1,"/usr/local/etc/%s",basename); - if(cb(fname, data)) return 1; - if(cb(basename, data)) return 1; - |