From 182dca5c80c40c5abe429a6c5307be25cc4b4d90 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 26 Jun 1996 13:37:05 +0000 Subject: [PATCH] more byte efficient flist routines --- flist.c | 161 ++++++++++++++++++++++++++++++++++++++++++-------------- io.c | 11 ++++ main.c | 4 +- rsync.c | 3 +- rsync.h | 5 +- 5 files changed, 140 insertions(+), 44 deletions(-) diff --git a/flist.c b/flist.c index 8bf964d2..4c8d59f7 100644 --- a/flist.c +++ b/flist.c @@ -71,24 +71,57 @@ static void send_directory(int f,struct file_list *flist,char *dir); static char *flist_dir = NULL; +#define FILE_VALID 1 +#define SAME_MODE (1<<1) +#define SAME_DEV (1<<2) +#define SAME_UID (1<<3) +#define SAME_GID (1<<4) +#define SAME_DIR (1<<5) + static void send_file_entry(struct file_struct *file,int f) { + unsigned char flags; + static mode_t last_mode=0; + static dev_t last_dev=0; + static uid_t last_uid=0; + static gid_t last_gid=0; + static char lastdir[MAXPATHLEN]=""; + char *p=NULL; + if (f == -1) return; - write_int(f,strlen(file->name)); - write_buf(f,file->name,strlen(file->name)); + if (!file) { + write_byte(f,0); + return; + } + + flags = FILE_VALID; + + if (file->mode == last_mode) flags |= SAME_MODE; + if (file->dev == last_dev) flags |= SAME_DEV; + if (file->uid == last_uid) flags |= SAME_UID; + if (file->gid == last_gid) flags |= SAME_GID; + + if (strncmp(file->name,lastdir,strlen(lastdir)) == 0) { + flags |= SAME_DIR; + p = file->name + strlen(lastdir); + } else { + p = file->name; + } + + write_byte(f,flags); + write_byte(f,strlen(p)); + write_buf(f,p,strlen(p)); write_int(f,(int)file->modtime); write_int(f,(int)file->length); - write_int(f,(int)file->mode); - if (preserve_uid) + if (!(flags & SAME_MODE)) + write_int(f,(int)file->mode); + if (preserve_uid && !(flags & SAME_UID)) write_int(f,(int)file->uid); - if (preserve_gid) + if (preserve_gid && !(flags & SAME_GID)) write_int(f,(int)file->gid); - if (preserve_devices) { - if (verbose > 2) - fprintf(stderr,"dev=0x%x\n",(int)file->dev); + if (preserve_devices && IS_DEVICE(file->mode) && !(flags & SAME_DEV)) write_int(f,(int)file->dev); - } #if SUPPORT_LINKS if (preserve_links && S_ISLNK(file->mode)) { @@ -100,6 +133,82 @@ static void send_file_entry(struct file_struct *file,int f) if (always_checksum) { write_buf(f,file->sum,SUM_LENGTH); } + + last_mode = file->mode; + last_dev = file->dev; + last_uid = file->uid; + last_gid = file->gid; + p = strrchr(file->name,'/'); + if (p) { + int l = (int)(p - file->name) + 1; + strncpy(lastdir,file->name,l); + lastdir[l] = 0; + } else { + strcpy(lastdir,""); + } +} + + + +static void receive_file_entry(struct file_struct *file, + unsigned char flags,int f) +{ + static mode_t last_mode=0; + static dev_t last_dev=0; + static uid_t last_uid=0; + static gid_t last_gid=0; + static char lastdir[MAXPATHLEN]=""; + char *p=NULL; + int l1,l2; + + l1 = read_byte(f); + if (flags & SAME_DIR) + l2 = strlen(lastdir); + else + l2 = 0; + + file->name = (char *)malloc(l1+l2+1); + if (!file->name) out_of_memory("receive_file_entry"); + + strncpy(file->name,lastdir,l2); + read_buf(f,file->name+l2,l1); + file->name[l1+l2] = 0; + + file->modtime = (time_t)read_int(f); + file->length = (off_t)read_int(f); + file->mode = (flags & SAME_MODE) ? last_mode : (mode_t)read_int(f); + if (preserve_uid) + file->uid = (flags & SAME_UID) ? last_uid : (uid_t)read_int(f); + if (preserve_gid) + file->gid = (flags & SAME_GID) ? last_gid : (gid_t)read_int(f); + if (preserve_devices && IS_DEVICE(file->mode)) + file->dev = (flags & SAME_DEV) ? last_dev : (dev_t)read_int(f); + +#if SUPPORT_LINKS + if (preserve_links && S_ISLNK(file->mode)) { + int l = read_int(f); + file->link = (char *)malloc(l+1); + if (!file->link) out_of_memory("receive_file_entry"); + read_buf(f,file->link,l); + file->link[l] = 0; + } +#endif + + if (always_checksum) + read_buf(f,file->sum,SUM_LENGTH); + + last_mode = file->mode; + last_dev = file->dev; + last_uid = file->uid; + last_gid = file->gid; + p = strrchr(file->name,'/'); + if (p) { + int l = (int)(p - file->name) + 1; + strncpy(lastdir,file->name,l); + lastdir[l] = 0; + } else { + strcpy(lastdir,""); + } } @@ -323,7 +432,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) } if (f != -1) { - write_int(f,0); + send_file_entry(NULL,f); write_flush(f); } @@ -338,8 +447,8 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) struct file_list *recv_file_list(int f) { - int l; struct file_list *flist; + unsigned char flags; if (verbose > 2) fprintf(stderr,"recv_file_list starting\n"); @@ -356,7 +465,7 @@ struct file_list *recv_file_list(int f) goto oom; - for (l=read_int(f); l; l=read_int(f)) { + for (flags=read_byte(f); flags; flags=read_byte(f)) { int i = flist->count; if (i >= flist->malloced) { @@ -368,33 +477,7 @@ struct file_list *recv_file_list(int f) goto oom; } - flist->files[i].name = (char *)malloc(l+1); - if (!flist->files[i].name) - goto oom; - - read_buf(f,flist->files[i].name,l); - flist->files[i].name[l] = 0; - flist->files[i].modtime = (time_t)read_int(f); - flist->files[i].length = (off_t)read_int(f); - flist->files[i].mode = (mode_t)read_int(f); - if (preserve_uid) - flist->files[i].uid = (uid_t)read_int(f); - if (preserve_gid) - flist->files[i].gid = (gid_t)read_int(f); - if (preserve_devices) - flist->files[i].dev = (dev_t)read_int(f); - -#if SUPPORT_LINKS - if (preserve_links && S_ISLNK(flist->files[i].mode)) { - int l = read_int(f); - flist->files[i].link = (char *)malloc(l+1); - read_buf(f,flist->files[i].link,l); - flist->files[i].link[l] = 0; - } -#endif - - if (always_checksum) - read_buf(f,flist->files[i].sum,SUM_LENGTH); + receive_file_entry(&flist->files[i],flags,f); if (S_ISREG(flist->files[i].mode)) total_size += flist->files[i].length; diff --git a/io.c b/io.c index 22e5b3db..fda04dd8 100644 --- a/io.c +++ b/io.c @@ -136,6 +136,12 @@ void read_buf(int f,char *buf,int len) total_read += len; } +unsigned char read_byte(int f) +{ + char c; + read_buf(f,&c,1); + return (unsigned char)c; +} int read_write(int fd_in,int fd_out,int size) { @@ -215,6 +221,11 @@ void write_buf(int f,char *buf,int len) } +void write_byte(int f,unsigned char c) +{ + write_buf(f,(char *)&c,1); +} + void write_flush(int f) { } diff --git a/main.c b/main.c index 721fdbb7..3cd2a133 100644 --- a/main.c +++ b/main.c @@ -582,7 +582,7 @@ int main(int argc,char *argv[]) if (am_server) { int version = read_int(STDIN_FILENO); - if (version != PROTOCOL_VERSION) { + if (version < MIN_PROTOCOL_VERSION) { fprintf(stderr,"protocol version mismatch %d %d\n", version,PROTOCOL_VERSION); exit(1); @@ -666,7 +666,7 @@ int main(int argc,char *argv[]) write_flush(f_out); { int version = read_int(f_in); - if (version != PROTOCOL_VERSION) { + if (version < MIN_PROTOCOL_VERSION) { fprintf(stderr,"protocol version mismatch\n"); exit(1); } diff --git a/rsync.c b/rsync.c index 9f1d80ab..0bc7119d 100644 --- a/rsync.c +++ b/rsync.c @@ -286,8 +286,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) #endif #ifdef HAVE_MKNOD - if (preserve_devices && - (S_ISCHR(flist->files[i].mode) || S_ISBLK(flist->files[i].mode))) { + if (preserve_devices && IS_DEVICE(flist->files[i].mode)) { if (statret != 0 || st.st_mode != flist->files[i].mode || st.st_rdev != flist->files[i].dev) { diff --git a/rsync.h b/rsync.h index 7592c89e..2b3b6464 100644 --- a/rsync.h +++ b/rsync.h @@ -24,7 +24,8 @@ #define BACKUP_SUFFIX "~" /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 9 +#define PROTOCOL_VERSION 10 +#define MIN_PROTOCOL_VERSION 10 /* block size to write files in */ #define WRITE_BLOCK_SIZE (32*1024) @@ -242,3 +243,5 @@ extern int errno; #ifndef EWOULDBLOCK #define EWOULDBLOCK EAGAIN #endif + +#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode)) -- 2.34.1