X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f853b777bead34e8638feaee776b8b12d47dbef5..9439c0cb5a4b020b9bfcfe0351e33c17b9c53b54:/syscall.c diff --git a/syscall.c b/syscall.c index 117b10a0..ebcb9009 100644 --- a/syscall.c +++ b/syscall.c @@ -1,28 +1,24 @@ -/* - 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-2007 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" @@ -31,6 +27,7 @@ #endif extern int dry_run; +extern int am_root; extern int read_only; extern int list_only; extern int preserve_perms; @@ -45,14 +42,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 +57,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 +75,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 +96,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 +125,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); @@ -155,24 +162,23 @@ int do_chmod(const char *path, mode_t mode) } #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,16 +187,14 @@ 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) {