/*
Copyright (C) Andrew Tridgell 1996
Copyright (C) Paul Mackerras 1996
- Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
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
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/** @file flist.c
- * Generate and receive file lists
- *
- * @todo Get rid of the string_area optimization. Efficiently
- * allocating blocks is the responsibility of the system's malloc
- * library, not of rsync.
- *
- **/
+/* generate and receive file lists */
#include "rsync.h"
extern int io_error;
extern int sanitize_paths;
-extern int read_batch;
-extern int write_batch;
-
static char topsrcname[MAXPATHLEN];
static struct exclude_struct **local_exclude_list;
static void clean_flist(struct file_list *flist, int strip_root);
-
-static int show_build_progress_p(void)
-{
- extern int do_progress;
-
- return do_progress && verbose && recurse && !am_server;
-}
-
-/**
- * True if we're local, etc, and should emit progress emssages.
- **/
-static void emit_build_progress(const struct file_list *flist)
-{
- rprintf(FINFO,
- " %d files...\r",
- flist->count);
-}
-
-
-static void finish_build_progress(const struct file_list *flist)
-{
- if (verbose && recurse && !am_server) {
- /* This overwrites the progress line, if any. */
- rprintf(FINFO, RSYNC_NAME ": %d files to consider.\n",
- flist->count);
- }
-}
-
-
static struct string_area *string_area_new(int size)
{
struct string_area *a;
static void list_file_entry(struct file_struct *f)
{
- char perms[11];
+ char perms[11] = "----------";
+ char *perm_map = "rwxrwxrwx";
+ int i;
if (!f->basename)
/* this can happen if duplicate names were removed */
return;
- permstring(perms, f->mode);
-
+ for (i=0;i<9;i++) {
+ if (f->mode & (1<<i)) perms[9-i] = perm_map[8-i];
+ }
+ if (S_ISLNK(f->mode)) perms[0] = 'l';
+ if (S_ISDIR(f->mode)) perms[0] = 'd';
+ if (S_ISBLK(f->mode)) perms[0] = 'b';
+ if (S_ISCHR(f->mode)) perms[0] = 'c';
+ if (S_ISSOCK(f->mode)) perms[0] = 's';
+ if (S_ISFIFO(f->mode)) perms[0] = 'p';
+
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO,"%s %11.0f %s %s -> %s\n",
perms,
}
if (S_ISLNK(Buffer->st_mode)) {
int l;
- if ((l = readlink((char *) Path, Linkbuf, MAXPATHLEN-1))== -1) {
+ if ((l = readlink(Path,Linkbuf,MAXPATHLEN-1)) == -1) {
return -1;
}
Linkbuf[l] = 0;
This function is used to check if a file should be included/excluded
from the list of files based on its name and type etc
*/
-static int check_exclude_file(int f,char *fname,STRUCT_STAT *st)
+static int match_file_name(char *fname,STRUCT_STAT *st)
{
- extern int delete_excluded;
-
- /* f is set to -1 when calculating deletion file list */
- if ((f == -1) && delete_excluded) {
- return 0;
- }
- if (check_exclude(fname,local_exclude_list,st)) {
- return 1;
- }
- return 0;
+ if (check_exclude(fname,local_exclude_list,st)) {
+ if (verbose > 2)
+ rprintf(FINFO,"excluding file %s\n",fname);
+ return 0;
+ }
+ return 1;
}
/* used by the one_file_system code */
static int to_wire_mode(mode_t mode)
{
- if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) {
+ if (S_ISLNK(mode) && (S_IFLNK != 0120000)) {
return (mode & ~(_S_IFMT)) | 0120000;
}
return (int)mode;
static mode_t from_wire_mode(int mode)
{
- if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) {
- return (mode & ~(_S_IFMT)) | _S_IFLNK;
+ if ((mode & (_S_IFMT)) == 0120000 && (S_IFLNK != 0120000)) {
+ return (mode & ~(_S_IFMT)) | S_IFLNK;
}
return (mode_t)mode;
}
#if SUPPORT_HARD_LINKS
if (preserve_hard_links && S_ISREG(file->mode)) {
- if (remote_version < 26) {
- /* 32-bit dev_t and ino_t */
- write_int(f,(int)file->dev);
- write_int(f,(int)file->inode);
- } else {
- /* 64-bit dev_t and ino_t */
- write_longint(f, file->dev);
- write_longint(f, file->inode);
- }
+ write_int(f,(int)file->dev);
+ write_int(f,(int)file->inode);
}
#endif
#if SUPPORT_HARD_LINKS
if (preserve_hard_links && S_ISREG(file->mode)) {
- if (remote_version < 26) {
- file->dev = read_int(f);
- file->inode = read_int(f);
- } else {
- file->dev = read_longint(f);
- file->inode = read_longint(f);
- }
+ file->dev = read_int(f);
+ file->inode = read_int(f);
}
#endif
}
#define STRDUP(ap, p) (ap ? string_area_strdup(ap, p) : strdup(p))
-/* IRIX cc cares that the operands to the ternary have the same type. */
-#define MALLOC(ap, i) (ap ? (void*) string_area_malloc(ap, i) : malloc(i))
+#define MALLOC(ap, i) (ap ? string_area_malloc(ap, i) : malloc(i))
/* create a file_struct for a named file */
struct file_struct *make_file(int f, char *fname, struct string_area **ap,
char *p;
char cleaned_name[MAXPATHLEN];
char linkbuf[MAXPATHLEN];
+ extern int delete_excluded;
extern int module_id;
strlcpy(cleaned_name, fname, MAXPATHLEN);
memset(sum,0,SUM_LENGTH);
if (readlink_stat(fname,&st,linkbuf) != 0) {
- int save_errno = errno;
- if ((errno == ENOENT) && copy_links && !noexcludes) {
- /* symlink pointing nowhere, see if excluded */
- memset((char *)&st, 0, sizeof(st));
- if (check_exclude_file(f,fname,&st)) {
- /* file is excluded anyway, ignore silently */
- return NULL;
- }
- }
io_error = 1;
rprintf(FERROR,"readlink %s: %s\n",
- fname,strerror(save_errno));
+ fname,strerror(errno));
return NULL;
}
return NULL;
}
- if (check_exclude_file(f,fname,&st))
+ /* f is set to -1 when calculating deletion file list */
+ if (((f != -1) || !delete_excluded) && !match_file_name(fname,&st))
return NULL;
file = make_file(f,fname, &flist->string_area, 0);
- if (!file) return;
-
- if (show_build_progress_p() & !(flist->count % 100))
- emit_build_progress(flist);
+ if (!file) return;
if (flist->count >= flist->malloced) {
if (flist->malloced < 1000)
out_of_memory("send_file_name");
}
- if (write_batch) /* dw */
- file->flags = FLAG_DELETE;
-
if (strcmp(file->basename,"")) {
flist->files[flist->count++] = file;
send_file_entry(file,f,base_flags);
}
-/*
- *
- * I *think* f==-1 means that the list should just be built in memory
- * and not transmitted. But who can tell? -- mbp
- */
struct file_list *send_file_list(int f,int argc,char *argv[])
{
int i,l;
int64 start_write;
if (verbose && recurse && !am_server && f != -1) {
- rprintf(FINFO, RSYNC_NAME ": building file list...\n");
- if (verbose > 1)
- rprintf(FINFO, "\n");
+ rprintf(FINFO,"building file list ... ");
rflush(FINFO);
}
send_file_entry(NULL,f,0);
}
- finish_build_progress(flist);
+ if (verbose && recurse && !am_server && f != -1)
+ rprintf(FINFO,"done\n");
clean_flist(flist, 0);
io_end_buffering(f);
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
- if (write_batch) /* dw */
- write_batch_flist_info(flist->count, flist->files);
}
if (verbose > 2)
}
/* if protocol version is >= 17 then recv the io_error flag */
- if (f != -1 && remote_version >= 17 && !read_batch) { /* dw-added readbatch */
+ if (f != -1 && remote_version >= 17) {
extern int module_id;
extern int ignore_errors;
if (lp_ignore_errors(module_id) || ignore_errors) {
}
-/*
- * XXX: This is currently the hottest function while building the file
- * list, because building f_name()s every time is expensive.
- **/
int file_compare(struct file_struct **f1,struct file_struct **f2)
{
if (!(*f1)->basename && !(*f2)->basename) return 0;
}
}
- /* FIXME: There is a bug here when filenames are repeated more
- * than once, because we don't handle freed files when doing
- * the comparison. */
-
if (strip_root) {
/* we need to strip off the root directory in the case
of relative paths, but this must be done _after_
for (i=0;i<flist->count;i++) {
rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%.0f\n",
- (int) getpid(), i,
+ getpid(), i,
NS(flist->files[i]->dirname),
NS(flist->files[i]->basename),
- (int) flist->files[i]->mode,
+ flist->files[i]->mode,
(double)flist->files[i]->length);
}
}
/*
* return the full filename of a flist entry
- *
- * This function is too expensive at the moment, because it copies
- * strings when often we only want to compare them. In any case,
- * using strlcat is silly because it will walk the string repeatedly.
*/
char *f_name(struct file_struct *f)
{
n = (n+1)%10;
if (f->dirname) {
- int off;
-
- off = strlcpy(p, f->dirname, MAXPATHLEN);
- off += strlcpy(p+off, "/", MAXPATHLEN-off);
- off += strlcpy(p+off, f->basename, MAXPATHLEN-off);
+ strlcpy(p, f->dirname, MAXPATHLEN);
+ strlcat(p, "/", MAXPATHLEN);
+ strlcat(p, f->basename, MAXPATHLEN);
} else {
strlcpy(p, f->basename, MAXPATHLEN);
}
git.samba.org / rsync.git / blobdiff