[9front] [PATCH] patch: fix consecutive deletions

[9front] [PATCH] patch: fix consecutive deletions

[Michael Forney]

Consecutive delete hunks will both have newpath of /dev/null, but we
need to slurp oldpath between these hunks.
---
Proposed fix for the issue I reported on the mailing list a few days
ago. This retains the current patch file selection behavior, though I
still think we should adopt the standard behavior for compatibility
with external patches and tools.

diff 8f1867a19f7ca881a32878dcee08ddce11b5db36 185bd356498369a987e364293f3942e047b99f48
--- a/sys/src/cmd/patch.c
+++ b/sys/src/cmd/patch.c
@@ -556,9 +556,9 @@
 int
 apply(Patch *p, char *fname)
 {
-	char *o, *s, *e, *curfile;
+	char *o, *s, *e, *curfile, *nextfile;
 	int i, osz;
-	Hunk *h;
+	Hunk *h, *prevh;
 	Fbuf f;
 
 	e = nil;
@@ -565,14 +565,26 @@
 	o = nil;
 	osz = 0;
 	curfile = nil;
+	h = nil;
+	prevh = nil;
 	for(i = 0; i < p->nhunk; i++){
 		h = &p->hunk[i];
-		if(curfile == nil || strcmp(curfile, h->newpath) != 0){
+		if(strcmp(h->newpath, "/dev/null") == 0)
+			nextfile = h->oldpath;
+		else
+			nextfile = h->newpath;
+		if(curfile == nil || strcmp(curfile, nextfile) != 0){
+			if(curfile != nil){
+				if(!dryrun)
+					o = append(o, &osz, e, f.buf + f.len);
+				blat(prevh->oldpath, prevh->newpath, o, osz);
+				osz = 0;
+			}
 			if(!dryrun){
 				slurp(&f, h->oldpath);
 				e = f.buf;
 			}
-			curfile = h->newpath;
+			curfile = nextfile;
 		}
 		if(!dryrun){
 			s = e;
@@ -581,12 +593,12 @@
 			o = append(o, &osz, h->new, h->new + h->newlen);
 			e += h->oldlen;
 		}
-		if(i+1 == p->nhunk || strcmp(curfile, p->hunk[i+1].newpath) != 0){
-			if(!dryrun)
-				o = append(o, &osz, e, f.buf + f.len);
-			blat(h->oldpath, h->newpath, o, osz);
-			osz = 0;
-		}
+		prevh = h;
+	}
+	if(curfile != nil){
+		if(!dryrun)
+			o = append(o, &osz, e, f.buf + f.len);
+		blat(h->oldpath, h->newpath, o, osz);
 	}
 	free(o);
 	return 0;

Re: [9front] [PATCH] patch: fix consecutive deletions

[ori]

Quoth Michael Forney <mforney@mforney.org>:
> 
> Consecutive delete hunks will both have newpath of /dev/null, but we
> need to slurp oldpath between these hunks.
> ---
> Proposed fix for the issue I reported on the mailing list a few days
> ago. This retains the current patch file selection behavior, though I
> still think we should adopt the standard behavior for compatibility
> with external patches and tools.

Looks good to me.

Changing our current behavior should be painless -- nothing currently
should depend on it; git/patch is the heaviest user, and it hasn't been
around long enough for a long tail of external scripts to care.

> diff 8f1867a19f7ca881a32878dcee08ddce11b5db36 185bd356498369a987e364293f3942e047b99f48
> --- a/sys/src/cmd/patch.c
> +++ b/sys/src/cmd/patch.c
> @@ -556,9 +556,9 @@
>  int
>  apply(Patch *p, char *fname)
>  {
> -	char *o, *s, *e, *curfile;
> +	char *o, *s, *e, *curfile, *nextfile;
>  	int i, osz;
> -	Hunk *h;
> +	Hunk *h, *prevh;
>  	Fbuf f;
>  
>  	e = nil;
> @@ -565,14 +565,26 @@
>  	o = nil;
>  	osz = 0;
>  	curfile = nil;
> +	h = nil;
> +	prevh = nil;
>  	for(i = 0; i < p->nhunk; i++){
>  		h = &p->hunk[i];
> -		if(curfile == nil || strcmp(curfile, h->newpath) != 0){
> +		if(strcmp(h->newpath, "/dev/null") == 0)
> +			nextfile = h->oldpath;
> +		else
> +			nextfile = h->newpath;
> +		if(curfile == nil || strcmp(curfile, nextfile) != 0){
> +			if(curfile != nil){
> +				if(!dryrun)
> +					o = append(o, &osz, e, f.buf + f.len);
> +				blat(prevh->oldpath, prevh->newpath, o, osz);
> +				osz = 0;
> +			}
>  			if(!dryrun){
>  				slurp(&f, h->oldpath);
>  				e = f.buf;
>  			}
> -			curfile = h->newpath;
> +			curfile = nextfile;
>  		}
>  		if(!dryrun){
>  			s = e;
> @@ -581,12 +593,12 @@
>  			o = append(o, &osz, h->new, h->new + h->newlen);
>  			e += h->oldlen;
>  		}
> -		if(i+1 == p->nhunk || strcmp(curfile, p->hunk[i+1].newpath) != 0){
> -			if(!dryrun)
> -				o = append(o, &osz, e, f.buf + f.len);
> -			blat(h->oldpath, h->newpath, o, osz);
> -			osz = 0;
> -		}
> +		prevh = h;
> +	}
> +	if(curfile != nil){
> +		if(!dryrun)
> +			o = append(o, &osz, e, f.buf + f.len);
> +		blat(h->oldpath, h->newpath, o, osz);
>  	}
>  	free(o);
>  	return 0;