X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d8b1c923efd14d320f90884901b795f141aa6464..0f78b81511be65d8fe21af1e6ac674f9e80ac29d:/rsync.c diff --git a/rsync.c b/rsync.c index 68d5026e..47268f4d 100644 --- a/rsync.c +++ b/rsync.c @@ -1,30 +1,40 @@ /* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 - - 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. -*/ - -/* this file contains code used by more than one part of the rsync - process */ + * Routines common to more than one of the rsync processes. + * + * Copyright (C) 1996 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2003, 2004, 2005, 2006 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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "rsync.h" +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#include +#endif +#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET +#include +#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO +#include +#endif extern int verbose; extern int dry_run; extern int daemon_log_format_has_i; +extern int preserve_perms; +extern int preserve_executability; extern int preserve_times; extern int omit_dir_times; extern int am_root; @@ -32,13 +42,53 @@ extern int am_server; extern int am_sender; extern int am_generator; extern int am_starting_up; +extern int allow_8bit_chars; extern int preserve_uid; extern int preserve_gid; extern int inplace; extern int keep_dirlinks; extern int make_backups; +extern mode_t orig_umask; extern struct stats stats; +extern struct chmod_mode_struct *daemon_chmod_modes; + +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +iconv_t ic_chck = (iconv_t)-1; + +static const char *default_charset(void) +{ +#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET + return locale_charset(); +#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO + return nl_langinfo(CODESET); +#else + return ""; /* Works with (at the very least) gnu iconv... */ +#endif +} + +void setup_iconv() +{ + if (!am_server && !allow_8bit_chars) { + const char *defset = default_charset(); + /* It's OK if this fails... */ + ic_chck = iconv_open(defset, defset); + + if (verbose > 3) { + if (ic_chck == (iconv_t)-1) { + rprintf(FINFO, + "note: iconv_open(\"%s\", \"%s\") failed (%d)" + " -- using isprint() instead of iconv().\n", + defset, defset, errno); + } else { + rprintf(FINFO, + "note: iconv_open(\"%s\", \"%s\") succeeded.\n", + defset, defset); + } + } + } +} +#endif /* free a sums struct @@ -49,6 +99,29 @@ void free_sums(struct sum_struct *s) free(s); } +/* This is only called when we aren't preserving permissions. Figure out what + * the permissions should be and return them merged back into the mode. */ +mode_t dest_mode(mode_t flist_mode, mode_t cur_mode, int exists) +{ + /* If the file already exists, we'll return the local permissions, + * possibly tweaked by the --executability option. */ + if (exists) { + if (preserve_executability && S_ISREG(flist_mode)) { + /* If the source file is executable, grant execute + * rights to everyone who can read, but ONLY if the + * file isn't already executable. */ + if (!(flist_mode & 0111)) + cur_mode &= ~0111; + else if (!(cur_mode & 0111)) + cur_mode |= (cur_mode & 0444) >> 2; + } + } else + cur_mode = flist_mode & ACCESSPERMS & ~orig_umask; + if (daemon_chmod_modes && !S_ISLNK(flist_mode)) + cur_mode = tweak_mode(cur_mode, daemon_chmod_modes); + return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS); +} + int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, int flags) { @@ -65,12 +138,18 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, return 0; } st = &st2; + if (!preserve_perms && S_ISDIR(file->mode) + && st->st_mode & S_ISGID) { + /* We just created this directory and its setgid + * bit is on, so make sure it stays on. */ + file->mode |= S_ISGID; + } } if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times)) flags |= ATTRS_SKIP_MTIME; if (!(flags & ATTRS_SKIP_MTIME) - && cmp_modtime(st->st_mtime, file->modtime) != 0) { + && cmp_time(st->st_mtime, file->modtime) != 0) { int ret = set_modtime(fname, file->modtime, st->st_mode); if (ret < 0) { rsyserr(FERROR, errno, "failed to set times on %s", @@ -149,7 +228,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, return updated; } -void sig_int(void) +RETSIGTYPE sig_int(UNUSED(int val)) { /* KLUGE: if the user hits Ctrl-C while ssh is prompting * for a password, then our cleanup's sending of a SIGUSR1