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
This commit is contained in:
Joe Marcus Clarke 2004-02-13 06:02:52 +00:00
parent 34b40b10ef
commit 57e6604e30
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=100819
2 changed files with 10 additions and 42 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= plugger
PORTVERSION= 5.0
PORTREVISION= 1
CATEGORIES= www audio graphics multimedia
MASTER_SITES= http://fredrik.hubbe.net/plugger/

View File

@ -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;