/*
- 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 <iconv.h>
+#endif
+#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
+#include <libcharset.h>
+#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO
+#include <langinfo.h>
+#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;
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 force_delete;
extern int inplace;
-extern int recurse;
-extern int max_delete;
extern int keep_dirlinks;
extern int make_backups;
+extern mode_t orig_umask;
extern struct stats stats;
-extern char *backup_dir;
-extern char *log_format;
-extern char *backup_suffix;
-extern int backup_suffix_len;
+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 int is_backup_file(char *fn)
+static const char *default_charset(void)
{
- int k = strlen(fn) - backup_suffix_len;
- return k > 0 && strcmp(fn+k, backup_suffix) == 0;
+#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
free(s);
}
-
-int deletion_count = 0; /* used to implement --max-delete */
-
-/*
- * delete a file or directory. If force_delete is set then delete
- * recursively
- */
-int delete_file(char *fname, int mode, int flags)
+/* 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)
{
- DIR *d;
- struct dirent *di;
- char buf[MAXPATHLEN];
- STRUCT_STAT st;
- int zap_dir;
-
- if (max_delete && deletion_count >= max_delete)
- return -1;
-
- if (!S_ISDIR(mode)) {
- int ok;
- if (make_backups && (backup_dir || !is_backup_file(fname)))
- ok = make_backup(fname);
- else
- ok = robust_unlink(fname) == 0;
- if (ok) {
- if ((verbose || log_format) && !(flags & DEL_TERSE))
- log_delete(fname, mode);
- deletion_count++;
- return 0;
- }
- if (errno == ENOENT)
- return 0;
- rsyserr(FERROR, errno, "delete_file: unlink %s failed",
- full_fname(fname));
- return -1;
- }
-
- zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
- && !(flags & DEL_NO_RECURSE);
- if (dry_run && zap_dir)
- errno = ENOTEMPTY;
- else if (do_rmdir(fname) == 0) {
- if ((verbose || log_format) && !(flags & DEL_TERSE))
- log_delete(fname, mode);
- deletion_count++;
- return 0;
- }
- if (errno == ENOENT)
- return 0;
- if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
- rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
- full_fname(fname));
- return -1;
- }
-
- /* now we do a recsursive delete on the directory ... */
- if (!(d = opendir(fname))) {
- rsyserr(FERROR, errno, "delete_file: opendir %s failed",
- full_fname(fname));
- return -1;
- }
-
- if (!(flags & DEL_TERSE)) {
- if (verbose || log_format)
- log_delete(fname, mode);
- flags |= DEL_TERSE;
- }
-
- for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
- char *dname = d_name(di);
- if (dname[0] == '.' && (dname[1] == '\0'
- || (dname[1] == '.' && dname[2] == '\0')))
- continue;
- pathjoin(buf, sizeof buf, fname, dname);
-
- if (do_lstat(buf, &st) < 0)
- continue;
- if (verbose || log_format)
- log_delete(buf, st.st_mode);
- if (delete_file(buf, st.st_mode, flags) != 0) {
- closedir(d);
- return -1;
+ /* 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;
}
- }
- if (errno) {
- rsyserr(FERROR, errno, "delete_file: readdir %s failed",
- full_fname(fname));
- closedir(d);
- return -1;
- }
-
- closedir(d);
-
- if (max_delete && deletion_count >= max_delete)
- return -1;
- if (do_rmdir(fname) != 0 && errno != ENOENT) {
- rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
- full_fname(fname));
- return -1;
- }
- deletion_count++;
-
- return 0;
+ } 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_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
- int flags)
+int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
+ int flags)
{
int updated = 0;
STRUCT_STAT st2;
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_ISLNK(st->st_mode)
- || (S_ISDIR(st->st_mode)
- && (omit_dir_times || (make_backups && !backup_dir))))
- flags |= PERMS_SKIP_MTIME;
- if (!(flags & PERMS_SKIP_MTIME)
- && cmp_modtime(st->st_mtime, file->modtime) != 0) {
- if (set_modtime(fname,file->modtime) != 0) {
+ if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
+ flags |= ATTRS_SKIP_MTIME;
+ if (!(flags & ATTRS_SKIP_MTIME)
+ && 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",
full_fname(fname));
return 0;
}
- updated = 1;
+ if (ret == 0) /* ret == 1 if symlink could not be set */
+ updated = 1;
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
if (change_uid) {
rprintf(FINFO,
"set uid of %s from %ld to %ld\n",
- safe_fname(fname),
+ fname,
(long)st->st_uid, (long)file->uid);
}
if (change_gid) {
rprintf(FINFO,
"set gid of %s from %ld to %ld\n",
- safe_fname(fname),
+ fname,
(long)st->st_gid, (long)file->gid);
}
}
}
#ifdef HAVE_CHMOD
- if (!S_ISLNK(st->st_mode)) {
- if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
- updated = 1;
- if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) {
- rsyserr(FERROR, errno, "failed to set permissions on %s",
- full_fname(fname));
- return 0;
- }
+ if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
+ int ret = do_chmod(fname, file->mode);
+ if (ret < 0) {
+ rsyserr(FERROR, errno,
+ "failed to set permissions on %s",
+ full_fname(fname));
+ return 0;
}
+ if (ret == 0) /* ret == 1 if symlink could not be set */
+ updated = 1;
}
#endif
- if (verbose > 1 && flags & PERMS_REPORT) {
+ if (verbose > 1 && flags & ATTRS_REPORT) {
enum logcode code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
if (updated)
- rprintf(code, "%s\n", safe_fname(fname));
+ rprintf(code, "%s\n", fname);
else
- rprintf(code, "%s is uptodate\n", safe_fname(fname));
+ rprintf(code, "%s is uptodate\n", fname);
}
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
exit_cleanup(RERR_SIGNAL);
}
-
-/* finish off a file transfer, renaming the file and setting the permissions
- and ownership */
-void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
- int ok_to_set_time, int overwriting_basis)
+/* Finish off a file transfer: renaming the file and setting the file's
+ * attributes (e.g. permissions, ownership, etc.). If partialptr is not
+ * NULL and the robust_rename() call is forced to copy the temp file, we
+ * stage the file into the partial-dir and then rename it into place. */
+void finish_transfer(char *fname, char *fnametmp, char *partialptr,
+ struct file_struct *file, int ok_to_set_time,
+ int overwriting_basis)
{
int ret;
if (inplace) {
if (verbose > 2)
- rprintf(FINFO, "finishing %s\n", safe_fname(fname));
- goto do_set_perms;
+ rprintf(FINFO, "finishing %s\n", fname);
+ fnametmp = fname;
+ goto do_set_file_attrs;
}
if (make_backups && overwriting_basis && !make_backup(fname))
return;
/* Change permissions before putting the file into place. */
- set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
+ set_file_attrs(fnametmp, file, NULL,
+ ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
/* move tmp file over real file */
- if (verbose > 2) {
- rprintf(FINFO, "renaming %s to %s\n",
- safe_fname(fnametmp), safe_fname(fname));
- }
- ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
+ if (verbose > 2)
+ rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
+ ret = robust_rename(fnametmp, fname, partialptr,
+ file->mode & INITACCESSPERMS);
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
- ret == -2 ? "copy" : "rename",
- full_fname(fnametmp), safe_fname(fname));
+ ret == -2 ? "copy" : "rename",
+ full_fname(fnametmp), fname);
do_unlink(fnametmp);
return;
}
/* The file was moved into place (not copied), so it's done. */
return;
}
- do_set_perms:
- set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
+ /* The file was copied, so tweak the perms of the copied file. If it
+ * was copied to partialptr, move it into its final destination. */
+ fnametmp = partialptr ? partialptr : fname;
+
+ do_set_file_attrs:
+ set_file_attrs(fnametmp, file, NULL,
+ ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
+
+ if (partialptr) {
+ if (do_rename(fnametmp, fname) < 0) {
+ rsyserr(FERROR, errno, "rename %s -> \"%s\"",
+ full_fname(fnametmp), fname);
+ } else
+ handle_partial_dir(partialptr, PDIR_DELETE);
+ }
}
const char *who_am_i(void)
{
- if (am_sender < 0)
+ if (am_starting_up)
return am_server ? "server" : "client";
return am_sender ? "sender" : am_generator ? "generator" : "receiver";
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff