From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Fri, 26 Nov 2004 21:34:02 +0000 (+0000)
Subject: rename one patch, added blocks fix
X-Git-Url: http://git.rot13.org/?p=Fuse-DBI;a=commitdiff_plain;h=be5fefa8aa14f882f489116ca67e62aa0dbd80f7

rename one patch, added blocks fix


git-svn-id: svn://svn.rot13.org/fuse_dbi/trunk@49 17f4e80c-d0e0-0310-8903-bfc3ae804c12
---

diff --git a/fuse-perl-patch/cvs-20041116.diff b/fuse-perl-patch/cvs-20041116.diff
deleted file mode 100644
index a73c5ff..0000000
--- a/fuse-perl-patch/cvs-20041116.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: Fuse.pm
-===================================================================
-RCS file: /cvsroot/fuse/perl/Fuse.xs,v
-retrieving revision 1.1.1.1
-diff -u -w -r1.1.1.1 Fuse.xs
---- Fuse.xs	11 Nov 2004 15:44:16 -0000	1.1.1.1
-+++ Fuse.xs	16 Nov 2004 15:41:43 -0000
-@@ -2,7 +2,7 @@
- #include "perl.h"
- #include "XSUB.h"
- 
--#include <fuse.h>
-+#include <fuse/fuse.h>
- 
- #undef DEBUGf
- #if 0
-@@ -101,7 +101,7 @@
- 	if(prv) {
- 		rv = POPi;
- 		while(--prv)
--			dirfil(dirh,POPp,0);
-+			dirfil(dirh,POPp,0,0);
- 	} else {
- 		fprintf(stderr,"getdir() handler returned nothing!\n");
- 		rv = -ENOSYS;
-Index: Makefile.PL
-===================================================================
-RCS file: /cvsroot/fuse/perl/Makefile.PL,v
-retrieving revision 1.1.1.1
-diff -u -w -r1.1.1.1 Makefile.PL
---- Makefile.PL	11 Nov 2004 15:44:16 -0000	1.1.1.1
-+++ Makefile.PL	16 Nov 2004 15:41:43 -0000
-@@ -13,5 +13,6 @@
- 	# Insert -I. if you add *.h files later:
-     'INC'		=> '-I../include', # e.g., '-I/usr/include/other'
- 	# Un-comment this if you add C files to link with later:
--    'OBJECT'		=> 'Fuse.o ../lib/.libs/libfuse.a -lpthread', # link all the C files too
-+#    'OBJECT'		=> 'Fuse.o ../lib/.libs/libfuse.a -lpthread', # link all the C files too
-+    'OBJECT'		=> 'Fuse.o -lfuse -lpthread', # link all the C files too
- );
diff --git a/fuse-perl-patch/cvs-api_fix.diff b/fuse-perl-patch/cvs-api_fix.diff
new file mode 100644
index 0000000..a73c5ff
--- /dev/null
+++ b/fuse-perl-patch/cvs-api_fix.diff
@@ -0,0 +1,40 @@
+Index: Fuse.pm
+===================================================================
+RCS file: /cvsroot/fuse/perl/Fuse.xs,v
+retrieving revision 1.1.1.1
+diff -u -w -r1.1.1.1 Fuse.xs
+--- Fuse.xs	11 Nov 2004 15:44:16 -0000	1.1.1.1
++++ Fuse.xs	16 Nov 2004 15:41:43 -0000
+@@ -2,7 +2,7 @@
+ #include "perl.h"
+ #include "XSUB.h"
+ 
+-#include <fuse.h>
++#include <fuse/fuse.h>
+ 
+ #undef DEBUGf
+ #if 0
+@@ -101,7 +101,7 @@
+ 	if(prv) {
+ 		rv = POPi;
+ 		while(--prv)
+-			dirfil(dirh,POPp,0);
++			dirfil(dirh,POPp,0,0);
+ 	} else {
+ 		fprintf(stderr,"getdir() handler returned nothing!\n");
+ 		rv = -ENOSYS;
+Index: Makefile.PL
+===================================================================
+RCS file: /cvsroot/fuse/perl/Makefile.PL,v
+retrieving revision 1.1.1.1
+diff -u -w -r1.1.1.1 Makefile.PL
+--- Makefile.PL	11 Nov 2004 15:44:16 -0000	1.1.1.1
++++ Makefile.PL	16 Nov 2004 15:41:43 -0000
+@@ -13,5 +13,6 @@
+ 	# Insert -I. if you add *.h files later:
+     'INC'		=> '-I../include', # e.g., '-I/usr/include/other'
+ 	# Un-comment this if you add C files to link with later:
+-    'OBJECT'		=> 'Fuse.o ../lib/.libs/libfuse.a -lpthread', # link all the C files too
++#    'OBJECT'		=> 'Fuse.o ../lib/.libs/libfuse.a -lpthread', # link all the C files too
++    'OBJECT'		=> 'Fuse.o -lfuse -lpthread', # link all the C files too
+ );
diff --git a/fuse-perl-patch/cvs-blocks_fix.diff b/fuse-perl-patch/cvs-blocks_fix.diff
new file mode 100644
index 0000000..ca33516
--- /dev/null
+++ b/fuse-perl-patch/cvs-blocks_fix.diff
@@ -0,0 +1,23 @@
+Index: Fuse.xs
+===================================================================
+RCS file: /cvsroot/fuse/perl/Fuse.xs,v
+retrieving revision 1.2
+diff -u -w -r1.2 Fuse.xs
+--- Fuse.xs	18 Nov 2004 13:09:10 -0000	1.2
++++ Fuse.xs	26 Nov 2004 21:32:30 -0000
+@@ -32,14 +32,11 @@
+ 		else
+ 			rv = -ENOENT;
+ 	} else {
++		result->st_blocks = POPi;
+ 		result->st_blksize = POPi;
+ 		result->st_ctime = POPi;
+ 		result->st_mtime = POPi;
+ 		result->st_atime = POPi;
+-		/* What the HELL?  Perl says the blockcount is the last argument.
+-		 * Everything else says the blockcount is the last argument.  So why
+-		 * was it folded into the middle of the list? */
+-		result->st_blocks = POPi;
+ 		result->st_size = POPi;
+ 		result->st_rdev = POPi;
+ 		result->st_gid = POPi;