From: Ralph Ronnquist <rrq@rrq.au>
Date: Sat, 12 Aug 2023 03:20:24 +0000 (+1000)
Subject: Merge tag '1.1' into debian
X-Git-Tag: p-1.1.1~8
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=3971be267dc2fcae37dc88a5f4d217dac2881b82;hp=ee3f2a47f20e8b428300b061cd0d0183543b2b80;p=rrq%2Ffusefile.git

Merge tag '1.1' into debian
* Allow for fragment pathnames including "/" without range appendix
* Fix index oob in -dump function
---

diff --git a/.gitweb b/.gitweb
new file mode 100644
index 0000000..2c7a849
--- /dev/null
+++ b/.gitweb
@@ -0,0 +1,2 @@
+description = FUSE file mount combining fragments of files as a file.
+category = goodies
diff --git a/fusefile.c b/fusefile.c
index f6d7bc8..9e5cb45 100644
--- a/fusefile.c
+++ b/fusefile.c
@@ -295,8 +295,14 @@ static int RANGE(int s,int n ) {
 static int setup_source(struct Source *p,char *frag) {
     struct stat filestat;
     // Open the fragment file rw if possible, else ro
-    range = strrchr( frag, '/' ); // last '/'
-    p->filename = range? strndup( frag, range - frag ) : frag;
+    // First try the fragment in full, thereafter with range appendix
+    if ( stat( frag, &filestat ) == 0 ) {
+	p->filename = strdup( frag );
+	range = 0;
+    } else {
+	range = strrchr( frag, '/' ); // last '/'
+	p->filename = range? strndup( frag, range - frag ) : frag;
+    }
     p->fd = open( p->filename, O_RDWR );
     int rdonly = 0;
     if ( p->fd < 0 ) {
@@ -307,7 +313,7 @@ static int setup_source(struct Source *p,char *frag) {
 	perror( p->filename );
 	return 1; // Error return
     }
-    if ( stat( p->filename, &filestat ) ) {
+    if ( ( range == 0 ) && stat( p->filename, &filestat ) ) {
 	perror( p->filename );
 	return 1; 
     }
@@ -814,7 +820,7 @@ static int dump_fragments() {
 		     sources.array[ src ].to );
 	    pos = ENDSOURCE( sources.array[ src ] );
 	}
-	if ( sources.array[ src ].start < x ) {
+	if ( ( src < sources.count ) && ( sources.array[ src ].start < x ) ) {
 	    // Dump sources.array[src] up to x;
 	    fprintf( stdout, "%s/%ld:%ld\n",
 		     sources.array[ src ].filename,