Mercurial > hg > aboriginal

changeset 1354:5ec7eb5b96ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove toybox patches, no longer using that in this project.
author Rob Landley <rob@landley.net>
date Sat, 21 May 2011 22:56:09 -0500
parents e948f92964b5
children 71acb8c4611a
files sources/patches/toybox-patch.patch sources/patches/toybox-patch2.patch
diffstat 2 files changed, 0 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/sources/patches/toybox-patch.patch	Wed May 04 02:04:17 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -r 633a5bf9509d toys/patch.c
---- a/toys/patch.c	Wed Jan 06 05:29:53 2010 -0600
-+++ b/toys/patch.c	Tue Jan 26 01:01:20 2010 -0600
-@@ -272,7 +272,7 @@
- 			for (s = patchline+4; *s && *s!='\t'; s++)
- 				if (*s=='\\' && s[1]) s++;
- 			i = atoi(s);
--			if (i && i<=1970)
-+			if (i>1900 && i<=1970)
- 				*name = xstrdup("/dev/null");
- 			else {
- 				*s = 0;
--- a/sources/patches/toybox-patch2.patch	Wed May 04 02:04:17 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-The @@ -1,2 +3,4 @@ lines treat ,1 as implied, so the format isn't regular.
-(Yes, this was designed by the FSF, what gave it away?)
-
-diff -r 35c8beb54800 toys/patch.c
---- a/toys/patch.c	Sun Feb 28 14:11:41 2010 -0600
-+++ b/toys/patch.c	Wed Jun 30 14:26:46 2010 -0500
-@@ -51,7 +51,8 @@
- 	long prefix;
- 
- 	struct double_list *current_hunk;
--	long oldline, oldlen, newline, newlen, linenum;
-+	long oldline, oldlen, newline, newlen;
-+	long linenum;
- 	int context, state, filein, fileout, filepatch, hunknum;
- 	char *tempname;
- )
-@@ -308,14 +309,19 @@
- 			// way the patch man page says, so you have to read the first hunk
- 			// and _guess_.
- 
--		// Start a new hunk?
-+		// Start a new hunk?  Usually @@ -oldline,oldlen +newline,newlen @@
-+		// but a missing ,value means the value is 1.
- 		} else if (state == 1 && !strncmp("@@ -", patchline, 4)) {
- 			int i;
-+			char *s = patchline+4;
- 
--			i = sscanf(patchline+4, "%ld,%ld +%ld,%ld", &TT.oldline,
--						&TT.oldlen, &TT.newline, &TT.newlen);
--			if (i != 4)
--				error_exit("Corrupt hunk %d at %ld\n", TT.hunknum, TT.linenum);
-+			// Read oldline[,oldlen] +newline[,newlen]
-+
-+			TT.oldlen = TT.newlen = 1;
-+			TT.oldline = strtol(s, &s, 10);
-+			if (*s == ',') TT.oldlen=strtol(s+1, &s, 10);
-+			TT.newline = strtol(s+2, &s, 10);
-+			if (*s == ',') TT.newlen = strtol(s+1, &s, 10);
- 
- 			TT.context = 0;
- 			state = 2;
-@@ -323,7 +329,7 @@
- 			// If this is the first hunk, open the file.
- 			if (TT.filein == -1) {
- 				int oldsum, newsum, del = 0;
--				char *s, *name;
-+				char *name;
- 
-  				oldsum = TT.oldline + TT.oldlen;
- 				newsum = TT.newline + TT.newlen;