extern int dry_run;
extern int read_only;
extern int list_only;
+extern int preserve_perms;
-#define CHECK_RO if (read_only || list_only) {errno = EROFS; return -1;}
+#define RETURN_ERROR_IF(x,e) \
+ do { \
+ if (x) { \
+ errno = (e); \
+ return -1; \
+ } \
+ } while (0)
+
+#define RETURN_ERROR_IF_RO_OR_LO RETURN_ERROR_IF(read_only || list_only, EROFS)
int do_unlink(char *fname)
{
if (dry_run) return 0;
- CHECK_RO
+ RETURN_ERROR_IF_RO_OR_LO;
return unlink(fname);
}
int do_symlink(char *fname1, char *fname2)
{
if (dry_run) return 0;
- CHECK_RO
+ RETURN_ERROR_IF_RO_OR_LO;
return symlink(fname1, fname2);
}
int do_link(char *fname1, char *fname2)
{
if (dry_run) return 0;
- CHECK_RO
+ RETURN_ERROR_IF_RO_OR_LO;
return link(fname1, fname2);
}
#endif
int do_lchown(const char *path, uid_t owner, gid_t group)
{
if (dry_run) return 0;
- CHECK_RO
+ RETURN_ERROR_IF_RO_OR_LO;
return lchown(path, owner, group);
}
int do_mknod(char *pathname, mode_t mode, dev_t dev)
{
if (dry_run) return 0;
- CHECK_RO
+ RETURN_ERROR_IF_RO_OR_LO;
return mknod(pathname, mode, dev);
}
#endif
int do_rmdir(char *pathname)
{
if (dry_run) return 0;
- CHECK_RO
+ RETURN_ERROR_IF_RO_OR_LO;
return rmdir(pathname);
}
int do_open(char *pathname, int flags, mode_t mode)
{
if (flags != O_RDONLY) {
- if (dry_run) return -1;
- CHECK_RO
+ RETURN_ERROR_IF(dry_run, 0);
+ RETURN_ERROR_IF_RO_OR_LO;
}
-#ifdef O_BINARY
- /* for Windows */
- flags |= O_BINARY;
-#endif
- /* some systems can't handle a double / */
- if (pathname[0] == '/' && pathname[1] == '/') pathname++;
- return open(pathname, flags, mode);
+ return open(pathname, flags | O_BINARY, mode);
}
#if HAVE_CHMOD
int do_chmod(const char *path, mode_t mode)
{
+ int code;
if (dry_run) return 0;
- CHECK_RO
- return chmod(path, mode);
+ RETURN_ERROR_IF_RO_OR_LO;
+ code = chmod(path, mode);
+ if (code != 0 && preserve_perms)
+ return code;
+ return 0;
}
#endif
int do_rename(char *fname1, char *fname2)
{
if (dry_run) return 0;
- CHECK_RO
+ RETURN_ERROR_IF_RO_OR_LO;
return rename(fname1, fname2);
}
-int do_mkdir(char *fname, mode_t mode)
+void trim_trailing_slashes(char *name)
{
int l;
- if (dry_run)
- return 0;
- CHECK_RO;
-
/* Some BSD systems cannot make a directory if the name
* contains a trailing slash.
* <http://www.opensource.apple.com/bugs/X/BSD%20Kernel/2734739.html> */
- if ((l = strlen(fname)) && (fname[l-1] == '/'))
- fname[l-1] = '/';
+ /* Don't change empty string; and also we can't improve on
+ * "/" */
+
+ l = strlen(name);
+ while (l > 1) {
+ if (name[--l] != '/')
+ break;
+ name[l] = '\0';
+ }
+}
+
+
+int do_mkdir(char *fname, mode_t mode)
+{
+ if (dry_run) return 0;
+ RETURN_ERROR_IF_RO_OR_LO;
+ trim_trailing_slashes(fname);
return mkdir(fname, mode);
}
/* like mkstemp but forces permissions */
int do_mkstemp(char *template, mode_t perms)
{
- if (dry_run) return -1;
- if (read_only) {errno = EROFS; return -1;}
+ RETURN_ERROR_IF(dry_run, 0);
+ RETURN_ERROR_IF(read_only, EROFS);
#if defined(HAVE_SECURE_MKSTEMP) && defined(HAVE_FCHMOD)
{
int fd = mkstemp(template);
- if (fd == -1) return -1;
- if (fchmod(fd, perms) != 0) {
+ if (fd == -1)
+ return -1;
+ if (fchmod(fd, perms) != 0 && preserve_perms) {
+ int errno_save = errno;
close(fd);
unlink(template);
+ errno = errno_save;
return -1;
}
return fd;
}
#else
- if (!mktemp(template)) return -1;
+ if (!mktemp(template))
+ return -1;
return do_open(template, O_RDWR|O_EXCL|O_CREAT, perms);
#endif
}