From: Ralph Ronnquist <rrq@rrq.au>
Date: Thu, 3 Aug 2023 11:02:39 +0000 (+1000)
Subject: Merge branch 'master' into debian; correcting fragment ranges to be 64-bit.
X-Git-Tag: p-1.1.1~9
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=ee3f2a47f20e8b428300b061cd0d0183543b2b80;hp=926faaaa64a47215df843936eeb2a2e6142d46a2;p=rrq%2Ffusefile.git

Merge branch 'master' into debian; correcting fragment ranges to be 64-bit.
---

diff --git a/debian/changelog b/debian/changelog
index 2005620..2cee7fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fusefile (1.1-1) unstable; urgency=medium
+
+  * Corrected fragment ranges to be 64-bit (long int)
+
+ -- Ralph Ronnquist <rrq@rrq.au>  Thu, 03 Aug 2023 21:02:13 +1000
+
 fusefile (1.0-1) unstable; urgency=medium
 
   * Version change for submission to debian
diff --git a/fusefile.c b/fusefile.c
index 5f7850b..f6d7bc8 100644
--- a/fusefile.c
+++ b/fusefile.c
@@ -327,21 +327,21 @@ static int setup_source(struct Source *p,char *frag) {
     p->to = filestat.st_size;
     // Process any range variation
     if ( range && *(++range) ) {
-	int a,b;
+	long int a,b;
 	if ( 0 ) {
-	} else if ( RANGE( sscanf( range, "%d:%d%n", &a, &b, &c ), 2 )) {
+	} else if ( RANGE( sscanf( range, "%ld:%ld%n", &a, &b, &c ), 2 )) {
 	    p->from = ( a < 0 )? ( p->to + a ) : a;
 	    p->to = ( b < 0 )? ( p->to + b ) : b;
-	} else if ( RANGE( sscanf( range, "%d+%d%n", &a, &b, &c ), 2 )) {
+	} else if ( RANGE( sscanf( range, "%ld+%ld%n", &a, &b, &c ), 2 )) {
 	    p->from = ( a < 0 )? ( p->to + a ) : a;
 	    p->to = ( ( b < 0 )? p->to : p->from ) + b;
-	} else if ( RANGE( sscanf( range, "%d+%n", &a, &c ), 1 )) {
+	} else if ( RANGE( sscanf( range, "%ld+%n", &a, &c ), 1 )) {
 	    p->from = ( a < 0 )? ( p->to + a ) : a;
-	} else if ( RANGE( sscanf( range, ":%d%n", &b, &c ), 1 )) {
+	} else if ( RANGE( sscanf( range, ":%ld%n", &b, &c ), 1 )) {
 	    p->to = ( b < 0 )? ( p->to + b ) : b;
-	} else if ( RANGE( sscanf( range, "%d:%n", &a, &c ), 1 )) {
+	} else if ( RANGE( sscanf( range, "%ld:%n", &a, &c ), 1 )) {
 	    p->from = ( a < 0 )? ( p->to + a ) : a;
-	} else if ( RANGE( sscanf( range, "%d%n", &a, &c ), 1 )) {
+	} else if ( RANGE( sscanf( range, "%ld%n", &a, &c ), 1 )) {
 	    if ( a >= 0 ) {
 		p->from = a;
 	    } else {