projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(setusershell) [HAVE_FSEEKO]: Use fseek0.
[gnulib.git]
/
lib
/
makepath.c
diff --git
a/lib/makepath.c
b/lib/makepath.c
index
9763b4c
..
1dc5dae
100644
(file)
--- a/
lib/makepath.c
+++ b/
lib/makepath.c
@@
-114,13
+114,9
@@
extern int errno;
# define _(Text) Text
#endif
# define _(Text) Text
#endif
-#ifdef __MSDOS__
-typedef int uid_t;
-typedef int gid_t;
-#endif
-
#include "save-cwd.h"
#include "error.h"
#include "save-cwd.h"
#include "error.h"
+#include "quote.h"
void strip_trailing_slashes ();
void strip_trailing_slashes ();
@@
-178,12
+174,13
@@
make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
if (stat (dir, &stats))
{
if (stat (dir, &stats))
{
- error (0, saved_errno, _("cannot create directory `%s'"), dirpath);
+ error (0, saved_errno, _("cannot create directory %s"),
+ quote (dirpath));
fail = 1;
}
else if (!S_ISDIR (stats.st_mode))
{
fail = 1;
}
else if (!S_ISDIR (stats.st_mode))
{
- error (0, 0, _("
`%s' exists but is not a directory"), dirpath
);
+ error (0, 0, _("
%s exists but is not a directory"), quote (dirpath)
);
fail = 1;
}
else
fail = 1;
}
else
@@
-312,7
+309,7
@@
make_path (const char *argpath,
if (newly_created_dir)
{
if (verbose_fmt_string)
if (newly_created_dir)
{
if (verbose_fmt_string)
- error (0, 0, verbose_fmt_string,
dirpath
);
+ error (0, 0, verbose_fmt_string,
quote (dirpath)
);
if ((owner != (uid_t) -1 || group != (gid_t) -1)
&& chown (basename_dir, owner, group)
if ((owner != (uid_t) -1 || group != (gid_t) -1)
&& chown (basename_dir, owner, group)
@@
-321,7
+318,8
@@
make_path (const char *argpath,
#endif
)
{
#endif
)
{
- error (0, errno, "%s", dirpath);
+ error (0, errno, _("cannot change owner and/or group of %s"),
+ quote (dirpath));
CLEANUP;
return 1;
}
CLEANUP;
return 1;
}
@@
-342,7
+340,8
@@
make_path (const char *argpath,
stat and mkdir process O(n^2) file name components. */
if (do_chdir && chdir (basename_dir) < 0)
{
stat and mkdir process O(n^2) file name components. */
if (do_chdir && chdir (basename_dir) < 0)
{
- error (0, errno, _("cannot chdir to directory, %s"), dirpath);
+ error (0, errno, _("cannot chdir to directory, %s"),
+ quote (dirpath));
CLEANUP;
return 1;
}
CLEANUP;
return 1;
}
@@
-371,7
+370,7
@@
make_path (const char *argpath,
umask (oldmask);
if (verbose_fmt_string != NULL)
umask (oldmask);
if (verbose_fmt_string != NULL)
- error (0, 0, verbose_fmt_string,
dirpath
);
+ error (0, 0, verbose_fmt_string,
quote (dirpath)
);
if (owner != (uid_t) -1 || group != (gid_t) -1)
{
if (owner != (uid_t) -1 || group != (gid_t) -1)
{
@@
-381,7
+380,8
@@
make_path (const char *argpath,
#endif
)
{
#endif
)
{
- error (0, errno, _("cannot chown %s"), dirpath);
+ error (0, errno, _("cannot change owner and/or group of %s"),
+ quote (dirpath));
retval = 1;
}
}
retval = 1;
}
}
@@
-394,7
+394,7
@@
make_path (const char *argpath,
if ((mode & ~S_IRWXUGO)
&& chmod (basename_dir, mode))
{
if ((mode & ~S_IRWXUGO)
&& chmod (basename_dir, mode))
{
- error (0, errno, _("cannot ch
mod %s"), dirpath
);
+ error (0, errno, _("cannot ch
ange permissions of %s"), quote (dirpath)
);
retval = 1;
}
retval = 1;
}
@@
-408,7
+408,8
@@
make_path (const char *argpath,
*(p->dirname_end) = '\0';
if (chmod (dirpath, parent_mode))
{
*(p->dirname_end) = '\0';
if (chmod (dirpath, parent_mode))
{
- error (0, errno, "%s", dirpath);
+ error (0, errno, "cannot change permissions of %s",
+ quote (dirpath));
retval = 1;
}
}
retval = 1;
}
}
@@
-421,7
+422,7
@@
make_path (const char *argpath,
if (!S_ISDIR (stats.st_mode))
{
if (!S_ISDIR (stats.st_mode))
{
- error (0, 0, _("
`%s' exists but is not a directory"), dirpath
);
+ error (0, 0, _("
%s exists but is not a directory"), quote (dirpath)
);
return 1;
}
return 1;
}
@@
-440,12
+441,14
@@
make_path (const char *argpath,
#endif
)
{
#endif
)
{
- error (0, errno, "%s", dirpath);
+ error (0, errno, _("cannot change owner and/or group of %s"),
+ quote (dirpath));
retval = 1;
}
if (chmod (dirpath, mode))
{
retval = 1;
}
if (chmod (dirpath, mode))
{
- error (0, errno, "%s", dirpath);
+ error (0, errno, _("cannot change permissions of %s"),
+ quote (dirpath));
retval = 1;
}
}
retval = 1;
}
}