Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: zsh-3.1.6-dev-20
- X-seq: zsh-workers 10239
- From: Tanaka Akira <akr@xxxxxxxxxxx>
- To: zsh-workers@xxxxxxxxxxxxxx (Zsh hackers list)
- Subject: Re: zsh-3.1.6-dev-20
- Date: 25 Mar 2000 10:35:55 +0900
- In-reply-to: Peter Stephenson's message of "Thu, 23 Mar 2000 21:56:33 +0000"
- Mailing-list: contact zsh-workers-help@xxxxxxxxxxxxxx; run by ezmlm
- References: <E12Yc4C-0002qM-00.2000-03-24-21-56-29@xxxxxxxxxxxxxxxxxxxxx>
In article <E12Yc4C-0002qM-00.2000-03-24-21-56-29@xxxxxxxxxxxxxxxxxxxxx>,
Peter Stephenson <pws@xxxxxxxxxxxxxxxxxxxxxxxx> writes:
> I have uploaded
> ftp://ftp.zsh.org/zsh/development/zsh-3.1.6-dev-20.tar.gz
> with the changes listed below. This will need checking quite carefully,
> particularly by people who have submitted a lot of patches (guess who that
> might mean?)
* 10233 is not applied.
* The description for users-hosts-ports is doubled in
Doc/Zsh/compsys.yo. (9913 pointed out this.)
* Src/text.c is different to my version. Where is the change come from?
| Index: Src/text.c
| ===================================================================
| RCS file: /projects/zsh/zsh/Src/text.c,v
| retrieving revision 1.1.1.19
| retrieving revision 1.1.1.18
| diff -u -r1.1.1.19 -r1.1.1.18
| --- Src/text.c 2000/03/25 00:22:02 1.1.1.19
| +++ Src/text.c 2000/03/23 04:11:14 1.1.1.18
| @@ -122,8 +122,7 @@
| tlim = tbuf + tsiz;
| tindent = 1;
| tjob = 0;
| - if (prog->len)
| - gettext2(&s);
| + gettext2(&s);
| *tptr = '\0';
| untokenize(tbuf);
| return tbuf;
| @@ -195,6 +194,9 @@
| struct {
| int par;
| } _cond;
| + struct {
| + Wordcode end;
| + } _subsh;
| } u;
| };
|
| @@ -330,8 +332,10 @@
| if (!s) {
| taddstr("( ");
| tindent++;
| - tpush(code, 1);
| + n = tpush(code, 1);
| + n->u._subsh.end = state->pc + WC_SUBSH_SKIP(code);
| } else {
| + state->pc = s->u._subsh.end;
| tindent--;
| taddstr(" )");
| stack = 1;
| @@ -341,8 +345,10 @@
| if (!s) {
| taddstr("{ ");
| tindent++;
| - tpush(code, 1);
| + n = tpush(code, 1);
| + n->u._subsh.end = state->pc + WC_CURSH_SKIP(code);
| } else {
| + state->pc = s->u._subsh.end;
| tindent--;
| taddstr(" }");
| stack = 1;
* 9988 is applied (by hand because it's encoded by quoted-printable?)
but it has a problem.
| % cvs diff -w -u -r1.1.1.6 -r1.1.1.5 Src/Modules/zpty.c
| Index: Src/Modules/zpty.c
| ===================================================================
| RCS file: /projects/zsh/zsh/Src/Modules/zpty.c,v
| retrieving revision 1.1.1.6
| retrieving revision 1.1.1.5
| diff -u -w -u -r1.1.1.6 -r1.1.1.5
| --- Src/Modules/zpty.c 2000/03/25 00:22:04 1.1.1.6
| +++ Src/Modules/zpty.c 2000/03/14 11:18:00 1.1.1.5
| @@ -165,7 +165,7 @@
|
| #else /* ! __osf__ */
|
| -#if __SVR4
| +#if defined(__SVR4) || defined(sinix)
|
| #include <sys/stropts.h>
|
| @@ -174,11 +174,12 @@
| {
| int mfd, sfd;
| char *name;
| + int ret;
|
| if ((mfd = open("/dev/ptmx", O_RDWR)) < 0)
| return 1;
|
| - if (!(name = ptsname(mfd)) || grantpt(mfd) || unlockpt(mfd)) {
| + if (grantpt(mfd) || unlockpt(mfd) || !(name = ptsname(mfd))) {
| close(mfd);
| return 1;
| }
Since ret is undeclared, it cannot be compiled.
% make
...
gcc -c -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H -DMODULE -Wall -Wno-implicit -Wmissing-prototypes -ggdb -fpic -o zpty..o zpty.c
zpty.c: In function `get_pty':
zpty.c:189: `ret' undeclared (first use in this function)
zpty.c:189: (Each undeclared identifier is reported only once
zpty.c:189: for each function it appears in.)
* zsh-users_2973 is not applied. (Because Geoff is not commented?)
--
Tanaka Akira
Messages sorted by:
Reverse Date,
Date,
Thread,
Author