From: Bart Schaefer <schaefer@brasslantern.com>
To: Kyle Laker <kyle@laker.email>
Cc: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: [PATCH] Re: `pwd -P` with systemd-homed causes inconsistent cwd state
Date: Sun, 5 Nov 2023 13:10:06 -0800 [thread overview]
Message-ID: <CAH+w=7ae_dBPXdkzOYTy8w3rVGo=5-bksCVyKE28+FAMUOKH6g@mail.gmail.com> (raw)
In-Reply-To: <CAH+w=7Zi3-HV3EUSommNJbrDQSd5H6aOttWjJ0DejyreGUeGGQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
On Sun, Nov 5, 2023 at 8:17 AM Bart Schaefer <schaefer@brasslantern.com> wrote:
>
> I'll put something together a bit later today, but in the meantime
> would be interested in feedback from anyone else who has a better idea
> how we arrived at this state (and possible what really is going on in
> lchdir() ...).
The attached passes "make check" for me with all sensible**
permutations of HAVE_GETCWD and USE_GETCWD. If someone else can check
the __CYGWIN__ case that would be great.
** That is, I didn't try defined(USE_GETCWD) && !defined(HAVE_GETCWD)
Kyle?
[-- Attachment #2: zgetdir-lost2.txt --]
[-- Type: text/plain, Size: 3031 bytes --]
diff --git a/Src/compat.c b/Src/compat.c
index 817bb4aaf..8b31ad9f4 100644
--- a/Src/compat.c
+++ b/Src/compat.c
@@ -342,36 +342,69 @@ zopenmax(void)
mod_export char *
zgetdir(struct dirsav *d)
{
- char nbuf[PATH_MAX+3];
char *buf;
+#if defined(HAVE_GETCWD) || defined(__CYGWIN__)
+ char *cwdbuf;
+#endif
+#if defined(USE_GETCWD) || defined(__CYGWIN__)
+#ifdef GETCWD_CALLS_MALLOC
+ if ((cwdbuf = getcwd(NULL, 0))) {
+ buf = dupstring(cwdbuf);
+ free(cwdbuf);
+ } else
+ buf = NULL;
+#else
+ cwdbuf = zalloc(PATH_MAX+1);
+ if ((buf = getcwd(cwdbuf, PATH_MAX)))
+ buf = dupstring(buf);
+ zfree(cwdbuf, PATH_MAX+1);
+#endif /* GETCWD_CALLS_MALLOC */
+ if (d && buf)
+ return d->dirname = ztrdup(buf);
+ else
+ return buf;
+#else /* !USE_GETCWD && !__CYGWIN__ */
int bufsiz, pos;
- struct stat sbuf;
- ino_t pino;
- dev_t pdev;
-#if !defined(__CYGWIN__) && !defined(USE_GETCWD)
+ char nbuf[PATH_MAX+3];
struct dirent *de;
DIR *dir;
- dev_t dev;
- ino_t ino;
+ struct stat sbuf;
+ ino_t pino, ino;
+ dev_t pdev, dev;
int len;
-#endif
+ strcpy(nbuf, "../");
+ if (stat(".", &sbuf) == 0) {
+ /* Record the initial inode and device */
+ pino = sbuf.st_ino;
+ pdev = sbuf.st_dev;
+ if (d)
+ d->ino = pino, d->dev = pdev;
+ }
+#ifdef HAVE_GETCWD
+ else {
+#ifdef GETCWD_CALLS_MALLOC
+ if ((cwdbuf = getcwd(NULL, 0))) {
+ buf = dupstring(cwdbuf);
+ free(cwdbuf);
+ } else
+ buf = NULL;
+#else
+ cwdbuf = zalloc(PATH_MAX+1);
+ if ((buf = getcwd(cwdbuf, PATH_MAX)))
+ buf = dupstring(buf);
+ zfree(cwdbuf, PATH_MAX+1);
+#endif /* GETCWD_CALLS_MALLOC */
+ return buf; /* NULL when stat() and getcwd() both failed */
+ }
+#endif
+ /* stat() succeeded */
buf = zhalloc(bufsiz = PATH_MAX+1);
pos = bufsiz - 1;
buf[pos] = '\0';
- strcpy(nbuf, "../");
- if (stat(".", &sbuf) < 0) {
- return NULL;
- }
- /* Record the initial inode and device */
- pino = sbuf.st_ino;
- pdev = sbuf.st_dev;
- if (d)
- d->ino = pino, d->dev = pdev;
-#if !defined(__CYGWIN__) && !defined(USE_GETCWD)
#ifdef HAVE_FCHDIR
- else
+ if (!d)
#endif
holdintr();
@@ -487,18 +520,6 @@ zgetdir(struct dirsav *d)
zchdir(buf + pos + 1);
noholdintr();
-#else /* __CYGWIN__, USE_GETCWD cases */
-
- if (!getcwd(buf, bufsiz)) {
- if (d) {
- return NULL;
- }
- } else {
- if (d) {
- return d->dirname = ztrdup(buf);
- }
- return buf;
- }
#endif
/*
@@ -526,23 +547,6 @@ mod_export char *
zgetcwd(void)
{
char *ret = zgetdir(NULL);
-#ifdef HAVE_GETCWD
- if (!ret) {
-#ifdef GETCWD_CALLS_MALLOC
- char *cwd = getcwd(NULL, 0);
- if (cwd) {
- ret = dupstring(cwd);
- free(cwd);
- }
-#else
- char *cwdbuf = zalloc(PATH_MAX+1);
- ret = getcwd(cwdbuf, PATH_MAX);
- if (ret)
- ret = dupstring(ret);
- zfree(cwdbuf, PATH_MAX+1);
-#endif /* GETCWD_CALLS_MALLOC */
- }
-#endif /* HAVE_GETCWD */
if (!ret)
ret = unmeta(pwd);
if (!ret || *ret == '\0')
next prev parent reply other threads:[~2023-11-05 21:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-21 3:18 Kyle Laker
2023-10-21 4:05 ` Bart Schaefer
2023-10-21 16:26 ` Kyle Laker
2023-10-22 18:59 ` Bart Schaefer
2023-10-31 3:46 ` [PATCH] " Bart Schaefer
2023-11-02 2:54 ` Kyle Laker
2023-11-03 4:28 ` Bart Schaefer
2023-11-05 14:16 ` Kyle Laker
2023-11-05 16:17 ` Bart Schaefer
2023-11-05 21:10 ` Bart Schaefer [this message]
2023-11-20 22:23 ` Jan Alexander Steffens (heftig)
2023-11-23 17:53 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAH+w=7ae_dBPXdkzOYTy8w3rVGo=5-bksCVyKE28+FAMUOKH6g@mail.gmail.com' \
--to=schaefer@brasslantern.com \
--cc=kyle@laker.email \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).