From: Clint Adams <schizo@debian.org>
To: Bart Schaefer <schaefer@candle.brasslantern.com>
Cc: zsh-workers@sunsite.auc.dk
Subject: PATCH: files module - PATH_MAX
Date: Tue, 19 Sep 2000 11:23:45 -0400 [thread overview]
Message-ID: <20000919112345.A21076@dman.com> (raw)
In-Reply-To: <1000919031819.ZM30176@candle.brasslantern.com>; from schaefer@candle.brasslantern.com on Tue, Sep 19, 2000 at 03:18:19AM +0000
> Looks good.
This should take care of the last direct dependency on PATH_MAX by the
files module.
Index: Src/Modules/files.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/files.c,v
retrieving revision 1.8
diff -u -r1.8 files.c
--- Src/Modules/files.c 2000/09/18 17:29:07 1.8
+++ Src/Modules/files.c 2000/09/19 15:08:50
@@ -255,14 +255,15 @@
domove(char *nam, MoveFunc move, char *p, char *q, int flags)
{
struct stat st;
- char *qbuf;
- char pbuf[PATH_MAX + 1];
- strcpy(pbuf, unmeta(p));
+ char *pbuf, *qbuf;
+
+ pbuf = ztrdup(unmeta(p));
qbuf = unmeta(q);
if(flags & MV_NODIRS) {
errno = EISDIR;
if(lstat(pbuf, &st) || S_ISDIR(st.st_mode)) {
zwarnnam(nam, "%s: %e", p, errno);
+ zsfree(pbuf);
return 1;
}
}
@@ -270,6 +271,7 @@
int doit = flags & MV_FORCE;
if(S_ISDIR(st.st_mode)) {
zwarnnam(nam, "%s: cannot overwrite directory", q, 0);
+ zsfree(pbuf);
return 1;
} else if(flags & MV_INTER) {
nicezputs(nam, stderr);
@@ -277,8 +279,10 @@
nicezputs(q, stderr);
fputs("'? ", stderr);
fflush(stderr);
- if(!ask())
+ if(!ask()) {
+ zsfree(pbuf);
return 0;
+ }
doit = 1;
} else if((flags & MV_ASKNW) &&
!S_ISLNK(st.st_mode) &&
@@ -289,8 +293,10 @@
fprintf(stderr, "', overriding mode %04o? ",
mode_to_octal(st.st_mode));
fflush(stderr);
- if(!ask())
+ if(!ask()) {
+ zsfree(pbuf);
return 0;
+ }
doit = 1;
}
if(doit && !(flags & MV_ATOMIC))
@@ -298,8 +304,10 @@
}
if(move(pbuf, qbuf)) {
zwarnnam(nam, "%s: %e", p, errno);
+ zsfree(pbuf);
return 1;
}
+ zsfree(pbuf);
return 0;
}
next prev parent reply other threads:[~2000-09-19 15:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-09-18 3:51 PATCH: PATH_MAX and mailstat, part I Clint Adams
2000-09-18 4:09 ` PATCH: PATH_MAX and mailstat, part II Clint Adams
2000-09-18 6:39 ` PATCH: Redo a couple of PATH_MAX changes Bart Schaefer
2000-09-18 17:21 ` PATCH: bin_ln - PATH_MAX Clint Adams
2000-09-19 3:18 ` Bart Schaefer
2000-09-19 15:23 ` Clint Adams [this message]
2000-09-19 16:19 ` PATCH: whence " Clint Adams
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=20000919112345.A21076@dman.com \
--to=schizo@debian.org \
--cc=schaefer@candle.brasslantern.com \
--cc=zsh-workers@sunsite.auc.dk \
/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).