X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/32f761755e2cfee243a1513c9ea9871586463fa6..58b1999e086721ff77d8f3d5e0d29e1e58c70a94:/util.c diff --git a/util.c b/util.c index 63af7dab..a2e8660b 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,12 +22,17 @@ /** * @file * - * Utilities used in rsync + * Utilities used in rsync **/ #include "rsync.h" extern int verbose; +extern int dry_run; +extern int module_id; +extern int modify_window; +extern char *partial_dir; +extern struct exclude_list_struct server_exclude_list; int sanitize_paths = 0; @@ -67,7 +72,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]) @@ -111,33 +116,32 @@ void print_child_argv(char **cmd) void out_of_memory(char *str) { - rprintf(FERROR,"ERROR: out of memory in %s\n",str); - exit_cleanup(RERR_MALLOC); + rprintf(FERROR, "ERROR: out of memory in %s\n", str); + exit_cleanup(RERR_MALLOC); } void overflow(char *str) { - rprintf(FERROR,"ERROR: buffer overflow in %s\n",str); - exit_cleanup(RERR_MALLOC); + rprintf(FERROR, "ERROR: buffer overflow in %s\n", str); + exit_cleanup(RERR_MALLOC); } int set_modtime(char *fname, time_t modtime) { - extern int dry_run; if (dry_run) return 0; if (verbose > 2) { rprintf(FINFO, "set modtime of %s to (%ld) %s", - fname, (long) 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); @@ -167,13 +171,15 @@ int create_directory_path(char *fname, int base_umask) { char *p; - while (*fname == '/') fname++; - while (strncmp(fname,"./",2)==0) fname += 2; + while (*fname == '/') + fname++; + while (strncmp(fname, "./", 2) == 0) + fname += 2; p = fname; - while ((p=strchr(p,'/'))) { + while ((p = strchr(p,'/')) != NULL) { *p = 0; - do_mkdir(fname, 0777 & ~base_umask); + do_mkdir(fname, 0777 & ~base_umask); *p = '/'; p++; } @@ -194,15 +200,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 +231,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; } @@ -255,41 +255,46 @@ int copy_file(char *source, char *dest, mode_t mode) ifd = do_open(source, O_RDONLY, 0); if (ifd == -1) { - rprintf(FERROR,"open %s: %s\n", - source,strerror(errno)); + rsyserr(FERROR, errno, "open %s", full_fname(source)); return -1; } if (robust_unlink(dest) && errno != ENOENT) { - rprintf(FERROR,"unlink %s: %s\n", - dest,strerror(errno)); + rsyserr(FERROR, errno, "unlink %s", full_fname(dest)); return -1; } ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode); if (ofd == -1) { - rprintf(FERROR,"open %s: %s\n", - dest,strerror(errno)); + rsyserr(FERROR, errno, "open %s", full_fname(dest)); close(ifd); 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)); + rsyserr(FERROR, errno, "write %s", full_fname(dest)); close(ifd); close(ofd); return -1; } } - close(ifd); - close(ofd); - if (len < 0) { - rprintf(FERROR,"read %s: %s\n", - source,strerror(errno)); + rsyserr(FERROR, errno, "read %s", full_fname(source)); + close(ifd); + close(ofd); + return -1; + } + + if (close(ifd) < 0) { + rsyserr(FINFO, errno, "close failed on %s", + full_fname(source)); + } + + if (close(ofd) < 0) { + rsyserr(FERROR, errno, "close failed on %s", + full_fname(dest)); return -1; } @@ -320,17 +325,15 @@ int robust_unlink(char *fname) char path[MAXPATHLEN]; rc = do_unlink(fname); - if ((rc == 0) || (errno != ETXTBSY)) + if (rc == 0 || errno != ETXTBSY) return rc; - strlcpy(path, fname, MAXPATHLEN); + if ((pos = strlcpy(path, fname, MAXPATHLEN)) >= MAXPATHLEN) + pos = MAXPATHLEN - 1; - pos = strlen(path); - while((path[--pos] != '/') && (pos >= 0)) - ; - ++pos; - strlcpy(&path[pos], ".rsync", MAXPATHLEN-pos); - pos += sizeof(".rsync")-1; + while (pos > 0 && path[pos-1] != '/') + pos--; + pos += strlcpy(path+pos, ".rsync", MAXPATHLEN-pos); if (pos > (MAXPATHLEN-MAX_RENAMES_DIGITS-1)) { errno = ETXTBSY; @@ -343,11 +346,12 @@ int robust_unlink(char *fname) sprintf(&path[pos], "%03d", counter); if (++counter >= MAX_RENAMES) counter = 1; - } while (((rc = access(path, 0)) == 0) && (counter != start)); + } while ((rc = access(path, 0)) == 0 && counter != start); - if (verbose > 0) + if (verbose > 0) { rprintf(FINFO,"renaming %s to %s because of text busy\n", - fname, path); + fname, path); + } /* maybe we should return rename()'s exit status? Nah. */ if (do_rename(fname, path) != 0) { @@ -358,18 +362,33 @@ int robust_unlink(char *fname) #endif } -int robust_rename(char *from, char *to) +/* Returns 0 on successful rename, 1 if we successfully copied the file + * across filesystems, -2 if copy_file() failed, and -1 on other errors. */ +int robust_rename(char *from, char *to, int mode) { -#ifndef ETXTBSY - return do_rename(from, to); -#else - int rc = do_rename(from, to); - if ((rc == 0) || (errno != ETXTBSY)) - return rc; - if (robust_unlink(to) != 0) - return -1; - return do_rename(from, to); + int tries = 4; + + while (tries--) { + if (do_rename(from, to) == 0) + return 0; + + switch (errno) { +#ifdef ETXTBSY + case ETXTBSY: + if (robust_unlink(to) != 0) + return -1; + break; #endif + case EXDEV: + if (copy_file(from, to, mode) != 0) + return -2; + do_unlink(from); + return 1; + default: + return -1; + } + } + return -1; } @@ -380,7 +399,7 @@ static int num_pids; pid_t do_fork(void) { pid_t newpid = fork(); - + if (newpid != 0 && newpid != -1) { all_pids[num_pids++] = newpid; } @@ -421,7 +440,8 @@ void kill_all(int sig) int name_to_uid(char *name, uid_t *uid) { struct passwd *pass; - if (!name || !*name) return 0; + if (!name || !*name) + return 0; pass = getpwnam(name); if (pass) { *uid = pass->pw_uid; @@ -434,7 +454,8 @@ int name_to_uid(char *name, uid_t *uid) int name_to_gid(char *name, gid_t *gid) { struct group *grp; - if (!name || !*name) return 0; + if (!name || !*name) + return 0; grp = getgrnam(name); if (grp) { *gid = grp->gr_gid; @@ -454,74 +475,113 @@ 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; } +static int exclude_server_path(char *arg) +{ + char *s; + + if (server_exclude_list.head) { + for (s = arg; (s = strchr(s, '/')) != NULL; ) { + *s = '\0'; + if (check_exclude(&server_exclude_list, arg, 1) < 0) { + /* We must leave arg truncated! */ + return 1; + } + *s++ = '/'; + } + } + return 0; +} -static void glob_expand_one(char *s, char **argv, int *argc, int maxargs) +static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr, + int *maxargs_ptr) { + char **argv = *argv_ptr; + int argc = *argc_ptr; + int maxargs = *maxargs_ptr; #if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H)) - if (!*s) s = "."; - argv[*argc] = strdup(s); - (*argc)++; - return; + if (argc == maxargs) { + maxargs += MAX_ARGS; + if (!(argv = realloc_array(argv, char *, maxargs))) + out_of_memory("glob_expand_one"); + *argv_ptr = argv; + *maxargs_ptr = maxargs; + } + if (!*s) + s = "."; + s = argv[argc++] = strdup(s); + exclude_server_path(s); #else - extern int sanitize_paths; glob_t globbuf; int i; - if (!*s) s = "."; - - argv[*argc] = strdup(s); - if (sanitize_paths) { - sanitize_path(argv[*argc], NULL); - } - - memset(&globbuf, 0, sizeof(globbuf)); - glob(argv[*argc], 0, NULL, &globbuf); - if (globbuf.gl_pathc == 0) { - (*argc)++; - globfree(&globbuf); + if (maxargs <= argc) return; + if (!*s) + s = "."; + + if (sanitize_paths) + s = sanitize_path(NULL, s, "", 0); + else + s = strdup(s); + + memset(&globbuf, 0, sizeof globbuf); + if (!exclude_server_path(s)) + glob(s, 0, NULL, &globbuf); + if (MAX((int)globbuf.gl_pathc, 1) > maxargs - argc) { + maxargs += globbuf.gl_pathc + MAX_ARGS; + if (!(argv = realloc_array(argv, char *, maxargs))) + out_of_memory("glob_expand_one"); + *argv_ptr = argv; + *maxargs_ptr = maxargs; } - for (i=0; i<(maxargs - (*argc)) && i < (int) globbuf.gl_pathc;i++) { - if (i == 0) free(argv[*argc]); - argv[(*argc) + i] = strdup(globbuf.gl_pathv[i]); - if (!argv[(*argc) + i]) out_of_memory("glob_expand"); + if (globbuf.gl_pathc == 0) + argv[argc++] = s; + else { + int j = globbuf.gl_pathc; + free(s); + for (i = 0; i < j; i++) { + if (!(argv[argc++] = strdup(globbuf.gl_pathv[i]))) + out_of_memory("glob_expand_one"); + } } globfree(&globbuf); - (*argc) += i; #endif + *argc_ptr = argc; } -void glob_expand(char *base1, char **argv, int *argc, int maxargs) +/* This routine is only used in daemon mode. */ +void glob_expand(char *base1, char ***argv_ptr, int *argc_ptr, int *maxargs_ptr) { - char *s = argv[*argc]; + char *s = (*argv_ptr)[*argc_ptr]; char *p, *q; char *base = base1; + int base_len = strlen(base); - if (!s || !*s) return; + if (!s || !*s) + return; - if (strncmp(s, base, strlen(base)) == 0) { - s += strlen(base); - } + if (strncmp(s, base, base_len) == 0) + s += base_len; - s = strdup(s); - if (!s) out_of_memory("glob_expand"); + if (!(s = strdup(s))) + out_of_memory("glob_expand"); - if (asprintf(&base," %s/", base1) <= 0) out_of_memory("glob_expand"); + if (asprintf(&base," %s/", base1) <= 0) + out_of_memory("glob_expand"); + base_len++; - q = s; - while ((p = strstr(q,base)) && ((*argc) < maxargs)) { - /* split it at this point */ - *p = 0; - glob_expand_one(q, argv, argc, maxargs); - q = p+strlen(base); + for (q = s; *q; q = p + base_len) { + if ((p = strstr(q, base)) != NULL) + *p = '\0'; /* split it at this point */ + glob_expand_one(q, argv_ptr, argc_ptr, maxargs_ptr); + if (!p) + break; } - if (*q && (*argc < maxargs)) glob_expand_one(q, argv, argc, maxargs); - free(s); free(base); } @@ -532,225 +592,417 @@ void glob_expand(char *base1, char **argv, int *argc, int maxargs) void strlower(char *s) { while (*s) { - if (isupper(* (unsigned char *) s)) - *s = tolower(* (unsigned char *) s); + if (isupper(*(unsigned char *)s)) + *s = tolower(*(unsigned char *)s); 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 null-terminated + * string fits into destsize. */ +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 the null- + * terminated whole fits in destsize. Your list of string pointers must 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) +int count_dir_elements(const char *p) { - char *p; - int l; - int modified = 1; + int cnt = 0, new_component = 1; + while (*p) { + if (*p++ == '/') + new_component = 1; + else if (new_component) { + new_component = 0; + cnt++; + } + } + return cnt; +} - if (!name) return; +/* Turns multiple adjacent slashes into a single slash; gets rid of "./" + * elements; collapses ".." elements except for those at the start of the + * string; removes a trailing slash. If the resulting name would be empty, + * change it into a ".". */ +unsigned int clean_fname(char *name) +{ + char *limit = name - 1, *t = name, *f = name; + int anchored; - while (modified) { - modified = 0; + if (!name) + return 0; - if ((p=strstr(name,"/./"))) { - modified = 1; - while (*p) { - p[0] = p[2]; - p++; - } + if ((anchored = *f == '/') != 0) + *t++ = *f++; + while (*f) { + /* discard extra slashes */ + if (*f == '/') { + f++; + continue; } - - if ((p=strstr(name,"//"))) { - modified = 1; - while (*p) { - p[0] = p[1]; - p++; + if (*f == '.') { + /* discard "." dirs (but NOT a trailing '.'!) */ + if (f[1] == '/') { + f += 2; + continue; + } + /* collapse ".." dirs */ + if (f[1] == '.' && (f[2] == '/' || !f[2])) { + char *s = t - 1; + if (s == name && anchored) { + f += 2; + continue; + } + while (s > limit && *--s != '/') {} + if (s != t - 1 && (s < name || *s == '/')) { + t = s + 1; + f += 2; + continue; + } + *t++ = *f++; + *t++ = *f++; + limit = t; } } + while (*f && (*t++ = *f++) != '/') {} + } - if (strncmp(p=name,"./",2) == 0) { - modified = 1; - do { - p[0] = p[2]; - } while (*p++); - } + if (t > name+anchored && t[-1] == '/') + t--; + if (t == name) + *t++ = '.'; + *t = '\0'; - l = strlen(p=name); - if (l > 1 && p[l-1] == '/') { - modified = 1; - p[l-1] = 0; - } - } + return t - name; } -/** - * Make path appear as if a chroot had occurred: - * - * @li 1. remove leading "/" (or replace with "." if at end) - * - * @li 2. remove leading ".." components (except those allowed by @p reldir) - * - * @li 3. delete any other "/.." (recursively) +/* Make path appear as if a chroot had occurred. This handles a leading + * "/" (either removing it or expanding it) and any leading or embedded + * ".." components that attempt to escape past the module's top dir. * - * Can only shrink paths, so sanitizes in place. + * If dest is NULL, a buffer is allocated to hold the result. It is legal + * to call with the dest and the path (p) pointing to the same buffer, but + * rootdir will be ignored to avoid expansion of the string. * - * While we're at it, remove double slashes and "." components like - * clean_fname() does, but DON'T remove a trailing slash because that - * is sometimes significant on command line arguments. + * The rootdir string contains a value to use in place of a leading slash. + * Specify NULL to get the default of lp_path(module_id). * - * If @p reldir is non-null, it is a sanitized directory that the path will be - * relative to, so allow as many ".." at the beginning of the path as - * there are components in reldir. This is used for symbolic link targets. - * If reldir is non-null and the path began with "/", to be completely like - * a chroot we should add in depth levels of ".." at the beginning of the - * path, but that would blow the assumption that the path doesn't grow and - * it is not likely to end up being a valid symlink anyway, so just do - * the normal removal of the leading "/" instead. + * If depth is > 0, it is a count of how many '..'s to allow at the start + * of the path. * - * Contributed by Dave Dykstra + * We call clean_fname() to clean up the path, but we preserve a trailing + * slash because that is sometimes significant on command-line arguments. */ -void sanitize_path(char *p, char *reldir) +char *sanitize_path(char *dest, const char *p, const char *rootdir, int depth) { char *start, *sanp; - int depth = 0; - int allowdotdot = 0; - - if (reldir) { - depth++; - while (*reldir) { - if (*reldir++ == '/') { - depth++; - } + int rlen = 0; + + if (dest != p) { + int plen = strlen(p); + if (*p == '/') { + if (!rootdir) + rootdir = lp_path(module_id); + rlen = strlen(rootdir); + depth = 0; + p++; + } + if (dest) { + if (rlen + plen + 1 >= MAXPATHLEN) + return NULL; + } else if (!(dest = new_array(char, rlen + plen + 1))) + out_of_memory("sanitize_path"); + if (rlen) { + memcpy(dest, rootdir, rlen); + if (rlen > 1) + dest[rlen++] = '/'; } } - start = p; - sanp = p; - while (*p == '/') { - /* remove leading slashes */ - p++; - } + + start = sanp = dest + rlen; while (*p != '\0') { + /* discard leading or extra slashes */ + if (*p == '/') { + p++; + continue; + } /* this loop iterates once per filename component in p. * both p (and sanp if the original had a slash) should * always be left pointing after a slash */ - if ((*p == '.') && ((*(p+1) == '/') || (*(p+1) == '\0'))) { + if (*p == '.' && (p[1] == '/' || p[1] == '\0')) { /* skip "." component */ - while (*++p == '/') { - /* skip following slashes */ - ; - } + p++; continue; } - allowdotdot = 0; - if ((*p == '.') && (*(p+1) == '.') && - ((*(p+2) == '/') || (*(p+2) == '\0'))) { + if (*p == '.' && p[1] == '.' && (p[2] == '/' || p[2] == '\0')) { /* ".." component followed by slash or end */ - if ((depth > 0) && (sanp == start)) { - /* allow depth levels of .. at the beginning */ - --depth; - allowdotdot = 1; - } else { + if (depth <= 0 || sanp != start) { p += 2; - if (*p == '/') - p++; if (sanp != start) { /* back up sanp one level */ --sanp; /* now pointing at slash */ - while ((sanp > start) && (*(sanp - 1) != '/')) { + while (sanp > start && sanp[-1] != '/') { /* skip back up to slash */ sanp--; } } continue; } - } - while (1) { - /* copy one component through next slash */ - *sanp++ = *p++; - if ((*p == '\0') || (*(p-1) == '/')) { - while (*p == '/') { - /* skip multiple slashes */ - p++; - } - break; - } - } - if (allowdotdot) { + /* allow depth levels of .. at the beginning */ + depth--; /* move the virtual beginning to leave the .. alone */ - start = sanp; + start = sanp + 3; } + /* copy one component through next slash */ + while (*p && (*sanp++ = *p++) != '/') {} } - if ((sanp == start) && !allowdotdot) { + if (sanp == dest) { /* ended up with nothing, so put in "." component */ - /* - * note that the !allowdotdot doesn't prevent this from - * happening in all allowed ".." situations, but I didn't - * think it was worth putting in an extra variable to ensure - * it since an extra "." won't hurt in those situations. - */ *sanp++ = '.'; } *sanp = '\0'; -} + return dest; +} -static char curr_dir[MAXPATHLEN]; +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; + + len = strlen(dir); + if (len == 1 && *dir == '.') + return 1; - if (chdir(dir)) return NULL; + if ((*dir == '/' ? len : curr_dir_len + 1 + len) >= sizeof curr_dir) + return 0; - if (save) { - ret = strdup(curr_dir); - } + if (chdir(dir)) + return 0; if (*dir == '/') { - strlcpy(curr_dir, dir, sizeof(curr_dir)); + memcpy(curr_dir, dir, len + 1); + curr_dir_len = len; } else { - strlcat(curr_dir,"/", sizeof(curr_dir)); - strlcat(curr_dir,dir, sizeof(curr_dir)); + curr_dir[curr_dir_len++] = '/'; + memcpy(curr_dir + curr_dir_len, dir, len + 1); + curr_dir_len += len; } - clean_fname(curr_dir); + curr_dir_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; + + curr_dir_len = strlcpy(curr_dir, dir, sizeof curr_dir); + if (curr_dir_len >= sizeof curr_dir) + curr_dir_len = sizeof curr_dir - 1; + + return 1; +} + +/** + * Return the filename, turning any newlines into '?'s. This ensures that + * outputting it on a line of its own cannot generate an empty line. This + * function can handle only 2 names at a time! + **/ +const char *safe_fname(const char *fname) +{ + static char fbuf1[MAXPATHLEN], fbuf2[MAXPATHLEN]; + static char *fbuf = fbuf2; + char *nl = strchr(fname, '\n'); + + if (!nl) + return fname; + + fbuf = fbuf == fbuf1 ? fbuf2 : fbuf1; + strlcpy(fbuf, fname, MAXPATHLEN); + nl = fbuf + (nl - (char *)fname); + do { + *nl = '?'; + } while ((nl = strchr(nl+1, '\n')) != NULL); + + return fbuf; +} - ret = chdir(dir); - if (ret) { - free(dir); - return ret; +/** + * 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(const char *fn) +{ + static char *result = NULL; + char *m1, *m2, *m3; + char *p1, *p2; + + if (result) + free(result); + + fn = safe_fname(fn); + 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 = ""; - strlcpy(curr_dir, dir, sizeof(curr_dir)); + asprintf(&result, "\"%s%s%s\"%s%s%s", p1, p2, fn, m1, m2, m3); - free(dir); + return result; +} - return 0; +static char partial_fname[MAXPATHLEN]; + +char *partial_dir_fname(const char *fname) +{ + char *t = partial_fname; + int sz = sizeof partial_fname; + const char *fn; + + if ((fn = strrchr(fname, '/')) != NULL) { + fn++; + if (*partial_dir != '/') { + int len = fn - fname; + strncpy(t, fname, len); /* safe */ + t += len; + sz -= len; + } + } else + fn = fname; + if ((int)pathjoin(t, sz, partial_dir, fn) >= sz) + return NULL; + if (server_exclude_list.head + && check_exclude(&server_exclude_list, partial_fname, 0) < 0) + return NULL; + + return partial_fname; +} + +/* If no --partial-dir option was specified, we don't need to do anything + * (the partial-dir is essentially '.'), so just return success. */ +int handle_partial_dir(const char *fname, int create) +{ + char *fn, *dir; + + if (fname != partial_fname) + return 1; + if (!create && *partial_dir == '/') + return 1; + if (!(fn = strrchr(partial_fname, '/'))) + return 1; + + *fn = '\0'; + dir = partial_fname; + if (create) { + STRUCT_STAT st; +#if SUPPORT_LINKS + int statret = do_lstat(dir, &st); +#else + int statret = do_stat(dir, &st); +#endif + if (statret == 0 && !S_ISDIR(st.st_mode)) { + if (do_unlink(dir) < 0) + return 0; + statret = -1; + } + if (statret < 0 && do_mkdir(dir, 0700) < 0) + return 0; + } else + do_rmdir(dir); + *fn = '/'; + + return 1; } /** We need to supply our own strcmp function for file list comparisons @@ -763,7 +1015,7 @@ int u_strcmp(const char *cs1, const char *cs2) while (*s1 && *s2 && (*s1 == *s2)) { s1++; s2++; } - + return (int)*s1 - (int)*s2; } @@ -793,49 +1045,43 @@ int u_strcmp(const char *cs1, const char *cs2) * * @sa t_unsafe.c **/ -int unsafe_symlink(char *dest, char *src) +int unsafe_symlink(const char *dest, const char *src) { - char *tok; + const char *name, *slash; int depth = 0; /* all absolute and null symlinks are unsafe */ - if (!dest || !(*dest) || (*dest == '/')) return 1; - - src = strdup(src); - if (!src) out_of_memory("unsafe_symlink"); + if (!dest || !*dest || *dest == '/') + return 1; /* find out what our safety margin is */ - for (tok=strtok(src,"/"); tok; tok=strtok(NULL,"/")) { - if (strcmp(tok,"..") == 0) { - depth=0; - } else if (strcmp(tok,".") == 0) { + for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) { + if (strncmp(name, "../", 3) == 0) { + depth = 0; + } else if (strncmp(name, "./", 2) == 0) { /* nothing */ } else { depth++; } } - free(src); - - /* drop by one to account for the filename portion */ - depth--; - - dest = strdup(dest); - if (!dest) out_of_memory("unsafe_symlink"); - - for (tok=strtok(dest,"/"); tok; tok=strtok(NULL,"/")) { - if (strcmp(tok,"..") == 0) { - depth--; - } else if (strcmp(tok,".") == 0) { + if (strcmp(name, "..") == 0) + depth = 0; + + for (name = dest; (slash = strchr(name, '/')) != 0; name = slash+1) { + if (strncmp(name, "../", 3) == 0) { + /* if at any point we go outside the current directory + then stop - it is unsafe */ + if (--depth < 0) + return 1; + } else if (strncmp(name, "./", 2) == 0) { /* nothing */ } else { depth++; } - /* if at any point we go outside the current directory then - stop - it is unsafe */ - if (depth < 0) break; } + if (strcmp(name, "..") == 0) + depth--; - free(dest); return (depth < 0); } @@ -849,9 +1095,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') { @@ -870,21 +1116,20 @@ char *timestring(time_t t) **/ int msleep(int t) { - int tdiff=0; - struct timeval tval,t1,t2; + int tdiff = 0; + 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; } @@ -905,13 +1150,13 @@ int msleep(int t) **/ int cmp_modtime(time_t file1, time_t file2) { - extern int modify_window; - if (file2 > file1) { - if (file2 - file1 <= modify_window) return 0; + if (file2 - file1 <= modify_window) + return 0; return -1; } - if (file1 - file2 <= modify_window) return 0; + if (file1 - file2 <= modify_window) + return 0; return 1; } @@ -930,7 +1175,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) { @@ -948,3 +1193,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); +}