}
#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';
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. */
/* 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 (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);
}
if (verbose >= 5 && !set_path_only)
- rprintf(FINFO, "[%s] push_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)
-{
- 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;
- if (sanitize_paths)
- curr_dir_depth = count_dir_elements(curr_dir + module_dirlen);
-
- if (verbose >= 5)
- rprintf(FINFO, "[%s] pop_dir(%s)\n", who_am_i(), curr_dir);
+ rprintf(FINFO, "[%s] change_dir(%s)\n", who_am_i(), curr_dir);
return 1;
}
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;
}