If the daemon is unable to fork a child to accept a connection, print

[rsync/rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index a8470e1..dbac7dc 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -24,8 +24,9 @@
 
 extern int dry_run;
 extern int read_only;
+extern int list_only;
 
-#define CHECK_RO if (read_only) {errno = EROFS; return -1;}
+#define CHECK_RO if (read_only || list_only) {errno = EROFS; return -1;}
 
 int do_unlink(char *fname)
 {
@@ -75,8 +76,17 @@ int do_rmdir(char *pathname)
 
 int do_open(char *pathname, int flags, mode_t mode)
 {
-       if (dry_run) return -1;
-       CHECK_RO
+       if (flags != O_RDONLY) {
+           if (dry_run) return -1;
+           CHECK_RO
+       }
+#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);
 }
 
@@ -103,11 +113,27 @@ int do_mkdir(char *fname, mode_t mode)
        return mkdir(fname, mode);
 }
 
-char *do_mktemp(char *template)
+/* like mkstemp but forces permissions */
+int do_mkstemp(char *template, mode_t perms)
 {
-       if (dry_run) return NULL;
-       if (read_only) {errno = EROFS; return NULL;}
-       return mktemp(template);
+       if (dry_run) return -1;
+       if (read_only) {errno = EROFS; return -1;}
+
+#if defined(HAVE_SECURE_MKSTEMP) && defined(HAVE_FCHMOD)
+       {
+               int fd = mkstemp(template);
+               if (fd == -1) return -1;
+               if (fchmod(fd, perms) != 0) {
+                       close(fd);
+                       unlink(template);
+                       return -1;
+               }
+               return fd;
+       }
+#else
+       if (!mktemp(template)) return -1;
+       return do_open(template, O_RDWR|O_EXCL|O_CREAT, perms);
+#endif
 }
 
 int do_stat(const char *fname, STRUCT_STAT *st)
@@ -149,7 +175,7 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
 #endif
 }
 
-#if HAVE_MMAP
+#ifdef USE_MMAP
 void *do_mmap(void *start, int len, int prot, int flags, int fd, OFF_T offset)
 {
 #if HAVE_OFF64_T