In clean_flist(), if a duplicate is found for a dir and a non-dir,

[rsync/rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index cbc5e53..4a31970 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -26,6 +26,10 @@
 
 #include "rsync.h"
 
+#if !MKNOD_CREATES_SOCKETS && HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
 extern int dry_run;
 extern int read_only;
 extern int list_only;
@@ -68,17 +72,47 @@ int do_lchown(const char *path, uid_t owner, gid_t group)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
+#if !HAVE_LCHOWN
+#define lchown chown
+#endif
        return lchown(path, owner, group);
 }
 
-#if HAVE_MKNOD
 int do_mknod(char *pathname, mode_t mode, dev_t dev)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
+#if !MKNOD_CREATES_FIFOS && HAVE_MKFIFO
+       if (S_ISFIFO(mode))
+               return mkfifo(pathname, mode);
+#endif
+#if !MKNOD_CREATES_SOCKETS && HAVE_SYS_UN_H
+       if (S_ISSOCK(mode)) {
+               int sock;
+               struct sockaddr_un saddr;
+               unsigned int len;
+
+               saddr.sun_family = AF_UNIX;
+               len = strlcpy(saddr.sun_path, pathname, sizeof saddr.sun_path);
+#if HAVE_SOCKADDR_UN_LEN
+               saddr.sun_len = len >= sizeof saddr.sun_path
+                             ? sizeof saddr.sun_path : len + 1;
+#endif
+
+               if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0
+                   || (unlink(pathname) < 0 && errno != ENOENT)
+                   || (bind(sock, (struct sockaddr*)&saddr, sizeof saddr)) < 0)
+                       return -1;
+               close(sock);
+               return do_chmod(pathname, mode);
+       }
+#endif
+#if HAVE_MKNOD
        return mknod(pathname, mode, dev);
-}
+#else
+       return -1;
 #endif
+}
 
 int do_rmdir(char *pathname)
 {
@@ -90,7 +124,7 @@ int do_rmdir(char *pathname)
 int do_open(char *pathname, int flags, mode_t mode)
 {
        if (flags != O_RDONLY) {
-               RETURN_ERROR_IF(dry_run, ENOMSG);
+               RETURN_ERROR_IF(dry_run, 0);
                RETURN_ERROR_IF_RO_OR_LO;
        }
 
@@ -149,10 +183,10 @@ int do_mkdir(char *fname, mode_t mode)
 /* like mkstemp but forces permissions */
 int do_mkstemp(char *template, mode_t perms)
 {
-       RETURN_ERROR_IF(dry_run, ENOMSG);
+       RETURN_ERROR_IF(dry_run, 0);
        RETURN_ERROR_IF(read_only, EROFS);
 
-#if defined(HAVE_SECURE_MKSTEMP) && defined(HAVE_FCHMOD)
+#if HAVE_SECURE_MKSTEMP && HAVE_FCHMOD && (!HAVE_OPEN64 || HAVE_MKSTEMP64)
        {
                int fd = mkstemp(template);
                if (fd == -1)
@@ -164,6 +198,9 @@ int do_mkstemp(char *template, mode_t perms)
                        errno = errno_save;
                        return -1;
                }
+#if HAVE_SETMODE && O_BINARY
+               setmode(fd, O_BINARY);
+#endif
                return fd;
        }
 #else
@@ -175,27 +212,29 @@ int do_mkstemp(char *template, mode_t perms)
 
 int do_stat(const char *fname, STRUCT_STAT *st)
 {
-#if HAVE_OFF64_T
+#if USE_STAT64_FUNCS
        return stat64(fname, st);
 #else
        return stat(fname, st);
 #endif
 }
 
-#if SUPPORT_LINKS
 int do_lstat(const char *fname, STRUCT_STAT *st)
 {
-#if HAVE_OFF64_T
+#if SUPPORT_LINKS
+# if USE_STAT64_FUNCS
        return lstat64(fname, st);
-#else
+# else
        return lstat(fname, st);
+# endif
+#else
+       return do_stat(fname, st);
 #endif
 }
-#endif
 
 int do_fstat(int fd, STRUCT_STAT *st)
 {
-#if HAVE_OFF64_T
+#if USE_STAT64_FUNCS
        return fstat64(fd, st);
 #else
        return fstat(fd, st);
@@ -204,7 +243,7 @@ int do_fstat(int fd, STRUCT_STAT *st)
 
 OFF_T do_lseek(int fd, OFF_T offset, int whence)
 {
-#if HAVE_OFF64_T
+#if SIZEOF_OFF64_T
        off64_t lseek64();
        return lseek64(fd, offset, whence);
 #else
@@ -212,17 +251,6 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
 #endif
 }
 
-#ifdef USE_MMAP
-void *do_mmap(void *start, int len, int prot, int flags, int fd, OFF_T offset)
-{
-#if HAVE_OFF64_T
-       return mmap64(start, len, prot, flags, fd, offset);
-#else
-       return mmap(start, len, prot, flags, fd, offset);
-#endif
-}
-#endif
-
 char *d_name(struct dirent *di)
 {
 #if HAVE_BROKEN_READDIR