X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d11f5c6e2b0c813136519e39820055cd73cfe463..b3bf9b9df95137a3a43248be9599d919b04877af:/syscall.c diff --git a/syscall.c b/syscall.c index 48c7e901..cfabc3eb 100644 --- a/syscall.c +++ b/syscall.c @@ -1,39 +1,40 @@ -/* - Copyright (C) Andrew Tridgell 1998 - Copyright (C) 2002 by Martin Pool - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -/** - * @file syscall.c - * +/* * Syscall wrappers to ensure that nothing gets done in dry_run mode * and to handle system peculiarities. - **/ + * + * Copyright (C) 1998 Andrew Tridgell + * Copyright (C) 2002 Martin Pool + * Copyright (C) 2003-2009 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, visit the http://fsf.org website. + */ #include "rsync.h" #if !defined MKNOD_CREATES_SOCKETS && defined HAVE_SYS_UN_H #include #endif +#ifdef HAVE_SYS_ATTR_H +#include +#endif extern int dry_run; +extern int am_root; extern int read_only; extern int list_only; extern int preserve_perms; +extern int preserve_executability; #define RETURN_ERROR_IF(x,e) \ do { \ @@ -45,14 +46,14 @@ 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; @@ -60,7 +61,7 @@ int do_symlink(char *fname1, char *fname2) } #ifdef HAVE_LINK -int do_link(char *fname1, char *fname2) +int do_link(const char *fname1, const char *fname2) { if (dry_run) return 0; RETURN_ERROR_IF_RO_OR_LO; @@ -78,10 +79,19 @@ int do_lchown(const char *path, uid_t owner, gid_t group) return lchown(path, owner, group); } -int do_mknod(char *pathname, mode_t mode, dev_t dev) +int do_mknod(const char *pathname, mode_t mode, dev_t dev) { if (dry_run) return 0; RETURN_ERROR_IF_RO_OR_LO; + + /* For --fake-super, we create a normal file with mode 0600. */ + if (am_root < 0) { + int fd = open(pathname, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR); + if (fd < 0 || close(fd) < 0) + return -1; + return 0; + } + #if !defined MKNOD_CREATES_FIFOS && defined HAVE_MKFIFO if (S_ISFIFO(mode)) return mkfifo(pathname, mode); @@ -90,14 +100,15 @@ int do_mknod(char *pathname, mode_t mode, dev_t dev) 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); +#ifdef HAVE_SOCKADDR_UN_LEN + unsigned int len = +#endif + strlcpy(saddr.sun_path, pathname, sizeof saddr.sun_path); #ifdef HAVE_SOCKADDR_UN_LEN saddr.sun_len = len >= sizeof saddr.sun_path ? sizeof saddr.sun_path : len + 1; #endif + saddr.sun_family = AF_UNIX; if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0 || (unlink(pathname) < 0 && errno != ENOENT) @@ -118,14 +129,14 @@ int do_mknod(char *pathname, mode_t mode, dev_t dev) #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); @@ -144,35 +155,42 @@ int do_chmod(const char *path, mode_t mode) if (S_ISLNK(mode)) { #ifdef HAVE_LCHMOD code = lchmod(path, mode & CHMOD_BITS); +#elif defined HAVE_SETATTRLIST + struct attrlist attrList; + uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */ + + memset(&attrList, 0, sizeof attrList); + attrList.bitmapcount = ATTR_BIT_MAP_COUNT; + attrList.commonattr = ATTR_CMN_ACCESSMASK; + code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW); #else code = 1; #endif } else - code = chmod(path, mode & CHMOD_BITS); - if (code != 0 && preserve_perms) - return code; + code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */ + if (code != 0 && (preserve_perms || preserve_executability)) + 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; /* Some BSD systems cannot make a directory if the name * contains a trailing slash. * */ - + /* Don't change empty string; and also we can't improve on * "/" */ - + l = strlen(name); while (l > 1) { if (name[--l] != '/') @@ -181,21 +199,20 @@ void trim_trailing_slashes(char *name) } } - int do_mkdir(char *fname, mode_t mode) { if (dry_run) return 0; RETURN_ERROR_IF_RO_OR_LO; - trim_trailing_slashes(fname); + trim_trailing_slashes(fname); 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); + perms |= S_IWUSR; #if defined HAVE_SECURE_MKSTEMP && defined HAVE_FCHMOD && (!defined HAVE_OPEN64 || defined HAVE_MKSTEMP64) { @@ -255,18 +272,13 @@ int do_fstat(int fd, STRUCT_STAT *st) OFF_T do_lseek(int fd, OFF_T offset, int whence) { #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 } - -char *d_name(struct dirent *di) -{ -#ifdef HAVE_BROKEN_READDIR - return (di->d_name - 2); -#else - return di->d_name; -#endif -}