Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- distinguish downloads and uploads in the syslog messages
[rsync/rsync.git]
/
syscall.c
diff --git
a/syscall.c
b/syscall.c
index
a004d9d
..
c655969
100644
(file)
--- a/
syscall.c
+++ b/
syscall.c
@@
-23,16
+23,21
@@
#include "rsync.h"
extern int dry_run;
#include "rsync.h"
extern int dry_run;
+extern int read_only;
+
+#define CHECK_RO if (read_only) {errno = EROFS; return -1;}
int do_unlink(char *fname)
{
if (dry_run) return 0;
int do_unlink(char *fname)
{
if (dry_run) return 0;
+ CHECK_RO
return unlink(fname);
}
int do_symlink(char *fname1, char *fname2)
{
if (dry_run) return 0;
return unlink(fname);
}
int do_symlink(char *fname1, char *fname2)
{
if (dry_run) return 0;
+ CHECK_RO
return symlink(fname1, fname2);
}
return symlink(fname1, fname2);
}
@@
-40,6
+45,7
@@
int do_symlink(char *fname1, char *fname2)
int do_link(char *fname1, char *fname2)
{
if (dry_run) return 0;
int do_link(char *fname1, char *fname2)
{
if (dry_run) return 0;
+ CHECK_RO
return link(fname1, fname2);
}
#endif
return link(fname1, fname2);
}
#endif
@@
-47,6
+53,7
@@
int do_link(char *fname1, char *fname2)
int do_lchown(const char *path, uid_t owner, gid_t group)
{
if (dry_run) return 0;
int do_lchown(const char *path, uid_t owner, gid_t group)
{
if (dry_run) return 0;
+ CHECK_RO
return lchown(path, owner, group);
}
return lchown(path, owner, group);
}
@@
-54,6
+61,7
@@
int do_lchown(const char *path, uid_t owner, gid_t group)
int do_mknod(char *pathname, mode_t mode, dev_t dev)
{
if (dry_run) return 0;
int do_mknod(char *pathname, mode_t mode, dev_t dev)
{
if (dry_run) return 0;
+ CHECK_RO
return mknod(pathname, mode, dev);
}
#endif
return mknod(pathname, mode, dev);
}
#endif
@@
-61,12
+69,14
@@
int do_mknod(char *pathname, mode_t mode, dev_t dev)
int do_rmdir(char *pathname)
{
if (dry_run) return 0;
int do_rmdir(char *pathname)
{
if (dry_run) return 0;
+ CHECK_RO
return rmdir(pathname);
}
int do_open(char *pathname, int flags, mode_t mode)
{
if (dry_run) return -1;
return rmdir(pathname);
}
int do_open(char *pathname, int flags, mode_t mode)
{
if (dry_run) return -1;
+ CHECK_RO
return open(pathname, flags, mode);
}
return open(pathname, flags, mode);
}
@@
-74,6
+84,7
@@
int do_open(char *pathname, int flags, mode_t mode)
int do_chmod(const char *path, mode_t mode)
{
if (dry_run) return 0;
int do_chmod(const char *path, mode_t mode)
{
if (dry_run) return 0;
+ CHECK_RO
return chmod(path, mode);
}
#endif
return chmod(path, mode);
}
#endif
@@
-81,18
+92,21
@@
int do_chmod(const char *path, mode_t mode)
int do_rename(char *fname1, char *fname2)
{
if (dry_run) return 0;
int do_rename(char *fname1, char *fname2)
{
if (dry_run) return 0;
+ CHECK_RO
return rename(fname1, fname2);
}
int do_mkdir(char *fname, mode_t mode)
{
if (dry_run) return 0;
return rename(fname1, fname2);
}
int do_mkdir(char *fname, mode_t mode)
{
if (dry_run) return 0;
+ CHECK_RO
return mkdir(fname, mode);
}
char *do_mktemp(char *template)
{
if (dry_run) return NULL;
return mkdir(fname, mode);
}
char *do_mktemp(char *template)
{
if (dry_run) return NULL;
+ if (read_only) {errno = EROFS; return NULL;}
return mktemp(template);
}
return mktemp(template);
}
@@
-128,8
+142,18
@@
int do_fstat(int fd, STRUCT_STAT *st)
OFF_T do_lseek(int fd, OFF_T offset, int whence)
{
#if HAVE_OFF64_T
OFF_T do_lseek(int fd, OFF_T offset, int whence)
{
#if HAVE_OFF64_T
+ off64_t lseek64();
return lseek64(fd, offset, whence);
#else
return lseek(fd, offset, whence);
#endif
}
return lseek64(fd, offset, whence);
#else
return lseek(fd, offset, whence);
#endif
}
+
+char *d_name(struct dirent *di)
+{
+#if HAVE_BROKEN_READDIR
+ return (di->d_name - 2);
+#else
+ return di->d_name;
+#endif
+}