Tweaked some whitespace to match the latest version from autoconf.

[rsync/rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index f498547..5cee232 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -26,7 +26,7 @@
 
 #include "rsync.h"
 
-#if !MKNOD_CREATES_SOCKETS && HAVE_SYS_UN_H
+#if !defined MKNOD_CREATES_SOCKETS && defined HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
 
@@ -45,22 +45,22 @@ extern int preserve_perms;
 
 #define RETURN_ERROR_IF_RO_OR_LO RETURN_ERROR_IF(read_only || list_only, EROFS)
 
-int do_unlink(char *fname)
+int do_unlink(const char *fname)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
        return unlink(fname);
 }
 
-int do_symlink(char *fname1, char *fname2)
+int do_symlink(const char *fname1, const char *fname2)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
        return symlink(fname1, fname2);
 }
 
-#if HAVE_LINK
-int do_link(char *fname1, char *fname2)
+#ifdef HAVE_LINK
+int do_link(const char *fname1, const char *fname2)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
@@ -72,7 +72,7 @@ int do_lchown(const char *path, uid_t owner, gid_t group)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
-#ifdef HAVE_LCHOWN
+#ifndef HAVE_LCHOWN
 #define lchown chown
 #endif
        return lchown(path, owner, group);
@@ -82,11 +82,11 @@ 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 !defined MKNOD_CREATES_FIFOS && defined HAVE_MKFIFO
        if (S_ISFIFO(mode))
                return mkfifo(pathname, mode);
 #endif
-#if !MKNOD_CREATES_SOCKETS && HAVE_SYS_UN_H
+#if !defined MKNOD_CREATES_SOCKETS && defined HAVE_SYS_UN_H
        if (S_ISSOCK(mode)) {
                int sock;
                struct sockaddr_un saddr;
@@ -94,7 +94,7 @@ int do_mknod(char *pathname, mode_t mode, dev_t dev)
 
                saddr.sun_family = AF_UNIX;
                len = strlcpy(saddr.sun_path, pathname, sizeof saddr.sun_path);
-#if HAVE_SOCKADDR_UN_LEN
+#ifdef HAVE_SOCKADDR_UN_LEN
                saddr.sun_len = len >= sizeof saddr.sun_path
                              ? sizeof saddr.sun_path : len + 1;
 #endif
@@ -104,24 +104,28 @@ int do_mknod(char *pathname, mode_t mode, dev_t dev)
                    || (bind(sock, (struct sockaddr*)&saddr, sizeof saddr)) < 0)
                        return -1;
                close(sock);
+#ifdef HAVE_CHMOD
                return do_chmod(pathname, mode);
+#else
+               return 0;
+#endif
        }
 #endif
-#if HAVE_MKNOD
+#ifdef HAVE_MKNOD
        return mknod(pathname, mode, dev);
 #else
        return -1;
 #endif
 }
 
-int do_rmdir(char *pathname)
+int do_rmdir(const char *pathname)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
        return rmdir(pathname);
 }
 
-int do_open(char *pathname, int flags, mode_t mode)
+int do_open(const char *pathname, int flags, mode_t mode)
 {
        if (flags != O_RDONLY) {
                RETURN_ERROR_IF(dry_run, 0);
@@ -131,27 +135,33 @@ int do_open(char *pathname, int flags, mode_t mode)
        return open(pathname, flags | O_BINARY, mode);
 }
 
-#if HAVE_CHMOD
+#ifdef HAVE_CHMOD
 int do_chmod(const char *path, mode_t mode)
 {
        int code;
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
-       code = chmod(path, mode);
+       if (S_ISLNK(mode)) {
+#ifdef HAVE_LCHMOD
+               code = lchmod(path, mode & CHMOD_BITS);
+#else
+               code = 1;
+#endif
+       } else
+               code = chmod(path, mode & CHMOD_BITS);
        if (code != 0 && preserve_perms)
            return code;
        return 0;
 }
 #endif
 
-int do_rename(char *fname1, char *fname2)
+int do_rename(const char *fname1, const char *fname2)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
        return rename(fname1, fname2);
 }
 
-
 void trim_trailing_slashes(char *name)
 {
        int l;
@@ -170,7 +180,6 @@ void trim_trailing_slashes(char *name)
        }
 }
 
-
 int do_mkdir(char *fname, mode_t mode)
 {
        if (dry_run) return 0;
@@ -179,14 +188,13 @@ int do_mkdir(char *fname, mode_t mode)
        return mkdir(fname, mode);
 }
 
-
 /* like mkstemp but forces permissions */
 int do_mkstemp(char *template, mode_t perms)
 {
        RETURN_ERROR_IF(dry_run, 0);
        RETURN_ERROR_IF(read_only, EROFS);
 
-#if HAVE_SECURE_MKSTEMP && HAVE_FCHMOD && (!HAVE_OPEN64 || HAVE_MKSTEMP64)
+#if defined HAVE_SECURE_MKSTEMP && defined HAVE_FCHMOD && (!defined HAVE_OPEN64 || defined HAVE_MKSTEMP64)
        {
                int fd = mkstemp(template);
                if (fd == -1)
@@ -198,7 +206,7 @@ int do_mkstemp(char *template, mode_t perms)
                        errno = errno_save;
                        return -1;
                }
-#if HAVE_SETMODE && O_BINARY
+#if defined HAVE_SETMODE && O_BINARY
                setmode(fd, O_BINARY);
 #endif
                return fd;
@@ -212,27 +220,29 @@ int do_mkstemp(char *template, mode_t perms)
 
 int do_stat(const char *fname, STRUCT_STAT *st)
 {
-#if HAVE_OFF64_T
+#ifdef 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
+#ifdef SUPPORT_LINKS
+# ifdef 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
+#ifdef USE_STAT64_FUNCS
        return fstat64(fd, st);
 #else
        return fstat(fd, st);
@@ -241,28 +251,21 @@ int do_fstat(int fd, STRUCT_STAT *st)
 
 OFF_T do_lseek(int fd, OFF_T offset, int whence)
 {
-#if HAVE_OFF64_T
+#ifdef HAVE_LSEEK64
+#if !SIZEOF_OFF64_T
+       OFF_T lseek64();
+#else
        off64_t lseek64();
+#endif
        return lseek64(fd, offset, whence);
 #else
        return lseek(fd, offset, 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
+#ifdef HAVE_BROKEN_READDIR
        return (di->d_name - 2);
 #else
        return di->d_name;