summaryrefslogtreecommitdiff
path: root/x11/imwheel/files/patch-util.c
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2004-11-10 23:04:18 +0000
committerPav Lucistnik <pav@FreeBSD.org>2004-11-10 23:04:18 +0000
commit0cd2ecfdb78204951e5b7020a1efefef5856f31d (patch)
tree3ae1e9b37c920941ef9789ff8aa2a0f664cdf50e /x11/imwheel/files/patch-util.c
parentDocument vulnerability in Apache 2 (CAN-2004-0942). (diff)
- Update to 1.0.0.p12
PR: ports/73644 Submitted by: Paul Murphy <paul.murphy@cogeco.ca>
Notes
Notes: svn path=/head/; revision=121340
Diffstat (limited to 'x11/imwheel/files/patch-util.c')
-rw-r--r--x11/imwheel/files/patch-util.c34
1 files changed, 9 insertions, 25 deletions
diff --git a/x11/imwheel/files/patch-util.c b/x11/imwheel/files/patch-util.c
index 890d6fd77cd3..7bac7521304c 100644
--- a/x11/imwheel/files/patch-util.c
+++ b/x11/imwheel/files/patch-util.c
@@ -1,28 +1,12 @@
---- util.c.orig Tue Oct 31 13:06:05 2000
-+++ util.c Sat Jul 19 05:45:59 2003
-@@ -330,11 +330,11 @@
- fclose(f);
- if(pid>0 && useFifo)
- {
-- fprintf(stderr,"\
--ERROR: imwheel is already running or there is a stale pid file
-- check on processes listed below.
-- run with -k to kill running imwheels.
-- remove pid file %s.
-+ fprintf(stderr,"\n\
-+ERROR: imwheel is already running or there is a stale pid file\n\
-+ check on processes listed below.\n\
-+ run with -k to kill running imwheels.\n\
-+ remove pid file %s.\n\
- or run with -p to avoid the pid file altogether.\n",PIDFILE);
- if((f=fopen(PIDFILE,"r")))
- {
-@@ -710,7 +710,7 @@
-
+--- util.c.orig Sun Aug 29 06:21:46 2004
++++ util.c Sun Nov 7 09:10:33 2004
+@@ -735,7 +735,7 @@
+
struct WinAction *getRC()
{
-- char fname[2][1024]={"","/etc/imwheelrc"}, line[1024], *p, *q, winid[1024];
+- char fname[2][1024]={"","/etc/X11/imwheel/imwheelrc"}, line[1024], *p, *q, winid[1024];
+ char fname[2][1024]={"","/usr/X11R6/etc/imwheelrc"}, line[1024], *p, *q, winid[1024];
- int fi,i;
- struct WinAction *newwa=NULL;
- FILE *f=NULL;
+ int fi,i;
+ struct WinAction *newwa=NULL;
+ FILE *f=NULL;
+