summaryrefslogtreecommitdiff
path: root/lib/mkancesdirs.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2006-10-07 07:07:34 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2006-10-07 07:07:34 +0000
commit0250386985b837c967b3682affd27965a0bc9d6d (patch)
treeba2e0b2d7f21b80f3d97ac7081aa7461a34984c0 /lib/mkancesdirs.c
parent1e875448fb068c888a8c7cb8108369ac365bcf63 (diff)
downloadgnulib-0250386985b837c967b3682affd27965a0bc9d6d.tar.gz
* mkancesdirs.c (mkancesdirs): Pass to MAKE_DIR both the full file
name (relative to the original working directory) and the file name component (relative to the temporary working directory). All callers changed. * mkancesdirs.h (mkancesdirs): Adjust prototype to match. * mkdir-p.c (make_dir_parents): Likewise. * mkdir-p.h (make_dir_parents): Likewise. SCALAR(0x827b260) 2006-10-06 Bruno Haible <bruno@clisp.org>
Diffstat (limited to 'lib/mkancesdirs.c')
-rw-r--r--lib/mkancesdirs.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/mkancesdirs.c b/lib/mkancesdirs.c
index efdabb4fad..19f7dca5bc 100644
--- a/lib/mkancesdirs.c
+++ b/lib/mkancesdirs.c
@@ -42,12 +42,12 @@
savewd.
Create any ancestor directories that don't already exist, by
- invoking MAKE_DIR (COMPONENT, MAKE_DIR_ARG). This function should
- return 0 if successful and the resulting directory is readable, 1
- if successful but the resulting directory might not be readable, -1
- (setting errno) otherwise. If COMPONENT is relative, it is
- relative to the temporary working directory, which may differ from
- *WD.
+ invoking MAKE_DIR (FILE, COMPONENT, MAKE_DIR_ARG). This function
+ should return 0 if successful and the resulting directory is
+ readable, 1 if successful but the resulting directory might not be
+ readable, -1 (setting errno) otherwise. If COMPONENT is relative,
+ it is relative to the temporary working directory, which may differ
+ from *WD.
Ordinarily MAKE_DIR is executed with the working directory changed
to reflect the already-made prefix, and mkancesdirs returns with
@@ -66,7 +66,7 @@
ptrdiff_t
mkancesdirs (char *file, struct savewd *wd,
- int (*make_dir) (char const *, void *),
+ int (*make_dir) (char const *, char const *, void *),
void *make_dir_arg)
{
/* Address of the previous directory separator that follows an
@@ -114,7 +114,7 @@ mkancesdirs (char *file, struct savewd *wd,
&& component[0] == '.' && component[1] == '.')
made_dir = false;
else
- switch (make_dir (component, make_dir_arg))
+ switch (make_dir (file, component, make_dir_arg))
{
case -1:
make_dir_errno = errno;