unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
blob 090f5e99de688d7e3c389fa07f273fb73e920308 1009 bytes (raw)
name: gnu/packages/patches/nvi-file-backup.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 
This patch originates from the Debian project, see https://www.debian.org/

29file_backup.dpatch by  <hesso@pool.math.tu-berlin.de>


Save the intermediate CHAR2INT conversion pointer because that pointer is
reused by later conversions in calls below.

--- nvi-1.81.6.orig/common/exf.c	2009-07-24 11:30:05.962060755 +0200
+++ nvi-1.81.6/common/exf.c	2009-07-24 12:09:57.511311177 +0200
@@ -1092,8 +1092,8 @@
 	size_t blen;
 	int flags, maxnum, nr, num, nw, rfd, wfd, version;
 	char *bp, *estr, *p, *pct, *slash, *t, *wfname, buf[8192];
-	CHAR_T *wp;
-	size_t wlen;
+	CHAR_T *wp, *wp2;
+	size_t wlen, wlen2;
 	size_t nlen;
 	char *d = NULL;
 
@@ -1148,8 +1148,13 @@
 	} else
 		version = 0;
 	CHAR2INT(sp, bname, strlen(bname) + 1, wp, wlen);
-	if (argv_exp2(sp, &cmd, wp, wlen - 1))
+	GET_SPACE_RETW(sp, wp2, wlen2, wlen);
+	MEMCPY(wp2, wp, wlen);
+	if (argv_exp2(sp, &cmd, wp2, wlen2 - 1)) {
+		FREE_SPACEW(sp, wp2, wlen2);
 		return (1);
+	}
+	FREE_SPACEW(sp, wp2, wlen2);
 
 	/*
 	 *  0 args: impossible.

debug log:

solving 090f5e9 ...
found 090f5e9 in https://yhetil.org/guix-devel/54BE9C68.9070103@gmail.com/

applying [1/1] https://yhetil.org/guix-devel/54BE9C68.9070103@gmail.com/
diff --git a/gnu/packages/patches/nvi-file-backup.patch b/gnu/packages/patches/nvi-file-backup.patch
new file mode 100644
index 0000000..090f5e9

1:18: space before tab in indent.
 	size_t blen;
1:19: space before tab in indent.
 	int flags, maxnum, nr, num, nw, rfd, wfd, version;
1:20: space before tab in indent.
 	char *bp, *estr, *p, *pct, *slash, *t, *wfname, buf[8192];
1:25: space before tab in indent.
 	size_t nlen;
1:26: space before tab in indent.
 	char *d = NULL;
Checking patch gnu/packages/patches/nvi-file-backup.patch...
Applied patch gnu/packages/patches/nvi-file-backup.patch cleanly.
warning: squelched 8 whitespace errors
warning: 13 lines add whitespace errors.

index at:
100644 090f5e99de688d7e3c389fa07f273fb73e920308	gnu/packages/patches/nvi-file-backup.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).