-/*
+/*
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.
extern int dry_run;
extern int preserve_times;
extern int am_root;
+extern int am_server;
+extern int am_sender;
+extern int am_generator;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_perms;
/*
- * delete a file or directory. If force_delete is set then delete
- * recursively
+ * delete a file or directory. If force_delete is set then delete
+ * recursively
*/
int delete_file(char *fname)
{
if (!S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) == 0 || errno == ENOENT) return 0;
- rprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
+ rprintf(FERROR, "delete_file: unlink %s failed: %s\n",
+ full_fname(fname), strerror(errno));
return -1;
}
if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
- if (!force_delete || !recurse ||
+ if (!force_delete || !recurse ||
(errno != ENOTEMPTY && errno != EEXIST)) {
- rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
+ full_fname(fname), strerror(errno));
return -1;
}
/* now we do a recsursive delete on the directory ... */
d = opendir(fname);
if (!d) {
- rprintf(FERROR,"opendir(%s): %s\n",
- fname,strerror(errno));
+ rprintf(FERROR, "delete_file: opendir %s failed: %s\n",
+ full_fname(fname), strerror(errno));
return -1;
}
- for (di=readdir(d); di; di=readdir(d)) {
+ for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
char *dname = d_name(di);
- if (strcmp(dname,".")==0 ||
- strcmp(dname,"..")==0)
+ if (strcmp(dname,".") == 0
+ || strcmp(dname,"..") == 0)
continue;
- slprintf(buf, sizeof(buf), "%s/%s", fname, dname);
+ pathjoin(buf, sizeof buf, fname, dname);
if (verbose > 0)
rprintf(FINFO,"deleting %s\n", buf);
if (delete_file(buf) != 0) {
closedir(d);
return -1;
}
- }
-
- closedir(d);
-
- if (do_rmdir(fname) != 0) {
- rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ }
+ if (errno) {
+ rprintf(FERROR, "delete_file: readdir %s failed: %s\n",
+ full_fname(fname), strerror(errno));
+ closedir(d);
return -1;
}
- return 0;
-}
-
-static int is_in_group(gid_t gid)
-{
-#ifdef GETGROUPS_T
- static gid_t last_in = (gid_t) -2, last_out;
- static int ngroups = -2;
- static GETGROUPS_T *gidset;
- int n;
-
- if (gid == last_in)
- return last_out;
- if (ngroups < -1) {
- /* treat failure (-1) as if not member of any group */
- ngroups = getgroups(0, 0);
- if (ngroups > 0) {
- gidset = (GETGROUPS_T *) malloc(ngroups * sizeof(GETGROUPS_T));
- ngroups = getgroups(ngroups, gidset);
- }
- }
+ closedir(d);
- last_in = gid;
- last_out = 0;
- for (n = 0; n < ngroups; n++) {
- if (gidset[n] == gid) {
- last_out = 1;
- break;
- }
+ if (do_rmdir(fname) != 0) {
+ rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
+ full_fname(fname), strerror(errno));
+ return -1;
}
- return last_out;
-#else
return 0;
-#endif
}
int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
- int report)
+ int report)
{
int updated = 0;
STRUCT_STAT st2;
if (!st) {
if (link_stat(fname,&st2) != 0) {
- rprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR, "stat %s failed: %s\n",
+ full_fname(fname), strerror(errno));
return 0;
}
st = &st2;
}
if (preserve_times && !S_ISLNK(st->st_mode) &&
- st->st_mtime != file->modtime) {
+ cmp_modtime(st->st_mtime, file->modtime) != 0) {
/* don't complain about not setting times on directories
because some filesystems can't do it */
if (set_modtime(fname,file->modtime) != 0 &&
!S_ISDIR(st->st_mode)) {
- rprintf(FERROR,"failed to set times on %s : %s\n",
- fname,strerror(errno));
+ rprintf(FERROR, "failed to set times on %s: %s\n",
+ full_fname(fname), strerror(errno));
return 0;
} else {
updated = 1;
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
- change_gid = preserve_gid && file->gid != (gid_t) -1 && \
- st->st_gid != file->gid;
- if (change_gid && !am_root) {
- /* enforce bsd-style group semantics: non-root can only
- change to groups that the user is a member of */
- change_gid = is_in_group(file->gid);
- }
+ change_gid = preserve_gid && file->gid != GID_NONE
+ && st->st_gid != file->gid;
if (change_uid || change_gid) {
+ if (verbose > 2 && !dry_run) {
+ if (change_uid) {
+ rprintf(FINFO,
+ "set uid of %s from %ld to %ld\n",
+ fname, (long)st->st_uid, (long)file->uid);
+ }
+ if (change_gid) {
+ rprintf(FINFO,
+ "set gid of %s from %ld to %ld\n",
+ fname, (long)st->st_gid, (long)file->gid);
+ }
+ }
if (do_lchown(fname,
change_uid?file->uid:st->st_uid,
change_gid?file->gid:st->st_gid) != 0) {
/* shouldn't have attempted to change uid or gid
unless have the privilege */
- rprintf(FERROR,"chown %s : %s\n", fname,strerror(errno));
+ rprintf(FERROR, "%s %s failed: %s\n",
+ change_uid ? "chown" : "chgrp",
+ full_fname(fname), strerror(errno));
return 0;
}
/* a lchown had been done - we have to re-stat if the
#ifdef HAVE_CHMOD
if (!S_ISLNK(st->st_mode)) {
- if (st->st_mode != file->mode) {
+ if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
updated = 1;
- if (do_chmod(fname,file->mode) != 0) {
- rprintf(FERROR,"failed to set permissions on %s : %s\n",
- fname,strerror(errno));
+ if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) {
+ rprintf(FERROR, "failed to set permissions on %s: %s\n",
+ full_fname(fname), strerror(errno));
return 0;
}
}
}
#endif
-
+
if (verbose > 1 && report) {
if (updated)
rprintf(FINFO,"%s\n",fname);
void sig_int(void)
{
+ /* KLUGE: if the user hits Ctrl-C while ssh is prompting
+ * for a password, then our cleanup's sending of a SIGUSR1
+ * signal to all our children may kill ssh before it has a
+ * chance to restore the tty settings (i.e. turn echo back
+ * on). By sleeping for a short time, ssh gets a bigger
+ * chance to do the right thing. If child processes are
+ * not ssh waiting for a password, then this tiny delay
+ * shouldn't hurt anything. */
+ msleep(400);
exit_cleanup(RERR_SIGNAL);
}
/* move tmp file over real file */
if (robust_rename(fnametmp,fname) != 0) {
if (errno == EXDEV) {
- /* rename failed on cross-filesystem link.
+ /* rename failed on cross-filesystem link.
Copy the file instead. */
if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) {
- rprintf(FERROR,"copy %s -> %s : %s\n",
- fnametmp,fname,strerror(errno));
+ rprintf(FERROR, "copy %s -> \"%s\": %s\n",
+ full_fname(fnametmp), fname,
+ strerror(errno));
} else {
set_perms(fname,file,NULL,0);
}
} else {
- rprintf(FERROR,"rename %s -> %s : %s\n",
- fnametmp,fname,strerror(errno));
+ rprintf(FERROR,"rename %s -> \"%s\": %s\n",
+ full_fname(fnametmp), fname, strerror(errno));
}
do_unlink(fnametmp);
} else {
set_perms(fname,file,NULL,0);
}
}
+
+const char *who_am_i(void)
+{
+ return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff