* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2018 Wayne Davison
*
* 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
extern int dry_run;
extern int module_id;
+extern int protect_args;
extern int modify_window;
extern int relative_paths;
+extern int preserve_times;
extern int preserve_xattrs;
+extern int preallocate_files;
extern char *module_dir;
extern unsigned int module_dirlen;
-extern mode_t orig_umask;
extern char *partial_dir;
-extern struct filter_list_struct daemon_filter_list;
+extern filter_rule_list daemon_filter_list;
int sanitize_paths = 0;
void print_child_argv(const char *prefix, char **cmd)
{
+ int cnt = 0;
rprintf(FCLIENT, "%s ", prefix);
for (; *cmd; cmd++) {
/* Look for characters that ought to be quoted. This
} else {
rprintf(FCLIENT, "%s ", *cmd);
}
+ cnt++;
}
- rprintf(FCLIENT, "\n");
+ rprintf(FCLIENT, " (%d args)\n", cnt);
}
-NORETURN void out_of_memory(const char *str)
+/* This returns 0 for success, 1 for a symlink if symlink time-setting
+ * is not possible, or -1 for any other error. */
+int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
{
- rprintf(FERROR, "ERROR: out of memory in %s [%s]\n", str, who_am_i());
- exit_cleanup(RERR_MALLOC);
-}
-
-NORETURN void overflow_exit(const char *str)
-{
- rprintf(FERROR, "ERROR: buffer overflow in %s [%s]\n", str, who_am_i());
- exit_cleanup(RERR_MALLOC);
-}
-
-int set_modtime(const char *fname, time_t modtime, mode_t mode)
-{
-#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
- if (S_ISLNK(mode))
- return 1;
-#endif
+ static int switch_step = 0;
if (DEBUG_GTE(TIME, 1)) {
rprintf(FINFO, "set modtime of %s to (%ld) %s",
asctime(localtime(&modtime)));
}
- if (dry_run)
- return 0;
+ switch (switch_step) {
+#ifdef HAVE_SETATTRLIST
+#include "case_N.h"
+ if (do_setattrlist_times(fname, modtime, mod_nsec) == 0)
+ break;
+ if (errno != ENOSYS)
+ return -1;
+ switch_step++;
+#endif
- {
-#ifdef HAVE_UTIMES
- 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;
-# ifdef HAVE_LUTIMES
- if (S_ISLNK(mode)) {
- if (lutimes(fname, t) < 0)
- return errno == ENOSYS ? 1 : -1;
- return 0;
+#ifdef HAVE_UTIMENSAT
+#include "case_N.h"
+ if (do_utimensat(fname, modtime, mod_nsec) == 0)
+ break;
+ if (errno != ENOSYS)
+ return -1;
+ switch_step++;
+#endif
+
+#ifdef HAVE_LUTIMES
+#include "case_N.h"
+ if (do_lutimes(fname, modtime, mod_nsec) == 0)
+ break;
+ if (errno != ENOSYS)
+ return -1;
+ switch_step++;
+#endif
+
+#include "case_N.h"
+ switch_step++;
+ if (preserve_times & PRESERVE_LINK_TIMES) {
+ preserve_times &= ~PRESERVE_LINK_TIMES;
+ if (S_ISLNK(mode))
+ return 1;
}
-# endif
- return utimes(fname, t);
-#elif defined HAVE_STRUCT_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);
+
+#include "case_N.h"
+#ifdef HAVE_UTIMES
+ if (do_utimes(fname, modtime, mod_nsec) == 0)
+ break;
#else
-#error No file-time-modification routine found!
+ if (do_utime(fname, modtime, mod_nsec) == 0)
+ break;
#endif
- }
-}
-
-/* This creates a new directory with default permissions. Since there
- * might be some directory-default permissions affecting this, we can't
- * force the permissions directly using the original umask and mkdir(). */
-int mkdir_defmode(char *fname)
-{
- int ret;
- umask(orig_umask);
- ret = do_mkdir(fname, ACCESSPERMS);
- umask(0);
+ return -1;
+ }
- return ret;
+ return 0;
}
/* Create any necessary directories in fname. Any missing directories are
- * created with default permissions. */
-int create_directory_path(char *fname)
+ * created with default permissions. Returns < 0 on error, or the number
+ * of directories created. */
+int make_path(char *fname, int flags)
{
- char *p;
+ char *end, *p;
int ret = 0;
- while (*fname == '/')
- fname++;
- while (strncmp(fname, "./", 2) == 0)
+ if (flags & MKP_SKIP_SLASH) {
+ while (*fname == '/')
+ fname++;
+ }
+
+ while (*fname == '.' && fname[1] == '/')
fname += 2;
- umask(orig_umask);
- p = fname;
- while ((p = strchr(p,'/')) != NULL) {
- *p = '\0';
- if (do_mkdir(fname, ACCESSPERMS) < 0 && errno != EEXIST)
- ret = -1;
- *p++ = '/';
+ if (flags & MKP_DROP_NAME) {
+ end = strrchr(fname, '/');
+ if (!end || end == fname)
+ return 0;
+ *end = '\0';
+ } else
+ end = fname + strlen(fname);
+
+ /* Try to find an existing dir, starting from the deepest dir. */
+ for (p = end; ; ) {
+ if (dry_run) {
+ STRUCT_STAT st;
+ if (do_stat(fname, &st) == 0) {
+ if (S_ISDIR(st.st_mode))
+ errno = EEXIST;
+ else
+ errno = ENOTDIR;
+ }
+ } else if (do_mkdir(fname, ACCESSPERMS) == 0) {
+ ret++;
+ break;
+ }
+
+ if (errno != ENOENT) {
+ STRUCT_STAT st;
+ if (errno != EEXIST || (do_stat(fname, &st) == 0 && !S_ISDIR(st.st_mode)))
+ ret = -ret - 1;
+ break;
+ }
+ while (1) {
+ if (p == fname) {
+ /* We got a relative path that doesn't exist, so assume that '.'
+ * is there and just break out and create the whole thing. */
+ p = NULL;
+ goto double_break;
+ }
+ if (*--p == '/') {
+ if (p == fname) {
+ /* We reached the "/" dir, which we assume is there. */
+ goto double_break;
+ }
+ *p = '\0';
+ break;
+ }
+ }
+ }
+ double_break:
+
+ /* Make all the dirs that we didn't find on the way here. */
+ while (p != end) {
+ if (p)
+ *p = '/';
+ else
+ p = fname;
+ p += strlen(p);
+ if (ret < 0) /* Skip mkdir on error, but keep restoring the path. */
+ continue;
+ if (do_mkdir(fname, ACCESSPERMS) < 0)
+ ret = -ret - 1;
+ else
+ ret++;
}
- umask(0);
+
+ if (flags & MKP_DROP_NAME)
+ *end = '/';
return ret;
}
*
* This is used in conjunction with the --temp-dir, --backup, and
* --copy-dest options. */
-int copy_file(const char *source, const char *dest, int ofd,
- mode_t mode, int create_bak_dir)
+int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
{
int ifd;
char buf[1024 * 8];
int len; /* Number of bytes read into `buf'. */
+ OFF_T prealloc_len = 0, offset = 0;
if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
int save_errno = errno;
if (robust_unlink(dest) && errno != ENOENT) {
int save_errno = errno;
rsyserr(FERROR_XFER, errno, "unlink %s", full_fname(dest));
+ close(ifd);
errno = save_errno;
return -1;
}
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs)
+ mode |= S_IWUSR;
+#endif
+ mode &= INITACCESSPERMS;
if ((ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0) {
- int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
- if (create_bak_dir && errno == ENOENT && make_bak_dir(dest) == 0) {
- if ((ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0)
- save_errno = errno ? errno : save_errno;
- else
- save_errno = 0;
- }
- if (save_errno) {
- rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(dest));
- close(ifd);
- errno = save_errno;
- return -1;
- }
+ int save_errno = errno;
+ rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(dest));
+ close(ifd);
+ errno = save_errno;
+ return -1;
}
}
+#ifdef SUPPORT_PREALLOCATION
+ if (preallocate_files) {
+ STRUCT_STAT srcst;
+
+ /* Try to preallocate enough space for file's eventual length. Can
+ * reduce fragmentation on filesystems like ext4, xfs, and NTFS. */
+ if (do_fstat(ifd, &srcst) < 0)
+ rsyserr(FWARNING, errno, "fstat %s", full_fname(source));
+ else if (srcst.st_size > 0) {
+ prealloc_len = do_fallocate(ofd, 0, srcst.st_size);
+ if (prealloc_len < 0)
+ rsyserr(FWARNING, errno, "do_fallocate %s", full_fname(dest));
+ }
+ }
+#endif
+
while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
if (full_write(ofd, buf, len) < 0) {
int save_errno = errno;
errno = save_errno;
return -1;
}
+ offset += len;
}
if (len < 0) {
full_fname(source));
}
+ /* Source file might have shrunk since we fstatted it.
+ * Cut off any extra preallocated zeros from dest file. */
+ if (offset < prealloc_len && do_ftruncate(ofd, offset) < 0) {
+ /* If we fail to truncate, the dest file may be wrong, so we
+ * must trigger the "partial transfer" error. */
+ rsyserr(FERROR_XFER, errno, "ftruncate %s", full_fname(dest));
+ }
+
if (close(ofd) < 0) {
int save_errno = errno;
rsyserr(FERROR_XFER, errno, "close failed on %s",
return -2;
to = partialptr;
}
- if (copy_file(from, to, -1, mode, 0) != 0)
+ if (copy_file(from, to, -1, mode) != 0)
return -2;
do_unlink(from);
return 1;
}
}
-/** Turn a user name into a uid */
-int name_to_uid(const char *name, uid_t *uid_p)
-{
- struct passwd *pass;
- if (!name || !*name)
- return 0;
- if (!(pass = getpwnam(name)))
- return 0;
- *uid_p = pass->pw_uid;
- return 1;
-}
-
-/** Turn a group name into a gid */
-int name_to_gid(const char *name, gid_t *gid_p)
-{
- struct group *grp;
- if (!name || !*name)
- return 0;
- if (!(grp = getgrnam(name)))
- return 0;
- *gid_p = grp->gr_gid;
- return 1;
-}
-
/** Lock a byte range in a open file */
int lock_range(int fd, int offset, int len)
{
if (strncmp(arg, base, base_len) == 0)
arg += base_len;
+ if (protect_args) {
+ glob_expand(arg, argv_p, argc_p, maxargs_p);
+ return;
+ }
+
if (!(arg = strdup(arg)))
out_of_memory("glob_expand_module");
- if (asprintf(&base," %s/", base1) <= 0)
+ if (asprintf(&base," %s/", base1) < 0)
out_of_memory("glob_expand_module");
base_len++;
}
}
+/**
+ * Split a string into tokens based (usually) on whitespace & commas. If the
+ * string starts with a comma (after skipping any leading whitespace), then
+ * splitting is done only on commas. No empty tokens are ever returned. */
+char *conf_strtok(char *str)
+{
+ static int commas_only = 0;
+
+ if (str) {
+ while (isSpace(str)) str++;
+ if (*str == ',') {
+ commas_only = 1;
+ str++;
+ } else
+ commas_only = 0;
+ }
+
+ while (commas_only) {
+ char *end, *tok = strtok(str, ",");
+ if (!tok)
+ return NULL;
+ /* Trim just leading and trailing whitespace. */
+ while (isSpace(tok))
+ tok++;
+ end = tok + strlen(tok);
+ while (end > tok && isSpace(end-1))
+ *--end = '\0';
+ if (*tok)
+ return tok;
+ str = NULL;
+ }
+
+ return strtok(str, " ,\t\r\n");
+}
+
/* 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
return cnt;
}
-/* Turns multiple adjacent slashes into a single slash, drops all leading or
+/* Turns multiple adjacent slashes into a single slash (possible exception:
+ * the preserving of two leading slashes at the start), drops all leading or
* interior "." elements unless CFN_KEEP_DOT_DIRS is flagged. Will also drop
* a trailing '.' after a '/' if CFN_DROP_TRAILING_DOT_DIR is flagged, removes
* a trailing slash (perhaps after removing the aforementioned dot) unless
* CFN_KEEP_TRAILING_SLASH is flagged, and will also collapse ".." elements
* (except at the start) if CFN_COLLAPSE_DOT_DOT_DIRS is flagged. If the
* resulting name would be empty, returns ".". */
-unsigned int clean_fname(char *name, int flags)
+int clean_fname(char *name, int flags)
{
char *limit = name - 1, *t = name, *f = name;
int anchored;
if (!name)
return 0;
- if ((anchored = *f == '/') != 0)
+#define DOT_IS_DOT_DOT_DIR(bp) (bp[1] == '.' && (bp[2] == '/' || !bp[2]))
+
+ if ((anchored = *f == '/') != 0) {
*t++ = *f++;
- else if (flags & CFN_KEEP_DOT_DIRS && *f == '.' && f[1] == '/') {
+#ifdef __CYGWIN__
+ /* If there are exactly 2 slashes at the start, preserve
+ * them. Would break daemon excludes unless the paths are
+ * really treated differently, so used this sparingly. */
+ if (*f == '/' && f[1] != '/')
+ *t++ = *f++;
+#endif
+ } else if (flags & CFN_KEEP_DOT_DIRS && *f == '.' && f[1] == '/') {
*t++ = *f++;
*t++ = *f++;
- }
+ } else if (flags & CFN_REFUSE_DOT_DOT_DIRS && *f == '.' && DOT_IS_DOT_DOT_DIR(f))
+ return -1;
while (*f) {
/* discard extra slashes */
if (*f == '/') {
if (f[1] == '\0' && flags & CFN_DROP_TRAILING_DOT_DIR)
break;
/* collapse ".." dirs */
- if (flags & CFN_COLLAPSE_DOT_DOT_DIRS
- && f[1] == '.' && (f[2] == '/' || !f[2])) {
+ if (flags & (CFN_COLLAPSE_DOT_DOT_DIRS|CFN_REFUSE_DOT_DOT_DIRS) && DOT_IS_DOT_DOT_DIR(f)) {
char *s = t - 1;
+ if (flags & CFN_REFUSE_DOT_DOT_DIRS)
+ return -1;
if (s == name && anchored) {
f += 2;
continue;
*t++ = '.';
*t = '\0';
+#undef DOT_IS_DOT_DOT_DIR
+
return t - name;
}
int rlen = 0, drop_dot_dirs = !relative_paths || !(flags & SP_KEEP_DOT_DIRS);
if (dest != p) {
- int plen = strlen(p);
+ int plen = strlen(p); /* the path len INCLUDING any separating slash */
if (*p == '/') {
if (!rootdir)
rootdir = module_dir;
if (dest) {
if (rlen + plen + 1 >= MAXPATHLEN)
return NULL;
- } else if (!(dest = new_array(char, rlen + plen + 1)))
+ } else if (!(dest = new_array(char, MAX(rlen + plen + 1, 2))))
out_of_memory("sanitize_path");
- if (rlen) {
+ if (rlen) { /* only true if p previously started with a slash */
memcpy(dest, rootdir, rlen);
- if (rlen > 1)
+ if (rlen > 1) /* a rootdir of len 1 is "/", so this avoids a 2nd slash */
dest[rlen++] = '/';
}
}
* Also cleans the path using the clean_fname() function. */
int change_dir(const char *dir, int set_path_only)
{
- static int initialised;
+ static int initialised, skipped_chdir;
unsigned int len;
if (!initialised) {
initialised = 1;
- getcwd(curr_dir, sizeof curr_dir - 1);
+ if (getcwd(curr_dir, sizeof curr_dir - 1) == NULL) {
+ rsyserr(FERROR, errno, "getcwd()");
+ exit_cleanup(RERR_FILESELECT);
+ }
curr_dir_len = strlen(curr_dir);
}
return 0;
len = strlen(dir);
- if (len == 1 && *dir == '.')
+ if (len == 1 && *dir == '.' && (!skipped_chdir || set_path_only))
return 1;
if (*dir == '/') {
}
if (!set_path_only && chdir(dir))
return 0;
+ skipped_chdir = set_path_only;
memcpy(curr_dir, dir, len + 1);
} else {
if (curr_dir_len + 1 + len >= sizeof curr_dir) {
errno = ENAMETOOLONG;
return 0;
}
- curr_dir[curr_dir_len] = '/';
- memcpy(curr_dir + curr_dir_len + 1, dir, len + 1);
+ if (!(curr_dir_len && curr_dir[curr_dir_len-1] == '/'))
+ curr_dir[curr_dir_len++] = '/';
+ memcpy(curr_dir + curr_dir_len, dir, len + 1);
if (!set_path_only && chdir(curr_dir)) {
curr_dir[curr_dir_len] = '\0';
return 0;
}
+ skipped_chdir = set_path_only;
}
- curr_dir_len = clean_fname(curr_dir, CFN_COLLAPSE_DOT_DOT_DIRS);
+ curr_dir_len = clean_fname(curr_dir, CFN_COLLAPSE_DOT_DOT_DIRS | CFN_DROP_TRAILING_DOT_DIR);
if (sanitize_paths) {
if (module_dirlen > curr_dir_len)
module_dirlen = curr_dir_len;
} else
m1 = m2 = m3 = "";
- if (asprintf(&result, "\"%s%s%s\"%s%s%s", p1, p2, fn, m1, m2, m3) <= 0)
+ if (asprintf(&result, "\"%s%s%s\"%s%s%s", p1, p2, fn, m1, m2, m3) < 0)
out_of_memory("full_fname");
return result;
return 1;
}
-/**
- * Determine if a symlink points outside the current directory tree.
+/* Determine if a symlink points outside the current directory tree.
* This is considered "unsafe" because e.g. when mirroring somebody
* else's machine it might allow them to establish a symlink to
* /etc/passwd, and then read it through a web server.
*
+ * Returns 1 if unsafe, 0 if safe.
+ *
* Null symlinks and absolute symlinks are always unsafe.
*
* Basically here we are concerned with symlinks whose target contains
* transferred directory. We are not allowed to go back up and
* reenter.
*
- * @param dest Target of the symlink in question.
+ * "dest" is the target of the symlink in question.
*
- * @param src Top source directory currently applicable. Basically this
- * is the first parameter to rsync in a simple invocation, but it's
- * modified by flist.c in slightly complex ways.
- *
- * @retval True if unsafe
- * @retval False is unsafe
- *
- * @sa t_unsafe.c
- **/
+ * "src" is the top source directory currently applicable at the level
+ * of the referenced symlink. This is usually the symlink's full path
+ * (including its name), as referenced from the root of the transfer. */
int unsafe_symlink(const char *dest, const char *src)
{
const char *name, *slash;
/* find out what our safety margin is */
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 {
+ /* ".." segment starts the count over. "." segment is ignored. */
+ if (*name == '.' && (name[1] == '/' || (name[1] == '.' && name[2] == '/'))) {
+ if (name[1] == '.')
+ depth = 0;
+ } else
depth++;
- }
+ while (slash[1] == '/') slash++; /* just in case src isn't clean */
}
- if (strcmp(name, "..") == 0)
+ if (*name == '.' && name[1] == '.' && name[2] == '\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 {
+ if (*name == '.' && (name[1] == '/' || (name[1] == '.' && name[2] == '/'))) {
+ if (name[1] == '.') {
+ /* if at any point we go outside the current directory
+ then stop - it is unsafe */
+ if (--depth < 0)
+ return 1;
+ }
+ } else
depth++;
- }
+ while (slash[1] == '/') slash++;
}
- if (strcmp(name, "..") == 0)
+ if (*name == '.' && name[1] == '.' && name[2] == '\0')
depth--;
- return (depth < 0);
+ return depth < 0;
}
/* Return the date and time as a string. Some callers tweak returned buf. */
return TimeBuf;
}
-/**
- * Sleep for a specified number of milliseconds.
- *
- * Always returns TRUE. (In the future it might return FALSE if
- * interrupted.)
- **/
-int msleep(int t)
-{
- int tdiff = 0;
- struct timeval tval, t1, t2;
-
- gettimeofday(&t1, 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 +
- (t2.tv_usec - t1.tv_usec)/1000;
- }
-
- return True;
-}
-
/* Determine if two time_t values are equivalent (either exact, or in
* the modification timestamp window established by --modify-window).
*
*
* @retval -1 if the 2nd is later
**/
-int cmp_time(time_t file1, time_t file2)
+int cmp_time(time_t f1_sec, unsigned long f1_nsec, time_t f2_sec, unsigned long f2_nsec)
{
- if (file2 > file1) {
- if (file2 - file1 <= modify_window)
- return 0;
- return -1;
+ if (f2_sec > f1_sec) {
+ /* The final comparison makes sure that modify_window doesn't overflow a
+ * time_t, which would mean that f2_sec must be in the equality window. */
+ if (modify_window <= 0 || (f2_sec > f1_sec + modify_window && f1_sec + modify_window > f1_sec))
+ return -1;
+ } else if (f1_sec > f2_sec) {
+ if (modify_window <= 0 || (f1_sec > f2_sec + modify_window && f2_sec + modify_window > f2_sec))
+ return 1;
+ } else if (modify_window < 0) {
+ if (f2_nsec > f1_nsec)
+ return -1;
+ else if (f1_nsec > f2_nsec)
+ return 1;
}
- if (file1 - file2 <= modify_window)
- return 0;
- return 1;
+ return 0;
}
-
#ifdef __INSURE__XX
#include <dlfcn.h>
int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6)
{
static int (*fn)();
- int ret;
+ int ret, pid_int = getpid();
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'",
- getpid(), getpid(), getpid());
+ if (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'", pid_int, pid_int, pid_int) < 0)
+ return -1;
if (!fn) {
static void *h;
}
#endif
-#define MALLOC_MAX 0x40000000
-
-void *_new_array(unsigned long num, unsigned int size, int use_calloc)
-{
- if (num >= MALLOC_MAX/size)
- return NULL;
- return use_calloc ? calloc(num, size) : malloc(num * size);
-}
-
-void *_realloc_array(void *ptr, unsigned int size, size_t num)
-{
- if (num >= MALLOC_MAX/size)
- return NULL;
- if (!ptr)
- return malloc(size * num);
- return realloc(ptr, size * num);
-}
-
/* Take a filename and filename length and return the most significant
* filename suffix we can find. This ignores suffixes such as "~",
* ".bak", ".orig", ".~1~", etc. */
#define UNIT (1 << 16)
-uint32 fuzzy_distance(const char *s1, int len1, const char *s2, int len2)
+uint32 fuzzy_distance(const char *s1, unsigned len1, const char *s2, unsigned len2)
{
uint32 a[MAXPATHLEN], diag, above, left, diag_inc, above_inc, left_inc;
int32 cost;
- int i1, i2;
+ unsigned i1, i2;
if (!len1 || !len2) {
if (!len1) {
return ndx;
}
+/* Make sure there is room for one more item in the item list. If there
+ * is not, expand the list as indicated by the value of "incr":
+ * - if incr < 0 then increase the malloced size by -1 * incr
+ * - if incr >= 0 then either make the malloced size equal to "incr"
+ * or (if that's not large enough) double the malloced size
+ * After the size check, the list's count is incremented by 1 and a pointer
+ * to the "new" list item is returned.
+ */
void *expand_item_list(item_list *lp, size_t item_size,
const char *desc, int incr)
{
if (incr < 0)
new_size += -incr; /* increase slowly */
else if (new_size < (size_t)incr)
- new_size += incr;
- else
+ new_size = incr;
+ else if (new_size)
new_size *= 2;
- if (new_size < lp->malloced)
+ else
+ new_size = 1;
+ if (new_size <= lp->malloced)
overflow_exit("expand_item_list");
/* Using _realloc_array() lets us pass the size, not a type. */
new_ptr = _realloc_array(lp->items, item_size, new_size);
}
return (char*)lp->items + (lp->count++ * item_size);
}
+
+/* This zeroing of memory won't be optimized away by the compiler. */
+void force_memzero(void *buf, size_t len)
+{
+ volatile uchar *z = buf;
+ while (len-- > 0)
+ *z++ = '\0';
+}
git.samba.org / rsync.git / blobdiff