X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/94481d9113220ded7ee6a76a96fa468c79680478..79a51e7ee68097b98bc2234b70d16c011bdc3608:/util.c diff --git a/util.c b/util.c index 1c733940..6470bf97 100644 --- a/util.c +++ b/util.c @@ -24,261 +24,538 @@ */ #include "rsync.h" -static int total_written = 0; -static int total_read = 0; - -extern int verbose; - -int write_total(void) +int num_waiting(int fd) { - return total_written; + int len=0; + ioctl(fd,FIONREAD,&len); + return(len); } -int read_total(void) + + +/* this is taken from CVS */ +int piped_child(char **command,int *f_in,int *f_out) { - return total_read; + int pid; + int to_child_pipe[2]; + int from_child_pipe[2]; + + if (pipe(to_child_pipe) < 0 || + pipe(from_child_pipe) < 0) { + rprintf(FERROR,"pipe: %s\n",strerror(errno)); + exit_cleanup(1); + } + + + pid = do_fork(); + if (pid < 0) { + rprintf(FERROR,"fork: %s\n",strerror(errno)); + exit_cleanup(1); + } + + if (pid == 0) + { + extern int orig_umask; + if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 || + close(to_child_pipe[1]) < 0 || + close(from_child_pipe[0]) < 0 || + dup2(from_child_pipe[1], STDOUT_FILENO) < 0) { + rprintf(FERROR,"Failed to dup/close : %s\n",strerror(errno)); + exit_cleanup(1); + } + if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]); + if (from_child_pipe[1] != STDOUT_FILENO) close(from_child_pipe[1]); + umask(orig_umask); + execvp(command[0], command); + rprintf(FERROR,"Failed to exec %s : %s\n", + command[0],strerror(errno)); + exit_cleanup(1); + } + + if (close(from_child_pipe[1]) < 0 || + close(to_child_pipe[0]) < 0) { + rprintf(FERROR,"Failed to close : %s\n",strerror(errno)); + exit_cleanup(1); + } + + *f_in = from_child_pipe[0]; + *f_out = to_child_pipe[1]; + + return pid; } -void write_int(int f,int x) +int local_child(int argc, char **argv,int *f_in,int *f_out) { - char b[4]; - SIVAL(b,0,x); - if (write(f,b,4) != 4) { - fprintf(stderr,"write_int failed : %s\n",strerror(errno)); - exit(1); - } - total_written += 4; + int pid; + int to_child_pipe[2]; + int from_child_pipe[2]; + + if (pipe(to_child_pipe) < 0 || + pipe(from_child_pipe) < 0) { + rprintf(FERROR,"pipe: %s\n",strerror(errno)); + exit_cleanup(1); + } + + + pid = do_fork(); + if (pid < 0) { + rprintf(FERROR,"fork: %s\n",strerror(errno)); + exit_cleanup(1); + } + + if (pid == 0) { + extern int am_sender; + extern int am_server; + + am_sender = !am_sender; + am_server = 1; + + if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 || + close(to_child_pipe[1]) < 0 || + close(from_child_pipe[0]) < 0 || + dup2(from_child_pipe[1], STDOUT_FILENO) < 0) { + rprintf(FERROR,"Failed to dup/close : %s\n",strerror(errno)); + exit_cleanup(1); + } + if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]); + if (from_child_pipe[1] != STDOUT_FILENO) close(from_child_pipe[1]); + start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv); + } + + if (close(from_child_pipe[1]) < 0 || + close(to_child_pipe[0]) < 0) { + rprintf(FERROR,"Failed to close : %s\n",strerror(errno)); + exit_cleanup(1); + } + + *f_in = from_child_pipe[0]; + *f_out = to_child_pipe[1]; + + return pid; } -void write_buf(int f,char *buf,int len) + + +void out_of_memory(char *str) { - if (write(f,buf,len) != len) { - fprintf(stderr,"write_buf failed : %s\n",strerror(errno)); - exit(1); - } - total_written += len; + rprintf(FERROR,"ERROR: out of memory in %s\n",str); + exit_cleanup(1); } -static int num_waiting(int fd) +void overflow(char *str) { - int len=0; -#ifdef FIONREAD - ioctl(fd,FIONREAD,&len); -#endif - return(len); + rprintf(FERROR,"ERROR: buffer overflow in %s\n",str); + exit_cleanup(1); } -static char *read_buffer = NULL; -static char *read_buffer_p = NULL; -static int read_buffer_len = 0; -static int read_buffer_size = 0; -void write_flush(int f) +int set_modtime(char *fname,time_t modtime) { + extern int dry_run; + if (dry_run) return 0; + { +#ifdef HAVE_UTIMBUF + struct utimbuf tbuf; + tbuf.actime = time(NULL); + tbuf.modtime = modtime; + return utime(fname,&tbuf); +#elif defined(HAVE_UTIME) + time_t t[2]; + t[0] = time(NULL); + t[1] = modtime; + return utime(fname,t); +#else + struct timeval t[2]; + t[0].tv_sec = time(NULL); + t[0].tv_usec = 0; + t[1].tv_sec = modtime; + t[1].tv_usec = 0; + return utimes(fname,t); +#endif + } } -void read_check(int f) + +/**************************************************************************** +create any necessary directories in fname. Unfortunately we don't know +what perms to give the directory when this is called so we need to rely +on the umask +****************************************************************************/ +int create_directory_path(char *fname) { - int n; + extern int orig_umask; + char *p; + + while (*fname == '/') fname++; + while (strncmp(fname,"./",2)==0) fname += 2; + + p = fname; + while ((p=strchr(p,'/'))) { + *p = 0; + do_mkdir(fname,0777 & ~orig_umask); + *p = '/'; + p++; + } + return 0; +} - if (read_buffer_len == 0) { - read_buffer_p = read_buffer; - } - if ((n=num_waiting(f)) <= 0) - return; +/* Write LEN bytes at PTR to descriptor DESC, retrying if interrupted. + Return LEN upon success, write's (negative) error code otherwise. - if (read_buffer_p != read_buffer) { - memmove(read_buffer,read_buffer_p,read_buffer_len); - read_buffer_p = read_buffer; - } + derived from GNU C's cccp.c. +*/ +int full_write(int desc, char *ptr, int len) +{ + int total_written; + + total_written = 0; + while (len > 0) { + int written = write (desc, ptr, len); + if (written < 0) { +#ifdef EINTR + if (errno == EINTR) + continue; +#endif + return written; + } + total_written += written; + ptr += written; + len -= written; + } + return total_written; +} - if (n > (read_buffer_size - read_buffer_len)) { - read_buffer_size += n; - if (!read_buffer) - read_buffer = (char *)malloc(read_buffer_size); - else - read_buffer = (char *)realloc(read_buffer,read_buffer_size); - if (!read_buffer) out_of_memory("read check"); - read_buffer_p = read_buffer; - } +/* Read LEN bytes at PTR from descriptor DESC, retrying if interrupted. + Return the actual number of bytes read, zero for EOF, or negative + for an error. - n = read(f,read_buffer+read_buffer_len,n); - if (n > 0) { - read_buffer_len += n; - } + derived from GNU C's cccp.c. */ +int safe_read(int desc, char *ptr, int len) +{ + int n_chars; + + if (len <= 0) + return len; + +#ifdef EINTR + do { + n_chars = read(desc, ptr, len); + } while (n_chars < 0 && errno == EINTR); +#else + n_chars = read(desc, ptr, len); +#endif + + return n_chars; } -static int readfd(int fd,char *buffer,int N) +/* copy a file - this is used in conjunction with the --temp-dir option */ +int copy_file(char *source, char *dest, mode_t mode) { - int ret; - int total=0; - - while (total < N) - { - if (read_buffer_len > 0) { - ret = MIN(read_buffer_len,N-total); - memcpy(buffer+total,read_buffer_p,ret); - read_buffer_p += ret; - read_buffer_len -= ret; - } else { - ret = read(fd,buffer + total,N - total); - } + int ifd; + int ofd; + char buf[1024 * 8]; + int len; /* Number of bytes read into `buf'. */ + + ifd = open(source, O_RDONLY); + if (ifd == -1) { + rprintf(FERROR,"open %s: %s\n", + source,strerror(errno)); + return -1; + } + + if (do_unlink(dest) && errno != ENOENT) { + rprintf(FERROR,"unlink %s: %s\n", + dest,strerror(errno)); + return -1; + } + + ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode); + if (ofd < 0) { + rprintf(FERROR,"open %s: %s\n", + dest,strerror(errno)); + close(ifd); + return -1; + } + + while ((len = safe_read(ifd, buf, sizeof(buf))) > 0) { + if (full_write(ofd, buf, len) < 0) { + rprintf(FERROR,"write %s: %s\n", + dest,strerror(errno)); + close(ifd); + close(ofd); + return -1; + } + } + + close(ifd); + close(ofd); + + if (len < 0) { + rprintf(FERROR,"read %s: %s\n", + source,strerror(errno)); + return -1; + } + + return 0; +} - if (ret <= 0) - return total; - total += ret; - } - return total; +/* sleep for a while via select */ +void u_sleep(int usec) +{ + struct timeval tv; + + tv.tv_sec = 0; + tv.tv_usec = usec; + select(0, NULL, NULL, NULL, &tv); } -int read_int(int f) +static pid_t all_pids[10]; +static int num_pids; + +/* fork and record the pid of the child */ +pid_t do_fork(void) { - char b[4]; - if (readfd(f,b,4) != 4) { - if (verbose > 1) - fprintf(stderr,"Error reading %d bytes : %s\n",4,strerror(errno)); - exit(1); - } - total_read += 4; - return IVAL(b,0); + pid_t newpid = fork(); + + if (newpid) { + all_pids[num_pids++] = newpid; + } + return newpid; } -void read_buf(int f,char *buf,int len) +/* kill all children */ +void kill_all(int sig) { - if (readfd(f,buf,len) != len) { - if (verbose > 1) - fprintf(stderr,"Error reading %d bytes : %s\n",len,strerror(errno)); - exit(1); - } - total_read += len; + int i; + for (i=0;i maxlen) len = maxlen; + memcpy(d, s, len); + d[len] = 0; } +/* like strncat but does not 0 fill the buffer and always null + terminates (thus it can use maxlen+1 space in d) */ +void strlcat(char *d, char *s, int maxlen) +{ + int len1 = strlen(d); + int len2 = strlen(s); + if (len1+len2 > maxlen) { + len2 = maxlen-len1; + } + if (len2 > 0) { + memcpy(d+len1, s, len2); + d[len1+len2] = 0; + } +} -char *map_file(int fd,off_t len) +/* turn a user name into a uid */ +int name_to_uid(char *name, uid_t *uid) { - char *ret = (char *)mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0); - return ret; + struct passwd *pass; + if (!name || !*name) return 0; + pass = getpwnam(name); + if (pass) { + *uid = pass->pw_uid; + return 1; + } + return 0; } -void unmap_file(char *buf,off_t len) +/* turn a group name into a gid */ +int name_to_gid(char *name, gid_t *gid) { - if (len > 0 && buf) - munmap(buf,len); + struct group *grp; + if (!name || !*name) return 0; + grp = getgrnam(name); + if (grp) { + *gid = grp->gr_gid; + return 1; + } + return 0; } -int read_write(int fd_in,int fd_out,int size) +/**************************************************************************** +check if a process exists. +****************************************************************************/ +int process_exists(int pid) { - static char *buf=NULL; - static int bufsize = WRITE_BLOCK_SIZE; - int total=0; - - if (!buf) { - buf = (char *)malloc(bufsize); - if (!buf) out_of_memory("read_write"); - } + return(kill(pid,0) == 0 || errno != ESRCH); +} - while (total < size) { - int n = MIN(size-total,bufsize); - read_buf(fd_in,buf,n); - if (write(fd_out,buf,n) != n) - return total; - total += n; - } - return total; +/* lock a byte range in a open file */ +int lock_range(int fd, int offset, int len) +{ + struct flock lock; + + lock.l_type = F_WRLCK; + lock.l_whence = SEEK_SET; + lock.l_start = offset; + lock.l_len = len; + lock.l_pid = 0; + + return fcntl(fd,F_SETLK,&lock) == 0; } -/* this is taken from CVS */ -int piped_child(char **command,int *f_in,int *f_out) +static void glob_expand_one(char *s, char **argv, int *argc, int maxargs) { - int pid; - int to_child_pipe[2]; - int from_child_pipe[2]; +#ifndef HAVE_GLOB + if (!*s) s = "."; + argv[*argc] = strdup(s); + (*argc)++; + return; +#else + glob_t globbuf; + int i; + + if (!*s) s = "."; + + argv[*argc] = strdup(s); + + memset(&globbuf, 0, sizeof(globbuf)); + glob(argv[*argc], 0, NULL, &globbuf); + if (globbuf.gl_pathc == 0) { + (*argc)++; + globfree(&globbuf); + return; + } + for (i=0; i<(maxargs - (*argc)) && i n || ret < 0) { + str[n] = 0; + return -1; + } + str[ret] = 0; + return ret; +#else + static char *buf; + static int len=MAXPATHLEN*8; + int ret; + + /* this code is NOT a proper vsnprintf() implementation. It + relies on the fact that all calls to slprintf() in rsync + pass strings which have already been checked to be less + than MAXPATHLEN in length and never more than 2 strings are + concatenated. This means the above buffer is absolutely + ample and can never be overflowed. + + In the future we would like to replace this with a proper + vsnprintf() implementation but right now we need a solution + that is secure and portable. This is it. */ + + if (!buf) { + buf = malloc(len); + if (!buf) { + /* can't call debug or we would recurse */ + exit_cleanup(1); + } + } + + vsprintf(buf, format, ap); + ret = strlen(buf); + if (ret > n) { + /* yikes! */ + exit_cleanup(1); + } + buf[ret] = 0; + + memcpy(str, buf, ret+1); + + return ret; +#endif } -#ifndef HAVE_STRDUP - char *strdup(char *s) +/* like snprintf but always null terminates */ +int slprintf(char *str, int n, char *format, ...) { - int l = strlen(s) + 1; - char *ret = (char *)malloc(l); - if (ret) - strcpy(ret,s); - return ret; + va_list ap; + int ret; + + va_start(ap, format); + ret = vslprintf(str,n,format,ap); + va_end(ap); + return ret; } -#endif -int set_modtime(char *fname,time_t modtime) +void *Realloc(void *p, int size) { -#ifdef HAVE_UTIME_H - struct utimbuf tbuf; - tbuf.actime = time(NULL); - tbuf.modtime = modtime; - return utime(fname,&tbuf); -#elif defined(HAVE_UTIME) - time_t t[2]; - t[0] = time(NULL); - t[1] = modtime; - return utime(fname,t); -#else - struct timeval t[2]; - t[0].tv_sec = time(NULL); - t[0].tv_usec = 0; - t[1].tv_sec = modtime; - t[1].tv_usec = 0; - return utimes(fname,t); -#endif + if (!p) return (void *)malloc(size); + return (void *)realloc(p, size); } -