kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 2.05f.

Browse source
This commit is contained in:
Akinori MUSHA 2004-06-24 16:49:14 +00:00
parent 94b308cb33
commit 73739ff800
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=112153
6 changed files with 15 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shells/fd/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= fd
PORTVERSION= 2.05e
PORTREVISION= 1
PORTVERSION= 2.05f
CATEGORIES= shells
MASTER_SITES= http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
ftp://ftp.unixusers.net/src/fdclone/

4
shells/fd/distinfo
View file

@ -1,2 +1,2 @@
MD5 (FD-2.05e.tar.gz) = 49fb688fcb87e449e19e6c91e199dc5a
SIZE (FD-2.05e.tar.gz) = 662382
MD5 (FD-2.05f.tar.gz) = 4ff49901eb3b024f1ac2bd27ff11a513
SIZE (FD-2.05f.tar.gz) = 664900

15
shells/fd/files/patch-fd.h
View file

@ -1,6 +1,6 @@
--- fd.h.orig Wed May 12 00:00:00 2004
+++ fd.h Wed May 26 19:07:10 2004
@@ -171,11 +171,11 @@
--- fd.h.orig Wed Jun 23 00:00:00 2004
+++ fd.h Fri Jun 25 01:18:25 2004
@@ -159,11 +159,11 @@
****************************************************************/
#define MAXBINDTABLE 256
#define MAXMACROTABLE 64
@ -15,3 +15,12 @@
#if MSDOS
#define MAXCOMMSTR (128 - 2)
#endif
@@ -171,7 +171,7 @@
#define MAXSTACK 5
#define MAXWINDOWS 2
#define MAXHISTNO MAXTYPE(short)
-#define MAXINVOKEARGS 1
+#define MAXINVOKEARGS MAXWINDOWS
#ifdef _NOSPLITWIN
#undef MAXWINDOWS

59
shells/fd/files/patch-pathname.c
View file

@ -1,59 +0,0 @@
--- pathname.c.orig Wed Jun 9 00:00:00 2004
+++ pathname.c Sun Jun 13 01:48:43 2004
@@ -141,7 +141,7 @@
static char *NEAR getenvvar __P_((char *, int));
static int NEAR setvar __P_((char *, char *, int));
-static int NEAR ismeta __P_((char *s, int, int, int));
+static int NEAR ismeta __P_((char *s, int, int, int, int));
#ifdef _NOORIGGLOB
static char *NEAR cnvregexp __P_((char *, int));
#else
@@ -820,9 +820,9 @@
return(s);
}
-static int NEAR ismeta(s, ptr, quote, len)
+static int NEAR ismeta(s, ptr, quote, len, flags)
char *s;
-int ptr, quote, len;
+int ptr, quote, len, flags;
{
#ifdef FAKEMETA
return(0);
@@ -830,7 +830,7 @@
if (s[ptr] != PMETA || quote == '\'') return(0);
if (len >= 0) {
- if (ptr + 1 >= len) return(0);
+ if (!(flags & EA_EOLMETA) && ptr + 1 >= len) return(0);
# ifndef BASHSTYLE
/* bash does not treat "\" as \ */
if (quote == '"' && s[ptr + 1] == quote && ptr + 2 >= len)
@@ -838,7 +838,7 @@
# endif
}
else {
- if (!s[ptr + 1]) return(0);
+ if (!(flags & EA_EOLMETA) && !s[ptr + 1]) return(0);
# ifndef BASHSTYLE
/* bash does not treat "\" as \ */
if (quote == '"' && s[ptr + 1] == quote && !s[ptr + 2])
@@ -884,7 +884,7 @@
re[j++] = s[i];
continue;
}
- else if (ismeta(s, i, '\0', len)) {
+ else if (ismeta(s, i, '\0', len, 0)) {
re[j++] = s[i++];
re[j++] = s[i];
}
@@ -2183,7 +2183,7 @@
#endif
else if (*qp == '\'') return(PC_SQUOTE);
else if (spc && *s == spc) return(*s);
- else if (ismeta(s, 0, *qp, len)) return(PC_META);
+ else if (ismeta(s, 0, *qp, len, flags)) return(PC_META);
#ifdef BASHSTYLE
/* bash can include `...` in "..." */
else if ((flags & EA_BACKQ) && *s == '`') {

10
shells/fd/files/patch-pathname.h
View file

@ -1,10 +0,0 @@
--- pathname.h.orig Wed Jun 9 00:00:00 2004
+++ pathname.h Sun Jun 13 01:47:14 2004
@@ -129,6 +129,7 @@
#define EA_NOEVALQ 0010
#define EA_STRIPQLATER 0020
#define EA_NOUNIQDELIM 0040
+#define EA_EOLMETA 0100
#ifdef NOUID_T
typedef u_short uid_t;

18
shells/fd/files/patch-system.c
View file

@ -1,18 +0,0 @@
--- system.c.orig Wed Jun 9 00:00:00 2004
+++ system.c Sun Jun 13 01:55:23 2004
@@ -5795,11 +5795,12 @@
}
}
- pc = parsechar(&(s[i]), -1,
+ pc = parsechar(&(s[i]), -1, '$', EA_BACKQ | EA_EOLMETA,
#ifdef BASHSTYLE
- '$', EA_BACKQ, &(rp -> new), &(rp -> old));
+ /* bash can include `...` in "..." */
+ &(rp -> new), &(rp -> old));
#else
- '$', EA_BACKQ, &(rp -> new), NULL);
+ &(rp -> new), NULL);
#endif
if (pc == PC_OPQUOTE || pc == PC_CLQUOTE || pc == PC_SQUOTE)