mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
ba4217f718
a/elvis-2.2_0-x86_64-5.txz: Rebuilt.
Don't make /usr/bin/{ex,vi} symlinks.
a/kernel-generic-5.4.11-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.11-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.11-x86_64-1.txz: Upgraded.
a/nvi-1.81.6-x86_64-1.txz: Added.
This is an implementation of the classic ex/vi text editor written by Keith
Bostic. Due to this having UTF8 support which elvis lacks, we'll have it
take over the ex/vi symlinks if they aren't already pointing to a different
choice. Note that the removal of vi/ex symlinks from the elvis and vim
packages might cause your ex/vi symlinks to point to this after all the ex/vi
packages have been upgraded. You can set them to your preferences using
pkgtool -> Setup -> vi-ex.
a/pkgtools-15.0-noarch-29.txz: Rebuilt.
Added an installer/pkgtool menu to select the default ex/vi editor.
ap/vim-8.2.0114-x86_64-1.txz: Upgraded.
Don't make /usr/bin/{ex,vi} symlinks.
d/kernel-headers-5.4.11-x86-1.txz: Upgraded.
d/python-setuptools-45.0.0-x86_64-1.txz: Upgraded.
k/kernel-source-5.4.11-noarch-1.txz: Upgraded.
l/imagemagick-7.0.9_15-x86_64-1.txz: Upgraded.
n/ethtool-5.4-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.2.0114-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
35 lines
1,000 B
Diff
35 lines
1,000 B
Diff
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
## 29file_backup.dpatch by <hesso@pool.math.tu-berlin.de>
|
|
##
|
|
## DP: Save the intermediate CHAR2INT conversion pointer because
|
|
## DP: that pointer is reused by later conversions in calls below.
|
|
|
|
@DPATCH@
|
|
--- 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.
|