* 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-2009 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
#include "rsync.h"
#include "ifuncs.h"
+#include "itypes.h"
+#include "inums.h"
-extern int verbose;
extern int dry_run;
extern int module_id;
extern int modify_window;
extern int relative_paths;
-extern int human_readable;
+extern int preserve_xattrs;
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;
exit_cleanup(RERR_MALLOC);
}
-int set_modtime(const char *fname, time_t modtime, mode_t mode)
+int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
{
-#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
+#ifndef CAN_SET_SYMLINK_TIMES
if (S_ISLNK(mode))
return 1;
#endif
- if (verbose > 2) {
+ if (DEBUG_GTE(TIME, 1)) {
rprintf(FINFO, "set modtime of %s to (%ld) %s",
fname, (long)modtime,
asctime(localtime(&modtime)));
return 0;
{
-#ifdef HAVE_UTIMES
+#ifdef HAVE_UTIMENSAT
+ struct timespec t[2];
+ t[0].tv_sec = 0;
+ t[0].tv_nsec = UTIME_NOW;
+ t[1].tv_sec = modtime;
+ t[1].tv_nsec = mod_nsec;
+ if (utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW) < 0)
+ return S_ISLNK(mode) && errno == ENOSYS ? 1 : -1;
+ return 0;
+#elif defined HAVE_UTIMES || defined HAVE_LUTIMES
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;
+ t[1].tv_usec = mod_nsec / 1000;
# ifdef HAVE_LUTIMES
- if (S_ISLNK(mode)) {
- if (lutimes(fname, t) < 0)
- return errno == ENOSYS ? 1 : -1;
- return 0;
- }
-# endif
+ if (lutimes(fname, t) < 0)
+ return S_ISLNK(mode) && errno == ENOSYS ? 1 : -1;
+ return 0;
+# else
return utimes(fname, t);
+# endif
#elif defined HAVE_STRUCT_UTIMBUF
struct utimbuf tbuf;
tbuf.actime = time(NULL);
}
/* 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)
+ return 0;
+ *end = '\0';
+ } else
+ end = fname + strlen(fname);
+
+ umask(orig_umask); /* NOTE: don't return before setting this back to 0! */
+
+ /* Try to find an existing dir, starting from the deepest dir. */
+ for (p = end; ; ) {
+ if (do_mkdir(fname, ACCESSPERMS) == 0) {
+ ret++;
+ break;
+ }
+ if (errno != ENOENT) {
+ if (errno != EEXIST)
+ ret = -ret - 1;
+ break;
+ }
+ while (1) {
+ if (p == fname) {
+ ret = -ret - 1;
+ goto double_break;
+ }
+ if (*--p == '/') {
+ if (p == fname) {
+ ret = -ret - 1; /* impossible... */
+ goto double_break;
+ }
+ *p = '\0';
+ break;
+ }
+ }
}
+ double_break:
+
+ /* Make all the dirs that we didn't find on the way here. */
+ while (p != end) {
+ *p = '/';
+ 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;
}
/* Copy a file. If ofd < 0, copy_file unlinks and opens the "dest" file.
* Otherwise, it just writes to and closes the provided file descriptor.
+ * In either case, if --xattrs are being preserved, the dest file will
+ * have its xattrs set from the source file.
*
* 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'. */
if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
+ int save_errno = errno;
rsyserr(FERROR_XFER, errno, "open %s", full_fname(source));
+ errno = save_errno;
return -1;
}
if (ofd < 0) {
if (robust_unlink(dest) && errno != ENOENT) {
+ int save_errno = errno;
rsyserr(FERROR_XFER, errno, "unlink %s", full_fname(dest));
+ errno = save_errno;
return -1;
}
- if ((ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0
- && (!create_bak_dir || errno != ENOENT || make_bak_dir(dest) < 0
- || (ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0)) {
- rsyserr(FERROR_XFER, errno, "open %s", full_fname(dest));
+ if ((ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0) {
+ int save_errno = errno;
+ rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(dest));
close(ifd);
+ errno = save_errno;
return -1;
}
}
while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
if (full_write(ofd, buf, len) < 0) {
+ int save_errno = errno;
rsyserr(FERROR_XFER, errno, "write %s", full_fname(dest));
close(ifd);
close(ofd);
+ errno = save_errno;
return -1;
}
}
if (len < 0) {
+ int save_errno = errno;
rsyserr(FERROR_XFER, errno, "read %s", full_fname(source));
close(ifd);
close(ofd);
+ errno = save_errno;
return -1;
}
}
if (close(ofd) < 0) {
+ int save_errno = errno;
rsyserr(FERROR_XFER, errno, "close failed on %s",
full_fname(dest));
+ errno = save_errno;
return -1;
}
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs)
+ copy_xattrs(source, dest);
+#endif
+
return 0;
}
counter = 1;
} while ((rc = access(path, 0)) == 0 && counter != start);
- if (verbose > 0) {
+ if (INFO_GTE(MISC, 1)) {
rprintf(FWARNING, "renaming %s to %s because of text busy\n",
fname, path);
}
switch (errno) {
#ifdef ETXTBSY
case ETXTBSY:
- if (robust_unlink(to) != 0)
+ if (robust_unlink(to) != 0) {
+ errno = ETXTBSY;
return -1;
+ }
+ errno = ETXTBSY;
break;
#endif
case EXDEV:
if (partialptr) {
if (!handle_partial_dir(partialptr,PDIR_CREATE))
- return -1;
+ 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)
+/* Parse a user name or (optionally) a number into a uid */
+int user_to_uid(const char *name, uid_t *uid_p, BOOL num_ok)
{
struct passwd *pass;
if (!name || !*name)
return 0;
+ if (num_ok && name[strspn(name, "0123456789")] == '\0') {
+ *uid_p = atol(name);
+ return 1;
+ }
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)
+/* Parse a group name or (optionally) a number into a gid */
+int group_to_gid(const char *name, gid_t *gid_p, BOOL num_ok)
{
struct group *grp;
if (!name || !*name)
return 0;
+ if (num_ok && name[strspn(name, "0123456789")] == '\0') {
+ *gid_p = atol(name);
+ return 1;
+ }
if (!(grp = getgrnam(name)))
return 0;
*gid_p = grp->gr_gid;
}
#define ENSURE_MEMSPACE(buf, type, sz, req) \
- if ((req) >= sz && !(buf = realloc_array(buf, type, sz *= 2))) \
- out_of_memory("ENSURE_MEMSPACE")
+ if ((req) > sz && !(buf = realloc_array(buf, type, sz = MAX(sz * 2, req)))) \
+ out_of_memory("glob_expand")
static inline void call_glob_match(const char *name, int len, int from_glob,
char *arg, int abpos, int fbpos);
while (*arg == '.' && arg[1] == '/') {
if (fbpos < 0) {
- if (glob.fbsize < glob.absize) {
- glob.filt_buf = realloc_array(glob.filt_buf,
- char, glob.fbsize = glob.absize);
- }
+ ENSURE_MEMSPACE(glob.filt_buf, char, glob.fbsize, glob.absize);
memcpy(glob.filt_buf, glob.arg_buf, abpos + 1);
fbpos = abpos;
}
- ENSURE_MEMSPACE(glob.arg_buf, char, glob.absize, abpos + 2);
+ ENSURE_MEMSPACE(glob.arg_buf, char, glob.absize, abpos + 3);
glob.arg_buf[abpos++] = *arg++;
glob.arg_buf[abpos++] = *arg++;
glob.arg_buf[abpos] = '\0';
} else
use_buf = glob.arg_buf;
- if (from_glob || arg) {
+ if (from_glob || (arg && len)) {
STRUCT_STAT st;
int is_dir;
- if (do_stat(glob.arg_buf, &st) != 0) {
- if (from_glob)
- return;
- is_dir = 0;
- } else {
- is_dir = S_ISDIR(st.st_mode) != 0;
- if (arg && !is_dir)
- return;
- }
+ if (do_stat(glob.arg_buf, &st) != 0)
+ return;
+ is_dir = S_ISDIR(st.st_mode) != 0;
+ if (arg && !is_dir)
+ return;
if (daemon_filter_list.head
- && check_filter(&daemon_filter_list, use_buf, is_dir) < 0) {
- if (from_glob)
- return;
- arg = NULL;
- }
+ && check_filter(&daemon_filter_list, FLOG, use_buf, is_dir) < 0)
+ return;
}
if (arg) {
}
/* This routine performs wild-card expansion of the pathname in "arg". Any
- * daemon-excluded files/dirs will not be matched by the wildcards. */
-void glob_expand(const char *arg, char ***argv_p, int *argc_p, int *maxargs_p)
+ * daemon-excluded files/dirs will not be matched by the wildcards. Returns 0
+ * if a wild-card string is the only returned item (due to matching nothing). */
+int glob_expand(const char *arg, char ***argv_p, int *argc_p, int *maxargs_p)
{
- int save_argc;
+ int ret, save_argc;
char *s;
if (!arg) {
free(glob.filt_buf);
free(glob.arg_buf);
memset(&glob, 0, sizeof glob);
- return;
+ return -1;
}
if (sanitize_paths)
| CFN_COLLAPSE_DOT_DOT_DIRS);
}
- if (glob.absize < MAXPATHLEN
- && !(glob.arg_buf = realloc_array(glob.arg_buf, char, glob.absize = MAXPATHLEN)))
- out_of_memory("glob_expand");
+ ENSURE_MEMSPACE(glob.arg_buf, char, glob.absize, MAXPATHLEN);
*glob.arg_buf = '\0';
glob.argc = save_argc = *argc_p;
glob.argv = *argv_p;
glob.maxargs = *maxargs_p;
- if (glob.maxargs < MAX_ARGS
- && !(glob.argv = realloc_array(glob.argv, char *, glob.maxargs = MAX_ARGS)))
- out_of_memory("glob_expand");
+ ENSURE_MEMSPACE(glob.argv, char *, glob.maxargs, 100);
glob_match(s, 0, -1);
if (glob.argc == save_argc) {
ENSURE_MEMSPACE(glob.argv, char *, glob.maxargs, glob.argc + 1);
glob.argv[glob.argc++] = s;
- } else
+ ret = 0;
+ } else {
free(s);
+ ret = 1;
+ }
*maxargs_p = glob.maxargs;
*argv_p = glob.argv;
*argc_p = glob.argc;
+
+ return ret;
}
/* This routine is only used in daemon mode. */
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
if (!name)
return 0;
- if ((anchored = *f == '/') != 0)
+ 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++;
}
/* 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. */
-int push_dir(const char *dir, int set_path_only)
+int change_dir(const char *dir, int set_path_only)
{
static int initialised;
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);
}
if (len == 1 && *dir == '.')
return 1;
- if ((*dir == '/' ? len : curr_dir_len + 1 + len) >= sizeof curr_dir) {
- errno = ENAMETOOLONG;
- return 0;
- }
-
- if (!set_path_only && chdir(dir))
- return 0;
-
if (*dir == '/') {
+ if (len >= sizeof curr_dir) {
+ errno = ENAMETOOLONG;
+ return 0;
+ }
+ if (!set_path_only && chdir(dir))
+ return 0;
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;
+ 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 (!set_path_only && chdir(curr_dir)) {
+ curr_dir[curr_dir_len] = '\0';
+ return 0;
+ }
}
curr_dir_len = clean_fname(curr_dir, CFN_COLLAPSE_DOT_DOT_DIRS);
curr_dir_depth = count_dir_elements(curr_dir + module_dirlen);
}
- if (verbose >= 5 && !set_path_only)
- rprintf(FINFO, "[%s] push_dir(%s)\n", who_am_i(), curr_dir);
+ if (DEBUG_GTE(CHDIR, 1) && !set_path_only)
+ rprintf(FINFO, "[%s] change_dir(%s)\n", who_am_i(), curr_dir);
return 1;
}
-/**
- * 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(const char *dir)
+/* This will make a relative path absolute and clean it up via clean_fname().
+ * Returns the string, which might be newly allocated, or NULL on error. */
+char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
{
- if (chdir(dir))
- return 0;
+ unsigned int len;
- curr_dir_len = strlcpy(curr_dir, dir, sizeof curr_dir);
- if (curr_dir_len >= sizeof curr_dir)
- curr_dir_len = sizeof curr_dir - 1;
- if (sanitize_paths)
- curr_dir_depth = count_dir_elements(curr_dir + module_dirlen);
+ if (*path != '/') { /* Make path absolute. */
+ int len = strlen(path);
+ if (curr_dir_len + 1 + len >= sizeof curr_dir)
+ return NULL;
+ curr_dir[curr_dir_len] = '/';
+ memcpy(curr_dir + curr_dir_len + 1, path, len + 1);
+ if (!(path = strdup(curr_dir)))
+ out_of_memory("normalize_path");
+ curr_dir[curr_dir_len] = '\0';
+ } else if (force_newbuf) {
+ if (!(path = strdup(path)))
+ out_of_memory("normalize_path");
+ }
- if (verbose >= 5)
- rprintf(FINFO, "[%s] pop_dir(%s)\n", who_am_i(), curr_dir);
+ len = clean_fname(path, CFN_COLLAPSE_DOT_DOT_DIRS | CFN_DROP_TRAILING_DOT_DIR);
- return 1;
+ if (len_ptr)
+ *len_ptr = len;
+
+ return path;
}
/**
if (daemon_filter_list.head) {
t = strrchr(partial_fname, '/');
*t = '\0';
- if (check_filter(&daemon_filter_list, partial_fname, 1) < 0)
+ if (check_filter(&daemon_filter_list, FLOG, partial_fname, 1) < 0)
return NULL;
*t = '/';
- if (check_filter(&daemon_filter_list, partial_fname, 0) < 0)
+ if (check_filter(&daemon_filter_list, FLOG, partial_fname, 0) < 0)
return NULL;
}
STRUCT_STAT st;
int statret = do_lstat(dir, &st);
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (do_unlink(dir) < 0)
+ if (do_unlink(dir) < 0) {
+ *fn = '/';
return 0;
+ }
statret = -1;
}
- if (statret < 0 && do_mkdir(dir, 0700) < 0)
+ if (statret < 0 && do_mkdir(dir, 0700) < 0) {
+ *fn = '/';
return 0;
+ }
} else
do_rmdir(dir);
*fn = '/';
return 1;
}
-/**
- * Determine if a symlink points outside the current directory tree.
+/* Computes the depth of the given path, excluding any basename. This
+ * assumes that the path does not walk through any symlinks.
+ *
+ * For use with unsafe_symlink. */
+int path_depth(const char *path)
+{
+ const char *name, *slash;
+ int depth = 0;
+
+ for (name = path; (slash = strchr(name, '/')) != 0; name = slash+1) {
+ /* ".." segment starts the count over. "." segment is ignored. */
+ if (strncmp(name, "./", 2) == 0)
+ ;
+ else if (strncmp(name, "../", 3) == 0)
+ depth = 0;
+ else
+ depth++;
+ while (slash[1] == '/') slash++; /* just in case path isn't clean */
+ }
+ if (strcmp(name, "..") == 0)
+ depth = 0;
+
+ return depth;
+}
+
+/* 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
- **/
-int unsafe_symlink(const char *dest, const char *src)
+ * "depth" is the depth of the symlink inside the current directory
+ * tree. It can be computed with "path_depth". */
+int unsafe_symlink(const char *dest, int depth)
{
const char *name, *slash;
- int depth = 0;
/* all absolute and null symlinks are unsafe */
if (!dest || !*dest || *dest == '/')
return 1;
- /* 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 {
- depth++;
- }
- }
- if (strcmp(name, "..") == 0)
- depth = 0;
-
for (name = dest; (slash = strchr(name, '/')) != 0; name = slash+1) {
- if (strncmp(name, "../", 3) == 0) {
+ if (strncmp(name, "./", 2) == 0)
+ ;
+ else 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 {
+ } else
+ /* XXX: We could be walking through another symlink! */
depth++;
- }
+ while (slash[1] == '/') slash++;
}
- if (strcmp(name, "..") == 0)
- depth--;
-
- return (depth < 0);
-}
-
-/* Return the int64 number as a string. If the --human-readable option was
- * specified, we may output the number in K, M, or G units. We can return
- * up to 4 buffers at a time. */
-char *human_num(int64 num)
-{
- static char bufs[4][128]; /* more than enough room */
- static unsigned int n;
- char *s;
-
- n = (n + 1) % (sizeof bufs / sizeof bufs[0]);
-
- if (human_readable) {
- char units = '\0';
- int mult = human_readable == 1 ? 1000 : 1024;
- double dnum = 0;
- if (num > mult*mult*mult) {
- dnum = (double)num / (mult*mult*mult);
- units = 'G';
- } else if (num > mult*mult) {
- dnum = (double)num / (mult*mult);
- units = 'M';
- } else if (num > mult) {
- dnum = (double)num / mult;
- units = 'K';
- }
- if (units) {
- snprintf(bufs[n], sizeof bufs[0], "%.2f%c", dnum, units);
- return bufs[n];
- }
- }
-
- s = bufs[n] + sizeof bufs[0] - 1;
- *s = '\0';
-
- if (!num)
- *--s = '0';
- while (num) {
- *--s = (char)(num % 10) + '0';
- num /= 10;
+ if (strcmp(name, "..") == 0) {
+ if (--depth < 0)
+ return 1;
}
- return s;
-}
-/* Return the double number as a string. If the --human-readable option was
- * specified, we may output the number in K, M, or G units. We use a buffer
- * from human_num() to return our result. */
-char *human_dnum(double dnum, int decimal_digits)
-{
- char *buf = human_num(dnum);
- int len = strlen(buf);
- if (isDigit(buf + len - 1)) {
- /* There's extra room in buf prior to the start of the num. */
- buf -= decimal_digits + 1;
- snprintf(buf, len + decimal_digits + 2, "%.*f", decimal_digits, dnum);
- }
- return buf;
+ return 0;
}
/* Return the date and time as a string. Some callers tweak returned buf. */
return use_calloc ? calloc(num, size) : malloc(num * size);
}
-void *_realloc_array(void *ptr, unsigned int size, unsigned long num)
+void *_realloc_array(void *ptr, unsigned int size, size_t num)
{
if (num >= MALLOC_MAX/size)
return NULL;
return -1;
}
+void flist_ndx_push(flist_ndx_list *lp, int ndx)
+{
+ struct flist_ndx_item *item;
+
+ if (!(item = new(struct flist_ndx_item)))
+ out_of_memory("flist_ndx_push");
+ item->next = NULL;
+ item->ndx = ndx;
+ if (lp->tail)
+ lp->tail->next = item;
+ else
+ lp->head = item;
+ lp->tail = item;
+}
+
+int flist_ndx_pop(flist_ndx_list *lp)
+{
+ struct flist_ndx_item *next;
+ int ndx;
+
+ if (!lp->head)
+ return -1;
+
+ ndx = lp->head->ndx;
+ next = lp->head->next;
+ free(lp->head);
+ lp->head = next;
+ if (!next)
+ lp->tail = NULL;
+
+ return ndx;
+}
+
void *expand_item_list(item_list *lp, size_t item_size,
const char *desc, int incr)
{
new_size += incr;
else
new_size *= 2;
- new_ptr = realloc_array(lp->items, char, new_size * item_size);
- if (verbose >= 4) {
- rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
- who_am_i(), desc, (double)new_size * item_size,
+ 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);
+ if (DEBUG_GTE(FLIST, 3)) {
+ rprintf(FINFO, "[%s] expand %s to %s bytes, did%s move\n",
+ who_am_i(), desc, big_num(new_size * item_size),
new_ptr == lp->items ? " not" : "");
}
if (!new_ptr)