X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4791825d49df3e0076692a8e9aa7d58f9ac15813..5f5be796b0cff5eb4da83d8f3a1bead25b6583b8:/util.c diff --git a/util.c b/util.c index da10ca2f..03b6d7ed 100644 --- a/util.c +++ b/util.c @@ -1,19 +1,19 @@ /* -*- c-file-style: "linux" -*- - * - * Copyright (C) 1996-2000 by Andrew Tridgell + * + * Copyright (C) 1996-2000 by Andrew Tridgell * Copyright (C) Paul Mackerras 1996 * Copyright (C) 2001, 2002 by Martin Pool - * + * * 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. @@ -22,7 +22,7 @@ /** * @file * - * Utilities used in rsync + * Utilities used in rsync **/ #include "rsync.h" @@ -67,7 +67,7 @@ void set_blocking(int fd) /** * Create a file descriptor pair - like pipe() but use socketpair if * possible (because of blocking issues on pipes). - * + * * Always set non-blocking. */ int fd_pair(int fd[2]) @@ -134,10 +134,10 @@ int set_modtime(char *fname, time_t modtime) fname, (long) modtime, asctime(localtime(&modtime))); } - + { #ifdef HAVE_UTIMBUF - struct utimbuf tbuf; + struct utimbuf tbuf; tbuf.actime = time(NULL); tbuf.modtime = modtime; return utime(fname,&tbuf); @@ -173,7 +173,7 @@ int create_directory_path(char *fname, int base_umask) p = fname; while ((p=strchr(p,'/'))) { *p = 0; - do_mkdir(fname, 0777 & ~base_umask); + do_mkdir(fname, 0777 & ~base_umask); *p = '/'; p++; } @@ -194,15 +194,13 @@ int create_directory_path(char *fname, int base_umask) static int full_write(int desc, char *ptr, size_t len) { int total_written; - + total_written = 0; while (len > 0) { - int written = write (desc, ptr, len); + int written = write(desc, ptr, len); if (written < 0) { -#ifdef EINTR if (errno == EINTR) continue; -#endif return written; } total_written += written; @@ -227,18 +225,14 @@ static int full_write(int desc, char *ptr, size_t len) static int safe_read(int desc, char *ptr, size_t 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; } @@ -274,7 +268,7 @@ int copy_file(char *source, char *dest, mode_t mode) return -1; } - while ((len = safe_read(ifd, buf, sizeof(buf))) > 0) { + 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)); @@ -329,8 +323,7 @@ int robust_unlink(char *fname) while((path[--pos] != '/') && (pos >= 0)) ; ++pos; - strlcpy(&path[pos], ".rsync", MAXPATHLEN-pos); - pos += sizeof(".rsync")-1; + pos += strlcpy(path+pos, ".rsync", MAXPATHLEN-pos); if (pos > (MAXPATHLEN-MAX_RENAMES_DIGITS-1)) { errno = ETXTBSY; @@ -381,7 +374,7 @@ static int num_pids; pid_t do_fork(void) { pid_t newpid = fork(); - + if (newpid != 0 && newpid != -1) { all_pids[num_pids++] = newpid; } @@ -455,7 +448,7 @@ int lock_range(int fd, int offset, int len) lock.l_start = offset; lock.l_len = len; lock.l_pid = 0; - + return fcntl(fd,F_SETLK,&lock) == 0; } @@ -496,7 +489,7 @@ static void glob_expand_one(char *s, char **argv, int *argc, int maxargs) sanitize_path(s, NULL); } - memset(&globbuf, 0, sizeof(globbuf)); + memset(&globbuf, 0, sizeof globbuf); if (!exclude_server_path(s)) glob(s, 0, NULL, &globbuf); if (globbuf.gl_pathc == 0) { @@ -559,12 +552,57 @@ void strlower(char *s) } } -void *Realloc(void *p, int size) +/* Join strings p1 & p2 into "dest" with a guaranteed '/' between them. (If + * p1 ends with a '/', no extra '/' is inserted.) Returns the length of both + * strings + 1 (if '/' was inserted), regardless of whether the whole thing + * fits into destsize (including the terminating '\0'). */ +size_t pathjoin(char *dest, size_t destsize, const char *p1, const char *p2) { - if (!p) return (void *)malloc(size); - return (void *)realloc(p, size); + size_t len = strlcpy(dest, p1, destsize); + if (len < destsize - 1) { + if (!len || dest[len-1] != '/') + dest[len++] = '/'; + if (len < destsize - 1) + len += strlcpy(dest + len, p2, destsize - len); + else { + dest[len] = '\0'; + len += strlen(p2); + } + } + else + len += strlen(p2) + 1; /* Assume we'd insert a '/'. */ + return len; } +/* Join any number of strings together, putting them in "dest". The return + * value is the length of all the strings, regardless of whether they fit in + * destsize (including the terminating '\0'). Your list of string pointers + * should end with a NULL to indicate the end of the list. */ +size_t stringjoin(char *dest, size_t destsize, ...) +{ + va_list ap; + size_t len, ret = 0; + const char *src; + + va_start(ap, destsize); + while (1) { + if (!(src = va_arg(ap, const char *))) + break; + len = strlen(src); + ret += len; + if (destsize > 1) { + if (len >= destsize) + len = destsize - 1; + memcpy(dest, src, len); + destsize -= len; + dest += len; + } + } + *dest = '\0'; + va_end(ap); + + return ret; +} void clean_fname(char *name) { @@ -593,7 +631,7 @@ void clean_fname(char *name) } } - if (strncmp(p=name,"./",2) == 0) { + if (strncmp(p=name,"./",2) == 0) { modified = 1; do { p[0] = p[2]; @@ -721,57 +759,111 @@ void sanitize_path(char *p, char *reldir) char curr_dir[MAXPATHLEN]; +unsigned int curr_dir_len; /** - * Like chdir() but can be reversed with pop_dir() if @p save is set. - * It is also much faster as it remembers where we have been. + * Like chdir(), but it keeps track of the current directory (in the + * global "curr_dir"), and ensures that the path size doesn't overflow. + * Also cleans the path using the clean_fname() function. **/ -char *push_dir(char *dir, int save) +int push_dir(char *dir) { - char *ret = curr_dir; static int initialised; + unsigned int len; if (!initialised) { initialised = 1; - getcwd(curr_dir, sizeof(curr_dir)-1); + getcwd(curr_dir, sizeof curr_dir - 1); + curr_dir_len = strlen(curr_dir); } - if (!dir) return NULL; /* this call was probably just to initialize */ + if (!dir) /* this call was probably just to initialize */ + return 0; - if (chdir(dir)) return NULL; + len = strlen(dir); + if (len == 1 && *dir == '.') + return 1; - if (save) { - ret = strdup(curr_dir); - } + if ((*dir == '/' ? len : curr_dir_len + 1 + len) >= sizeof curr_dir) + return 0; + + if (chdir(dir)) + return 0; if (*dir == '/') { - strlcpy(curr_dir, dir, sizeof(curr_dir)); - } else if (dir[0] != '.' || dir[1] != '\0') { - strlcat(curr_dir,"/", sizeof(curr_dir)); - strlcat(curr_dir,dir, sizeof(curr_dir)); + memcpy(curr_dir, dir, len + 1); + curr_dir_len = len; + } else { + curr_dir[curr_dir_len++] = '/'; + memcpy(curr_dir + curr_dir_len, dir, len + 1); + curr_dir_len += len; } clean_fname(curr_dir); - return ret; + return 1; } -/** Reverse a push_dir() call */ +/** + * Reverse a push_dir() call. You must pass in an absolute path + * that was copied from a prior value of "curr_dir". + **/ int pop_dir(char *dir) { - int ret; + if (chdir(dir)) + return 0; - ret = chdir(dir); - if (ret) { - free(dir); - return ret; - } + curr_dir_len = strlcpy(curr_dir, dir, sizeof curr_dir); + if (curr_dir_len >= sizeof curr_dir) + curr_dir_len = sizeof curr_dir - 1; - strlcpy(curr_dir, dir, sizeof(curr_dir)); + return 1; +} + +/** + * Return a quoted string with the full pathname of the indicated filename. + * The string " (in MODNAME)" may also be appended. The returned pointer + * remains valid until the next time full_fname() is called. + **/ +char *full_fname(char *fn) +{ + extern int module_id; + static char *result = NULL; + char *m1, *m2, *m3; + char *p1, *p2; + + if (result) + free(result); + + if (*fn == '/') + p1 = p2 = ""; + else { + p1 = curr_dir; + p2 = "/"; + } + if (module_id >= 0) { + m1 = " (in "; + m2 = lp_name(module_id); + m3 = ")"; + if (*p1) { + if (!lp_use_chroot(module_id)) { + char *p = lp_path(module_id); + if (*p != '/' || p[1]) + p1 += strlen(p); + } + if (!*p1) + p2++; + else + p1++; + } + else + fn++; + } else + m1 = m2 = m3 = ""; - free(dir); + asprintf(&result, "\"%s%s%s\"%s%s%s", p1, p2, fn, m1, m2, m3); - return 0; + return result; } /** We need to supply our own strcmp function for file list comparisons @@ -784,7 +876,7 @@ int u_strcmp(const char *cs1, const char *cs2) while (*s1 && *s2 && (*s1 == *s2)) { s1++; s2++; } - + return (int)*s1 - (int)*s2; } @@ -863,9 +955,9 @@ char *timestring(time_t t) struct tm *tm = localtime(&t); #ifdef HAVE_STRFTIME - strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %T",tm); + strftime(TimeBuf, sizeof TimeBuf - 1, "%Y/%m/%d %H:%M:%S", tm); #else - strlcpy(TimeBuf, asctime(tm), sizeof(TimeBuf)); + strlcpy(TimeBuf, asctime(tm), sizeof TimeBuf); #endif if (TimeBuf[strlen(TimeBuf)-1] == '\n') { @@ -885,20 +977,20 @@ char *timestring(time_t t) int msleep(int t) { int tdiff=0; - struct timeval tval,t1,t2; + struct timeval tval,t1,t2; gettimeofday(&t1, NULL); gettimeofday(&t2, NULL); - + while (tdiff < t) { tval.tv_sec = (t-tdiff)/1000; tval.tv_usec = 1000*((t-tdiff)%1000); - + errno = 0; select(0,NULL,NULL, NULL, &tval); gettimeofday(&t2, NULL); - tdiff = (t2.tv_sec - t1.tv_sec)*1000 + + tdiff = (t2.tv_sec - t1.tv_sec)*1000 + (t2.tv_usec - t1.tv_usec)/1000; } @@ -944,7 +1036,7 @@ int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6) int ret; char *cmd; - asprintf(&cmd, "/usr/X11R6/bin/xterm -display :0 -T Panic -n Panic -e /bin/sh -c 'cat /tmp/ierrs.*.%d ; gdb /proc/%d/exe %d'", + asprintf(&cmd, "/usr/X11R6/bin/xterm -display :0 -T Panic -n Panic -e /bin/sh -c 'cat /tmp/ierrs.*.%d ; gdb /proc/%d/exe %d'", getpid(), getpid(), getpid()); if (!fn) { @@ -962,3 +1054,23 @@ int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6) return ret; } #endif + + +#define MALLOC_MAX 0x40000000 + +void *_new_array(unsigned int size, unsigned long num) +{ + if (num >= MALLOC_MAX/size) + return NULL; + return malloc(size * num); +} + +void *_realloc_array(void *ptr, unsigned int size, unsigned long num) +{ + if (num >= MALLOC_MAX/size) + return NULL; + /* No realloc should need this, but just in case... */ + if (!ptr) + return malloc(size * num); + return realloc(ptr, size * num); +}