From mboxrd@z Thu Jan 1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level:
X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY
autolearn=ham autolearn_force=no version=3.4.4
Received: (qmail 17574 invoked from network); 27 Sep 2022 08:55:13 -0000
Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368)
by inbox.vuxu.org with ESMTPUTF8; 27 Sep 2022 08:55:13 -0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1664268913;
b=pIv7HvV0SjWqfoEGsdeyAe0NaKjx8HrWDGxsYGY/Aw2kPwXP7jOuTkCLAMhSp6kUbycYYw42/M
eJxRbO3FEtSPeWLB9Uf3spLIPK8sxyK+GnwvKnrj7LbOYWAuuMBUv/mzfW+p64X2E/m3Ocy+Hn
xttqHV60swyOw2aVy4BEoMC7e98c0I2SlFWJA0PoqnHQ/Sr4ect/Ln5PgnZsHNmQb+3hak1MmC
LGiKFTYJeExlRe0peqSvQxiA65ETOEE+a07W8j4cj8sbQMEe3AbTh8O4uNPknoAfwPaSfxfM7a
y/crft5AuwEyDyTQV6l0sVbK8se2TwbK15VmX03cSBxYDw==;
ARC-Authentication-Results: i=1; zsh.org;
iprev=pass (smtpq1.tb.ukmail.iss.as9143.net) smtp.remote-ip=212.54.57.96;
dkim=pass header.d=ntlworld.com header.s=meg.feb2017 header.a=rsa-sha256;
dmarc=pass header.from=ntlworld.com;
arc=none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1664268913;
bh=FhxmfkYe0zVYJ9GvwsfpWur5ugXqTBOVHLGoksfCwCQ=;
h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help:
List-Id:Sender:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:
References:In-Reply-To:Message-ID:Cc:To:From:Date:DKIM-Signature:
DKIM-Signature;
b=q7tq1EEp83HpkEXAuXkkAvH2CElt/14eqR4dcmSawKpVmtSf6FgvrkpaiaJmF/wSWoyIcF4hcw
6dZ2qaOKL8Q5a+t8gjWxdvWmEHlxrON4QHrgInIV+hc5A8/91CwXNVGFCqPCDihfMVSDk0vch6
NTjyzhTsjhhM6cml2DSnrCUJ4Fmix9PvTS99XX7EzdjMJqaK/mKhDMfrO9NgT3YT6HW7uFzSuH
HMoF0yS01IJ66pw2eyjAOSt6+SnzeVRB9wXD2O1QvKHjHanYuqOT2tCMHROxMBiPmxvjVEg6zf
1deApW65ltzXUocyLxCWPpVN+jdxoMjnPsO6eS9D8DfW8g==;
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org;
s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:
List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding:
Content-Type:MIME-Version:Subject:References:In-Reply-To:Message-ID:Cc:To:
From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:
Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID;
bh=9zNuEhhjHvVZXmMhhpp0vtG5n9bTi0/ydK73z035Xmk=; b=coyQ7yWH/QzpgMJjsw8lxJ646y
9XkBVkjG5GaFVTZ4h7heeSwIstBnQ4uDQ5MeEKcrZ8fB4dEVQcwWE6nWAknrl1pfZVimanA6TWX+s
6F/moCSpe7kUmxkPCE57+P1C7ph3uXWb+zVJLAhmbgMN2E5s4VPm/B/N5+ABenDEXhYMkhPwkibfB
G2u4osYEL7PkCVwpnuexSxXmYyqVtV7VvAQ0T2zWTyHyOkoS1tSO2vdihIPVIUJkbUULFma1eBVv2
hKmKGQ7Yu6kOylh7eo3ApZdWLxBS4Ak7QTw+wVjCjhcEib8AG52MR5MgDRuR+TurdSMJpJ5s4hrxI
g1Ki/tWQ==;
Received: from authenticated user by zero.zsh.org with local
id 1od6My-000Cjl-Mn;
Tue, 27 Sep 2022 08:55:12 +0000
Authentication-Results: zsh.org;
iprev=pass (smtpq1.tb.ukmail.iss.as9143.net) smtp.remote-ip=212.54.57.96;
dkim=pass header.d=ntlworld.com header.s=meg.feb2017 header.a=rsa-sha256;
dmarc=pass header.from=ntlworld.com;
arc=none
Received: from smtpq1.tb.ukmail.iss.as9143.net ([212.54.57.96]:49396)
by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256)
id 1od6CM-000B12-Uo;
Tue, 27 Sep 2022 08:44:16 +0000
Received: from [212.54.57.80] (helo=smtp1.tb.ukmail.iss.as9143.net)
by smtpq1.tb.ukmail.iss.as9143.net with esmtp (Exim 4.90_1)
(envelope-from
)
id 1od6CM-0006k0-Mm
for zsh-workers@zsh.org; Tue, 27 Sep 2022 10:44:14 +0200
Received: from oxbe8.tb.ukmail.iss.as9143.net ([172.25.160.139])
by smtp1.tb.ukmail.iss.as9143.net with ESMTP
id d6CMoMFMXVu5Xd6CMo7raG; Tue, 27 Sep 2022 10:44:14 +0200
X-Env-Mailfrom: p.w.stephenson@ntlworld.com
X-Env-Rcptto: zsh-workers@zsh.org
X-SourceIP: 172.25.160.139
X-CNFS-Analysis: v=2.4 cv=LNR1/ba9 c=1 sm=1 tr=0 ts=6332b7de cx=a_exe
a=pgSR3NrKiwmx/6vnWRL19w==:117 a=1DWFKdCB1IcA:10 a=IkcTkHD0fZMA:10
a=ZjyAdWuDOD4A:10 a=q2GGsy2AAAAA:8 a=HYshxDoSAAAA:8 a=hPzgEmJK--yj2ivhP-kA:9
a=QEXdDO2ut3YA:10 a=z9dJwno5l634igLiVhy-:22 a=na7qQM7zoEAPfvOk0o6d:22
X-Authenticated-Sender: p.w.stephenson@ntlworld.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ntlworld.com;
s=meg.feb2017; t=1664268254;
bh=FhxmfkYe0zVYJ9GvwsfpWur5ugXqTBOVHLGoksfCwCQ=;
h=Date:From:To:Cc:In-Reply-To:References:Subject;
b=Nqg4C5Z32Uq9r7tvGjcnPpM6/BJVvSUrnu/MfkeR9mxzhiMCp5mE9SW6q1gkfdaWW
8h4diIaQmYwVgLr2m2OYtMgzzZInVJkupKolI9ByDDE+qVq9ITGsysDA2R7kQIarQ/
kFRGiN17HSdvs7/W7vCvtamh++n50yNqfINj0Oue5MEIxP2lds9J9EACUrxdC9PWk+
BAaA4UKr3XyIJm8Gpvx8kV97t00FBeDqsVkkyvODtk7Xj2JapqiXLi4HlRpq7l9QpA
UlkRoV6dF4Vg4xJbL9JfSBF1Dj4lfYQ0mq7KTeozYE1kYgzFFKJYgC2R4rz9yPpwJr
sydv8d88MD9yg==
Date: Tue, 27 Sep 2022 09:44:14 +0100 (BST)
From: Peter Stephenson
To: zsh-workers@zsh.org
Cc: Xiao Ling XL Chen ,
Kui K Zhang
Message-ID: <1142471274.1562947.1664268254401@mail.virginmedia.com>
In-Reply-To:
References:
<6e0e440b-8e26-4a15-8f69-7b393aa6ff13@app.fastmail.com>
Subject: Re: The request of words matter updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Priority: 3
Importance: Normal
X-Mailer: Open-Xchange Mailer
X-Originating-IP: 147.161.224.167
X-Originating-Client: open-xchange-appsuite
X-CMAE-Envelope: MS4xfP0NPrAh4HL5gFRToOz+PD+m3k4A6lbe9XF4oRiYBhvWfWAq4/yUpGNu4KF5+SZgWMDYlWCWw3vpSmGXAQfKmhqjhGy0jqR8nYY8QP4+ZnyvyXmpMx54
D7xj92mgbtePM6wX7OPBNxz1wqJmwLV+5/09YOkwOACROQCz4neDVm5wUzP2GpGR/wl3Wr3caqqMGoro/xGQ0zx63IU42dwy4xQfSuScgWxgsUwwjtkII+Un
T3Ekifn9MXIEZQodoSO1mp+/FfXVxU6xIo3nezBw0E6YnuyZfJ8ai0JyJSWI9M1p
X-Seq: 50672
Archived-At:
X-Loop: zsh-workers@zsh.org
Errors-To: zsh-workers-owner@zsh.org
Precedence: list
Precedence: bulk
Sender: zsh-workers-request@zsh.org
X-no-archive: yes
List-Id:
List-Help:
List-Subscribe:
List-Unsubscribe:
List-Post:
List-Owner:
List-Archive:
> On 27/09/2022 05:22 Bart Schaefer wrote:
>=20
> =20
> On Mon, Sep 26, 2022 at 8:18 PM Lawrence Vel=C3=A1zquez =
wrote:
> >
> > Illumos uses "manager" and "subsidiary"
> > AIX uses "controller" and "worker"
>=20
> Well, that's no fun. It means there's no "term of art" we can adopt.
> On the other hand, I guess, it means we don't have to worry about
> confusing future programmers, because they'll already be confused.
My only comment is that if we pick something unique and do the job
properly this time, then any further update to fit in with standards
is a 30 second automatic replacement. So I don't think it's worth
agonising over.
> In this particular context I'd probably choose something like
> superior/inferior ... neither subsidiary nor worker really fits what
> that half of the PTY pair is doing, IMO. They sound like words chosen
> for a global search-and-replace over a codebase nobody was willing to
> actually read.
So e.g. zsuperior and zinferior would give us that ability (but you may
well be right superior and inferior are good enough --- replacing
master and slave didn't hit any clashes).
pws
diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c
index dfd2a2a7a..b9e3b4050 100644
--- a/Src/Modules/zpty.c
+++ b/Src/Modules/zpty.c
@@ -188,7 +188,7 @@ getptycmd(char *name)
#endif
=20
static int
-get_pty(int master, int *retfd)
+get_pty(int zsuperior, int *retfd)
{
static char *name;
static int mfd, sfd;
@@ -196,7 +196,7 @@ get_pty(int master, int *retfd)
int ret;
#endif
=20
- if (master) {
+ if (zsuperior) {
#ifdef HAVE_POSIX_OPENPT
=09if ((mfd =3D posix_openpt(O_RDWR|O_NOCTTY)) < 0)
#else
@@ -252,7 +252,7 @@ get_pty(int master, int *retfd)
#else /* No /dev/ptmx or no pt functions */
=20
static int
-get_pty(int master, int *retfd)
+get_pty(int zsuperior, int *retfd)
{
=20
#ifdef __linux
@@ -275,7 +275,7 @@ get_pty(int master, int *retfd)
static int mfd, sfd;
char *p1, *p2;
=20
- if (master) {
+ if (zsuperior) {
=09strcpy(name, "/dev/ptyxx");
#if defined(__BEOS__) || defined(__HAIKU__)
=09name[7] =3D '/';
@@ -310,7 +310,7 @@ static int
newptycmd(char *nam, char *pname, char **args, int echo, int nblock)
{
Ptycmd p;
- int master, slave, pid, oineval =3D ineval, ret;
+ int zsuperior, zinferior, pid, oineval =3D ineval, ret;
char *oscriptname =3D scriptname, syncch;
Eprog prog;
=20
@@ -327,7 +327,7 @@ newptycmd(char *nam, char *pname, char **args, int echo=
, int nblock)
=09return 1;
}
=20
- if (get_pty(1, &master)) {
+ if (get_pty(1, &zsuperior)) {
=09zwarnnam(nam, "can't open pseudo terminal: %e", errno);
=09scriptname =3D oscriptname;
=09ineval =3D oineval;
@@ -335,7 +335,7 @@ newptycmd(char *nam, char *pname, char **args, int echo=
, int nblock)
}
if ((pid =3D fork()) =3D=3D -1) {
=09zwarnnam(nam, "can't create pty command %s: %e", pname, errno);
-=09close(master);
+=09close(zsuperior);
=09scriptname =3D oscriptname;
=09ineval =3D oineval;
=09return 1;
@@ -360,9 +360,9 @@ newptycmd(char *nam, char *pname, char **args, int echo=
, int nblock)
=09}
#endif
=20
-=09if (get_pty(0, &slave))
+=09if (get_pty(0, &zinferior))
=09 exit(1);
-=09SHTTY =3D slave;
+=09SHTTY =3D zinferior;
=09attachtty(mypid);
#ifdef TIOCGWINSZ
=09/* Set the window size before associating with the terminal *
@@ -370,10 +370,10 @@ newptycmd(char *nam, char *pname, char **args, int ec=
ho, int nblock)
=09if (interact) {
=09 struct ttyinfo info;
=20
-=09 if (ioctl(slave, TIOCGWINSZ, (char *) &info.winsize) =3D=3D 0) {
+=09 if (ioctl(zinferior, TIOCGWINSZ, (char *) &info.winsize) =3D=3D 0) =
{
=09=09info.winsize.ws_row =3D zterm_lines;
=09=09info.winsize.ws_col =3D zterm_columns;
-=09=09ioctl(slave, TIOCSWINSZ, (char *) &info.winsize);
+=09=09ioctl(zinferior, TIOCSWINSZ, (char *) &info.winsize);
=09 }
=09}
#endif /* TIOCGWINSZ */
@@ -381,7 +381,7 @@ newptycmd(char *nam, char *pname, char **args, int echo=
, int nblock)
=09if (!echo) {
=09 struct ttyinfo info;
=20
-=09 if (!ptygettyinfo(slave, &info)) {
+=09 if (!ptygettyinfo(zinferior, &info)) {
#ifdef HAVE_TERMIOS_H
=09=09info.tio.c_lflag &=3D ~ECHO;
#else
@@ -391,25 +391,25 @@ newptycmd(char *nam, char *pname, char **args, int ec=
ho, int nblock)
=09=09info.tio.lmodes &=3D ~ECHO; /**** dunno if this is right */
#endif
#endif
-=09=09ptysettyinfo(slave, &info);
+=09=09ptysettyinfo(zinferior, &info);
=09 }
=09}
=20
#ifdef TIOCSCTTY
-=09ioctl(slave, TIOCSCTTY, 0);
+=09ioctl(zinferior, TIOCSCTTY, 0);
#endif
=20
=09close(0);
=09close(1);
=09close(2);
=20
-=09dup2(slave, 0);
-=09dup2(slave, 1);
-=09dup2(slave, 2);
+=09dup2(zinferior, 0);
+=09dup2(zinferior, 1);
+=09dup2(zinferior, 2);
=20
=09closem(FDT_UNUSED, 0);
-=09close(slave);
-=09close(master);
+=09close(zinferior);
+=09close(zsuperior);
=09close(coprocin);
=09close(coprocout);
=09init_io(NULL);
@@ -436,22 +436,22 @@ newptycmd(char *nam, char *pname, char **args, int ec=
ho, int nblock)
=09zexit(lastval, ZEXIT_NORMAL);
}
#ifndef USE_CYGWIN_FIX
- master =3D movefd(master);
- if (master =3D=3D -1) {
-=09zerrnam(nam, "cannot duplicate fd %d: %e", master, errno);
+ zsuperior =3D movefd(zsuperior);
+ if (zsuperior =3D=3D -1) {
+=09zerrnam(nam, "cannot duplicate fd %d: %e", zsuperior, errno);
=09scriptname =3D oscriptname;
=09ineval =3D oineval;
=09return 1;
}
#else
- addmodulefd(master, FDT_INTERNAL);
+ addmodulefd(zsuperior, FDT_INTERNAL);
#endif
=20
p =3D (Ptycmd) zalloc(sizeof(*p));
=20
p->name =3D ztrdup(pname);
p->args =3D zarrdup(args);
- p->fd =3D master;
+ p->fd =3D zsuperior;
p->pid =3D pid;
p->echo =3D echo;
p->nblock =3D nblock;
@@ -464,13 +464,13 @@ newptycmd(char *nam, char *pname, char **args, int ec=
ho, int nblock)
ptycmds =3D p;
=20
if (nblock)
-=09ptynonblock(master);
+=09ptynonblock(zsuperior);
=20
scriptname =3D oscriptname;
ineval =3D oineval;
=20
do {
-=09ret =3D read(master, &syncch, 1);
+=09ret =3D read(zsuperior, &syncch, 1);
} while (ret !=3D 1 && (
#ifdef EWOULDBLOCK
=09 errno =3D=3D EWOULDBLOCK ||
@@ -481,7 +481,7 @@ newptycmd(char *nam, char *pname, char **args, int echo=
, int nblock)
#endif
=09 errno =3D=3D EINTR));
=20
- setiparam_no_convert("REPLY", (zlong)master);
+ setiparam_no_convert("REPLY", (zlong)zsuperior);
=20
return 0;
}