From 44265721bc7137b7382c720f2b896653085e43f1 Mon Sep 17 00:00:00 2001 From: Aurélien Aptel Date: Tue, 23 Jul 2013 17:39:09 +0200 Subject: clitar.c: add prototype, rearrange definition for easier reading. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Aptel Reviewed-by: David Disseldorp Reviewed-by: Andreas Schneider --- source3/client/clitar.c | 1984 ++++++++++++++++++++++++----------------------- 1 file changed, 1018 insertions(+), 966 deletions(-) (limited to 'source3/client') diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 063a83b432..53005d424b 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -168,642 +168,602 @@ struct tar tar_ctx = { .mode.verbose = false, }; +/* interactive commands, exported functions */ +int cmd_block(void); +int cmd_setmode(void); +int cmd_tar(void); +int cmd_tarmode(void); + +/* tar, exported functions */ +int tar_process(struct tar *t); +bool tar_to_process(struct tar *t); +int tar_parse_args(struct tar *t, + const char *flag, + const char **val, int valsize); + + +/* tar, local function */ +static int tar_create(struct tar* t); +static int tar_create_from_list(struct tar *t); +static int tar_extract(struct tar *t); +static int tar_read_inclusion_file (struct tar *t, const char* filename); +static int tar_send_file(struct tar *t, struct archive_entry *entry); +static int tar_set_blocksize(struct tar *t, int size); +static int tar_set_newer_than(struct tar *t, const char *filename); +static void tar_add_selection_path(struct tar *t, const char *path); +static void tar_dump(struct tar *t); +static bool tar_extract_skip_path(struct tar *t, struct archive_entry *entry); +static bool tar_create_skip_path(struct tar *t, + const char *fullpath, + const struct file_info *finfo); -/** - * fix_unix_path - convert @path to a DOS path - * @path: path to convert - * @removeprefix: if true, remove leading ./ or /. - */ -static char *fix_unix_path (char *path, bool removeprefix) -{ - char *from = path, *to = path; - - if (!path || !*path) - return path; +static bool tar_path_in_list(struct tar *t, + const char *path, + bool reverse); - /* remove prefix: - * ./path => path - * /path => path - */ - if (removeprefix) { - /* /path */ - if (path[0] == '/' || path[0] == '\\') { - from += 1; - } +static int tar_get_file(struct tar *t, + const char *full_dos_path, + struct file_info *finfo); - /* ./path */ - if (path[1] && path[0] == '.' && (path[1] == '/' || path[1] == '\\')) { - from += 2; - } - } +static NTSTATUS get_file_callback(struct cli_state *cli, + struct file_info *finfo, + const char *dir); - /* replace / with \ */ - while (*from) { - if (*from == '/') { - *to = '\\'; - } else { - *to = *from; - } - from++; to++; - } - *to = 0; +/* utilities */ +static char *fix_unix_path (char *path, bool removeprefix); +static char *path_base_name (const char *path); +static const char* skip_useless_char_in_path(const char *p); +static int make_remote_path(const char *full_path); +static int max_token (const char *str); +static bool is_subpath(const char *sub, const char *full); +static int set_remote_attr(const char *filename, uint16 new_attr, int mode); - return path; -} /** - * path_base_name - return @path basename + * cmd_block - interactive command to change tar blocksize * - * If @path doesn't contain any directory separator return NULL. + * Read a size from the client command line and update the current + * blocksize. */ -static char *path_base_name (const char *path) +int cmd_block(void) { + /* XXX: from client.c */ + const extern char *cmd_ptr; + char *buf; TALLOC_CTX *ctx = talloc_tos(); - char *base = NULL; - int last = -1; - int i; - for (i = 0; path[i]; i++) { - if (path[i] == '\\' || path[i] == '/') { - last = i; - } + if (!next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { + DBG(0, ("blocksize \n")); + return 1; } - if (last >= 0) { - base = talloc_strdup(ctx, path); - base[last] = 0; + if (tar_set_blocksize(&tar_ctx, atoi(buf))) { + DBG(0, ("invalid blocksize\n")); } - return base; -} + DBG(2, ("blocksize is now %d\n", tar_ctx.mode.blocksize)); -#define XSET(v) [v] = #v -#define XTABLE(v, t) DBG(2, ("DUMP:%-20.20s = %s\n", #v, t[v])) -#define XBOOL(v) DBG(2, ("DUMP:%-20.20s = %d\n", #v, v ? 1 : 0)) -#define XSTR(v) DBG(2, ("DUMP:%-20.20s = %s\n", #v, v ? v : "NULL")) -#define XINT(v) DBG(2, ("DUMP:%-20.20s = %d\n", #v, v)) -#define XUINT64(v) DBG(2, ("DUMP:%-20.20s = %" PRIu64 "\n", #v, v)) + return 0; +} /** - * tar_dump - dump tar structure on stdout + * cmd_tarmode - interactive command to change tar behaviour + * + * Read one or more modes from the client command line and update the + * current tar mode. */ -static void tar_dump(struct tar *t) +int cmd_tarmode(void) { + const extern char *cmd_ptr; + char *buf; int i; - const char* op[] = { - XSET(TAR_NO_OPERATION), - XSET(TAR_CREATE), - XSET(TAR_EXTRACT), - }; + TALLOC_CTX *ctx = talloc_tos(); - const char* sel[] = { - XSET(TAR_NO_SELECTION), - XSET(TAR_INCLUDE), - XSET(TAR_EXCLUDE), + struct { + const char *cmd; + bool *p; + bool value; + } table[] = { + {"full", &tar_ctx.mode.incremental, false}, + {"inc", &tar_ctx.mode.incremental, true }, + {"reset", &tar_ctx.mode.reset, true }, + {"noreset", &tar_ctx.mode.reset, false}, + {"system", &tar_ctx.mode.system, true }, + {"nosystem", &tar_ctx.mode.system, false}, + {"hidden", &tar_ctx.mode.hidden, true }, + {"nohidden", &tar_ctx.mode.hidden, false}, + {"verbose", &tar_ctx.mode.verbose, true }, + {"noquiet", &tar_ctx.mode.verbose, true }, + {"quiet", &tar_ctx.mode.verbose, false}, + {"noverbose", &tar_ctx.mode.verbose, false}, }; - XBOOL(t->to_process); - XTABLE(t->mode.operation, op); - XTABLE(t->mode.selection, sel); - XINT(t->mode.blocksize); - XBOOL(t->mode.hidden); - XBOOL(t->mode.system); - XBOOL(t->mode.incremental); - XBOOL(t->mode.reset); - XBOOL(t->mode.dry); - XBOOL(t->mode.verbose); - XUINT64(t->total_size); - XSTR(t->tar_path); - XINT(t->path_list_size); + while (next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { + for (i = 0; i < LEN(table); i++) { + if (strequal(table[i].cmd, buf)) { + *table[i].p = table[i].value; + break; + } + } - for (i = 0; t->path_list && t->path_list[i]; i++) { - DBG(2, ("DUMP: t->path_list[%2d] = %s\n", i, t->path_list[i])); + if (i == LEN(table)) + DBG(0, ("tarmode: unrecognised option %s\n", buf)); + + TALLOC_FREE(buf); } - DBG(2, ("DUMP:t->path_list @ %p (%d elem)\n", t->path_list, i)); + DBG(0, ("tarmode is now %s, %s, %s, %s, %s\n", + tar_ctx.mode.incremental ? "incremental" : "full", + tar_ctx.mode.system ? "system" : "nosystem", + tar_ctx.mode.hidden ? "hidden" : "nohidden", + tar_ctx.mode.reset ? "reset" : "noreset", + tar_ctx.mode.verbose ? "verbose" : "quiet")); + return 0; } -#undef XSET -#undef XTABLE -#undef XBOOL -#undef XSTR -#undef XINT /** - * tar_add_selection_path - add a path to the path list - * @path: path to add + * cmd_tar - interactive command to start a tar backup/restoration + * + * Check presence of argument, parse them and handle the request. */ -static void tar_add_selection_path(struct tar *t, const char *path) +int cmd_tar(void) { TALLOC_CTX *ctx = talloc_tos(); - if (!t->path_list) { - t->path_list = str_list_make_empty(ctx); - t->path_list_size = 0; - } - - t->path_list = str_list_add((const char**)t->path_list, path); - t->path_list_size++; - fix_unix_path(t->path_list[t->path_list_size - 1], true); -} + const extern char *cmd_ptr; + const char *flag; + const char **val; + char *buf; + int maxtok = max_token(cmd_ptr); + int i = 0; + int err = 0; -/** - * tar_set_blocksize - set block size in TAR_BLOCK_UNIT - */ -static int tar_set_blocksize(struct tar *t, int size) -{ - if (size <= 0 || size > TAR_MAX_BLOCK_SIZE) { + if (!next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { + DBG(0, ("tar [IXFbganN] [options] [path list]\n")); return 1; } - t->mode.blocksize = size; + flag = buf; + val = talloc_array(ctx, const char*, maxtok); - return 0; -} + while (next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { + val[i++] = buf; + } -/** - * tar_set_newer_than - set date threshold of saved files - * @filename: local path to a file - * - * Only files newer than the modification time of @filename will be - * saved. - * - * Note: this function set the global variable newer_than from - * client.c. Thus the time is not a field of the tar structure. See - * cmd_newer() to change its value from an interactive session. - */ -static int tar_set_newer_than(struct tar *t, const char *filename) -{ - extern time_t newer_than; - SMB_STRUCT_STAT stbuf; + if (tar_parse_args(&tar_ctx, flag, val, i)) { + DBG(0, ("parse_args failed\n")); + err = 1; + goto out; + } - if (sys_stat(filename, &stbuf, false) != 0) { - DBG(0, ("Error setting newer-than time\n")); - return 1; + if (tar_process(&tar_ctx)) { + DBG(0, ("tar_process failed\n")); + err = 1; + goto out; } - newer_than = convert_timespec_to_time_t(stbuf.st_ex_mtime); - DBG(1, ("Getting files newer than %s\n", time_to_asc(newer_than))); - return 0; + out: + return err; } /** - * tar_read_inclusion_file - set path list from file - * @filename: path to the list file + * cmd_setmode - interactive command to set DOS attributes * - * Read and add each line of @filename to the path list. + * Read a filename and mode from the client command line and update + * the file DOS attributes. */ -static int tar_read_inclusion_file (struct tar *t, const char* filename) +int cmd_setmode(void) { - char *line; + const extern char *cmd_ptr; + char *buf; + char *fname = NULL; + uint16 attr[2] = {0}; + int mode = ATTR_SET; TALLOC_CTX *ctx = talloc_tos(); - int fd = open(filename, O_RDONLY); - if (fd < 0) { - DBG(0, ("Can't open inclusion file '%s': %s\n", filename, strerror(errno))); + + if (!next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { + DBG(0, ("setmode <[+|-]rsha>\n")); return 1; } - while ((line = afdgets(fd, ctx, 0))) { - tar_add_selection_path(t, line); + fname = talloc_asprintf(ctx, + "%s%s", + client_get_cur_dir(), + buf); + if (!fname) { + return 1; } - close(fd); - return 0; -} + while (next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { + const char *s = buf; -/** - * skip_useless_char_in_path - skip leading slashes/dots - * - * Skip leading slashes, backslashes and dot-slashes. - */ -static const char* skip_useless_char_in_path(const char *p) -{ - while (p) { - if (*p == '/' || *p == '\\') { - p++; - } - else if (p[0] == '.' && (p[1] == '/' || p[1] == '\\')) { - p += 2; + while (*s) { + switch (*s++) { + case '+': + mode = ATTR_SET; + break; + case '-': + mode = ATTR_UNSET; + break; + case 'r': + attr[mode] |= FILE_ATTRIBUTE_READONLY; + break; + case 'h': + attr[mode] |= FILE_ATTRIBUTE_HIDDEN; + break; + case 's': + attr[mode] |= FILE_ATTRIBUTE_SYSTEM; + break; + case 'a': + attr[mode] |= FILE_ATTRIBUTE_ARCHIVE; + break; + default: + DBG(0, ("setmode \n")); + return 1; + } } - else - return p; } - return p; -} - -/** - * is_subpath - return true if the path @sub is a subpath of @full. - * @sub: path to test - * @full: container path - * - * String comparaison is case-insensitive. - * - * Return true if @sub = @full - */ -static bool is_subpath(const char *sub, const char *full) -{ - const char *full_copy = full; - while (*full && *sub && - (*full == *sub || tolower_m(*full) == tolower_m(*sub) || - (*full == '\\' && *sub=='/') || (*full == '/' && *sub=='\\'))) { - full++; sub++; + if (attr[ATTR_SET] == 0 && attr[ATTR_UNSET] == 0) { + DBG(0, ("setmode <[+|-]rsha>\n")); + return 1; } - /* if full has a trailing slash, it compared equal, so full is an "initial" - string of sub. - */ - if (!*full && full != full_copy && (*(full-1) == '/' || *(full-1) == '\\')) - return true; - - /* ignore trailing slash on full */ - if (!*sub && (*full == '/' || *full == '\\') && !*(full+1)) - return true; - - /* check for full is an "initial" string of sub */ - if ((*sub == '/' || *sub == '\\') && !*full) - return true; + DBG(2, ("perm set %d %d\n", attr[ATTR_SET], attr[ATTR_UNSET])); - return *full == *sub; + /* ignore return value: server might not store DOS attributes */ + set_remote_attr(fname, attr[ATTR_SET], ATTR_SET); + set_remote_attr(fname, attr[ATTR_UNSET], ATTR_UNSET); + return 0; } /** - * tar_path_in_list - return true if @path is in the path list - * @path: path to find - * @reverse: when true also try to find path list element in @path + * tar_parse_args - parse and set tar command line arguments + * @flag: string pointing to tar options + * @val: number of tar arguments + * @valsize: table of arguments after the flags (number of element in val) * - * Look at each path of the path list and return true if @path is a - * subpath of one of them. + * tar arguments work in a weird way. For each flag f that takes a + * value v, the user is supposed to type: * - * If you want /path to be in the path list (path/a/, path/b/) set - * @reverse to true to try to match the other way around. + * on the CLI: + * -Tf1f2f3 v1 v2 v3 TARFILE PATHS... + * + * in the interactive session: + * tar f1f2f3 v1 v2 v3 TARFILE PATHS... + * + * @flag has only flags (eg. "f1f2f3") and @val has the arguments + * (values) following them (eg. ["v1", "v2", "v3", "TARFILE", "PATH1", + * "PATH2"]). + * + * There are only 2 flags that take an arg: b and N. The other flags + * just change the semantic of PATH or TARFILE. + * + * PATH can be a list of included/excluded paths, the path to a file + * containing a list of included/excluded paths to use (F flag). If no + * PATH is provided, the whole share is used (/). */ -static bool tar_path_in_list(struct tar *t, const char *path, bool reverse) +int tar_parse_args(struct tar* t, const char *flag, + const char **val, int valsize) { - int i; - const char *p = path; - const char *pattern; - bool res; - - if (!p || !p[0]) - return false; - - p = skip_useless_char_in_path(p); + TALLOC_CTX *ctx = talloc_tos(); + bool list = false; - for (i = 0; i < t->path_list_size; i++) { - pattern = skip_useless_char_in_path(t->path_list[i]); - res = is_subpath(p, pattern); - if (reverse) { - res = res || is_subpath(pattern, p); - } - if (res) { - return true; - } - } + /* index of next value to use */ + int ival = 0; - return false; -} + /* + * Reset back some options - could be from interactive version + * all other modes are left as they are + */ + t->mode.operation = TAR_NO_OPERATION; + t->mode.selection = TAR_NO_SELECTION; + t->mode.dry = false; + t->to_process = false; + t->total_size = 0; -/** - * tar_extract_skip_path - return true if @entry should be skipped - * @entry: current tar entry - * - * Skip predicate for tar extraction (archive to server) only. - */ -static bool tar_extract_skip_path(struct tar *t, - struct archive_entry *entry) -{ - const bool skip = true; - const char *fullpath = archive_entry_pathname(entry); - bool in = true; + while (*flag) { + switch(*flag++) { + /* operation */ + case 'c': + if (t->mode.operation != TAR_NO_OPERATION) { + printf("Tar must be followed by only one of c or x.\n"); + return 1; + } + t->mode.operation = TAR_CREATE; + break; + case 'x': + if (t->mode.operation != TAR_NO_OPERATION) { + printf("Tar must be followed by only one of c or x.\n"); + return 1; + } + t->mode.operation = TAR_EXTRACT; + break; - if (t->path_list_size <= 0) { - return !skip; - } + /* selection */ + case 'I': + if (t->mode.selection != TAR_NO_SELECTION) { + DBG(0,("Only one of I,X,F must be specified\n")); + return 1; + } + t->mode.selection = TAR_INCLUDE; + break; + case 'X': + if (t->mode.selection != TAR_NO_SELECTION) { + DBG(0,("Only one of I,X,F must be specified\n")); + return 1; + } + t->mode.selection = TAR_EXCLUDE; + break; + case 'F': + if (t->mode.selection != TAR_NO_SELECTION) { + DBG(0,("Only one of I,X,F must be specified\n")); + return 1; + } + t->mode.selection = TAR_INCLUDE; + list = true; + break; - if (t->mode.regex) { - in = mask_match_list(fullpath, t->path_list, t->path_list_size, true); - } else { - in = tar_path_in_list(t, fullpath, false); - } + /* blocksize */ + case 'b': + if (ival >= valsize) { + DBG(0, ("Option b must be followed by a blocksize\n")); + return 1; + } - if (t->mode.selection == TAR_EXCLUDE) { - in = !in; - } + if (tar_set_blocksize(t, atoi(val[ival]))) { + DBG(0, ("Option b must be followed by a valid blocksize\n")); + return 1; + } - return in ? !skip : skip; -} + ival++; + break; -/** - * tar_create_skip_path - return true if @fullpath shoud be skipped - * @fullpath: full remote path of the current file - * @finfo: remote file attributes - * - * Skip predicate for tar creation (server to archive) only. - */ -static bool tar_create_skip_path(struct tar *t, - const char *fullpath, - const struct file_info *finfo) -{ - /* syntaxic sugar */ - const bool skip = true; - const mode_t mode = finfo->mode; - const bool isdir = mode & FILE_ATTRIBUTE_DIRECTORY; - const bool exclude = t->mode.selection == TAR_EXCLUDE; - bool in = true; + /* incremental mode */ + case 'g': + t->mode.incremental = true; + break; - if (!isdir) { + /* newer than */ + case 'N': + if (ival >= valsize) { + DBG(0, ("Option N must be followed by valid file name\n")); + return 1; + } - /* 1. if we dont want X and we have X, skip */ - if (!t->mode.system && (mode & FILE_ATTRIBUTE_SYSTEM)) { - return skip; - } + if (tar_set_newer_than(t, val[ival])) { + DBG(0,("Error setting newer-than time\n")); + return 1; + } - if (!t->mode.hidden && (mode & FILE_ATTRIBUTE_HIDDEN)) { - return skip; - } + ival++; + break; - /* 2. if we only want archive and it's not, skip */ + /* reset mode */ + case 'a': + t->mode.reset = true; + break; - if (t->mode.incremental && !(mode & FILE_ATTRIBUTE_ARCHIVE)) { - return skip; - } - } + /* verbose */ + case 'q': + t->mode.verbose = true; + break; - /* 3. is it in the selection list? */ + /* regex match */ + case 'r': + t->mode.regex = true; + break; - /* - * tar_create_from_list() use the include list as a starting - * point, no need to check - */ - if (!exclude) { - return !skip; - } + /* dry run mode */ + case 'n': + if (t->mode.operation != TAR_CREATE) { + DBG(0, ("n is only meaningful when creating a tar-file\n")); + return 1; + } - /* we are now in exclude mode */ + t->mode.dry = true; + DBG(0, ("dry_run set\n")); + break; - /* no matter the selection, no list => include everything */ - if (t->path_list_size <= 0) { - return !skip; + default: + DBG(0,("Unknown tar option\n")); + return 1; + } } - if (t->mode.regex) { - in = mask_match_list(fullpath, t->path_list, t->path_list_size, true); - } else { - in = tar_path_in_list(t, fullpath, isdir && !exclude); + /* no selection given? default selection is include */ + if (t->mode.selection == TAR_NO_SELECTION) { + t->mode.selection = TAR_INCLUDE; } - return in ? skip : !skip; -} - -/** - * tar_to_process - return true if @t is ready to be processed - * - * @t is ready if it properly parsed command line arguments. - */ -bool tar_to_process (struct tar *t) -{ - return t->to_process; -} - -/** - * cmd_block - interactive command to change tar blocksize - * - * Read a size from the client command line and update the current - * blocksize. - */ -int cmd_block(void) -{ - /* XXX: from client.c */ - const extern char *cmd_ptr; - char *buf; - TALLOC_CTX *ctx = talloc_tos(); - - if (!next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { - DBG(0, ("blocksize \n")); + if (valsize - ival < 1) { + DBG(0, ("No tar file given.\n")); return 1; } - if (tar_set_blocksize(&tar_ctx, atoi(buf))) { - DBG(0, ("invalid blocksize\n")); - } - - DBG(2, ("blocksize is now %d\n", tar_ctx.mode.blocksize)); - - return 0; -} + /* handle TARFILE */ + t->tar_path = talloc_strdup(ctx, val[ival]); + ival++; -/** - * cmd_tarmode - interactive command to change tar behaviour - * - * Read one or more modes from the client command line and update the - * current tar mode. - */ -int cmd_tarmode(void) -{ - const extern char *cmd_ptr; - char *buf; - int i; - TALLOC_CTX *ctx = talloc_tos(); + /* + * Make sure that dbf points to stderr if we are using stdout for + * tar output + */ + if (t->mode.operation == TAR_CREATE && strequal(t->tar_path, "-")) { + setup_logging("smbclient", DEBUG_STDERR); + } - struct { - const char *cmd; - bool *p; - bool value; - } table[] = { - {"full", &tar_ctx.mode.incremental, false}, - {"inc", &tar_ctx.mode.incremental, true }, - {"reset", &tar_ctx.mode.reset, true }, - {"noreset", &tar_ctx.mode.reset, false}, - {"system", &tar_ctx.mode.system, true }, - {"nosystem", &tar_ctx.mode.system, false}, - {"hidden", &tar_ctx.mode.hidden, true }, - {"nohidden", &tar_ctx.mode.hidden, false}, - {"verbose", &tar_ctx.mode.verbose, true }, - {"noquiet", &tar_ctx.mode.verbose, true }, - {"quiet", &tar_ctx.mode.verbose, false}, - {"noverbose", &tar_ctx.mode.verbose, false}, - }; + /* handle PATHs... */ - while (next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { - for (i = 0; i < LEN(table); i++) { - if (strequal(table[i].cmd, buf)) { - *table[i].p = table[i].value; - break; - } + /* flag F -> read file list */ + if (list) { + if (valsize - ival != 1) { + DBG(0,("Option F must be followed by exactly one filename.\n")); + return 1; } - if (i == LEN(table)) - DBG(0, ("tarmode: unrecognised option %s\n", buf)); + if (tar_read_inclusion_file(t, val[ival])) { + return 1; + } + ival++; + } - TALLOC_FREE(buf); + /* otherwise store all the PATHs on the command line */ + else { + int i; + for (i = ival; i < valsize; i++) { + tar_add_selection_path(t, val[i]); + } } - DBG(0, ("tarmode is now %s, %s, %s, %s, %s\n", - tar_ctx.mode.incremental ? "incremental" : "full", - tar_ctx.mode.system ? "system" : "nosystem", - tar_ctx.mode.hidden ? "hidden" : "nohidden", - tar_ctx.mode.reset ? "reset" : "noreset", - tar_ctx.mode.verbose ? "verbose" : "quiet")); + t->to_process = true; + tar_dump(t); return 0; } /** - * set_remote_attr - set DOS attributes of a remote file - * @filename: path to the file name - * @new_attr: attribute bit mask to use - * @mode: one of ATTR_SET or ATTR_UNSET - * - * Update the file attributes with the one provided. + * tar_process - start processing archive */ -static int set_remote_attr(const char *filename, uint16 new_attr, int mode) +int tar_process(struct tar *t) { - extern struct cli_state *cli; - uint16 old_attr; - NTSTATUS status; - - status = cli_getatr(cli, filename, &old_attr, NULL, NULL); - if (!NT_STATUS_IS_OK(status)) { - DBG(0, ("cli_getatr failed: %s\n", nt_errstr(status))); - return 1; - } - - if (mode == ATTR_SET) { - new_attr |= old_attr; - } else { - new_attr = old_attr & ~new_attr; - } + int rc = 0; - status = cli_setatr(cli, filename, new_attr, 0); - if (!NT_STATUS_IS_OK(status)) { - DBG(1, ("cli_setatr failed: %s\n", nt_errstr(status))); - return 1; + switch(t->mode.operation) { + case TAR_EXTRACT: + rc = tar_extract(t); + break; + case TAR_CREATE: + rc = tar_create(t); + break; + default: + DBG(0, ("Invalid tar state\n")); + rc = 1; } - return 0; + DBG(5, ("tar_process done, err = %d\n", rc)); + return rc; } /** - * cmd_setmode - interactive command to set DOS attributes - * - * Read a filename and mode from the client command line and update - * the file DOS attributes. + * tar_create - create archive and fetch files */ -int cmd_setmode(void) +static int tar_create(struct tar* t) { - const extern char *cmd_ptr; - char *buf; - char *fname = NULL; - uint16 attr[2] = {0}; - int mode = ATTR_SET; TALLOC_CTX *ctx = talloc_tos(); + int r; + int err = 0; + NTSTATUS status; + const char *mask; + t->archive = archive_write_new(); - if (!next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { - DBG(0, ("setmode <[+|-]rsha>\n")); - return 1; - } + if (!t->mode.dry) { + const int bsize = t->mode.blocksize * TAR_BLOCK_UNIT; + r = archive_write_set_bytes_per_block(t->archive, bsize); + if (r != ARCHIVE_OK) { + DBG(0, ("Can't use a block size of %d bytes", bsize)); + err = 1; + goto out; + } - fname = talloc_asprintf(ctx, - "%s%s", - client_get_cur_dir(), - buf); - if (!fname) { - return 1; - } + /* + * Use PAX restricted format which is not the most + * conservative choice but has useful extensions and is widely + * supported + */ + r = archive_write_set_format_pax_restricted(t->archive); + if (r != ARCHIVE_OK) { + DBG(0, ("Can't use pax restricted format: %s\n", + archive_error_string(t->archive))); + err = 1; + goto out; + } - while (next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { - const char *s = buf; + if (strequal(t->tar_path, "-")) { + r = archive_write_open_fd(t->archive, STDOUT_FILENO); + } else { + r = archive_write_open_filename(t->archive, t->tar_path); + } - while (*s) { - switch (*s++) { - case '+': - mode = ATTR_SET; - break; - case '-': - mode = ATTR_UNSET; - break; - case 'r': - attr[mode] |= FILE_ATTRIBUTE_READONLY; - break; - case 'h': - attr[mode] |= FILE_ATTRIBUTE_HIDDEN; - break; - case 's': - attr[mode] |= FILE_ATTRIBUTE_SYSTEM; - break; - case 'a': - attr[mode] |= FILE_ATTRIBUTE_ARCHIVE; - break; - default: - DBG(0, ("setmode \n")); - return 1; - } + if (r != ARCHIVE_OK) { + DBG(0, ("Can't open %s: %s\n", t->tar_path, + archive_error_string(t->archive))); + err = 1; + goto out_close; } } - if (attr[ATTR_SET] == 0 && attr[ATTR_UNSET] == 0) { - DBG(0, ("setmode <[+|-]rsha>\n")); - return 1; + /* + * In inclusion mode, iterate on the inclusion list + */ + if (t->mode.selection == TAR_INCLUDE && t->path_list_size > 0) { + if (tar_create_from_list(t)) { + err = 1; + goto out_close; + } + } else { + mask = talloc_asprintf(ctx, "%s\\*", client_get_cur_dir()); + DBG(5, ("tar_process do_list with mask: %s\n", mask)); + status = do_list(mask, TAR_DO_LIST_ATTR, get_file_callback, false, true); + if (!NT_STATUS_IS_OK(status)) { + DBG(0, ("do_list fail %s\n", nt_errstr(status))); + err = 1; + goto out_close; + } } - DBG(2, ("perm set %d %d\n", attr[ATTR_SET], attr[ATTR_UNSET])); + out_close: + DBG(0, ("Total bytes received: %" PRIu64 "\n", t->total_size)); - /* ignore return value: server might not store DOS attributes */ - set_remote_attr(fname, attr[ATTR_SET], ATTR_SET); - set_remote_attr(fname, attr[ATTR_UNSET], ATTR_UNSET); - return 0; + if (!t->mode.dry) { + r = archive_write_close(t->archive); + if (r != ARCHIVE_OK) { + DBG(0, ("Fatal: %s\n", archive_error_string(t->archive))); + err = 1; + goto out; + } + } + out: + archive_write_free(t->archive); + return err; } /** - * make_remote_path - recursively make remote dirs - * @full_path: full hierarchy to create - * - * Create @full_path and each parent directories as needed. + * tar_create_from_list - fetch from path list in include mode */ -static int make_remote_path(const char *full_path) +static int tar_create_from_list(struct tar *t) { - extern struct cli_state *cli; TALLOC_CTX *ctx = talloc_tos(); - char *path; - char *subpath; - char *state; - char *last_backslash; - char *p; - int len; - NTSTATUS status; int err = 0; + NTSTATUS status; + const char *path, *mask, *base, *start_dir; + int i; - subpath = talloc_strdup(ctx, full_path); - path = talloc_strdup(ctx, full_path); - len = talloc_get_size(path) - 1; - - last_backslash = strrchr_m(path, '\\'); - - if (!last_backslash) { - goto out; - } + start_dir = talloc_strdup(ctx, client_get_cur_dir()); - *last_backslash = 0; + for (i = 0; i < t->path_list_size; i++) { + path = t->path_list[i]; + base = path_base_name(path); + mask = talloc_asprintf(ctx, "%s\\%s", client_get_cur_dir(), path); - subpath[0] = 0; - p = strtok_r(path, "\\", &state); + DBG(5, ("incl. path='%s', base='%s', mask='%s'\n", + path, base ? base : "NULL", mask)); - while (p) { - strlcat(subpath, p, len); - status = cli_chkpath(cli, subpath); + if (base) { + base = talloc_asprintf(ctx, "%s%s\\", + client_get_cur_dir(), path_base_name(path)); + DBG(5, ("cd '%s' before do_list\n", base)); + client_set_cur_dir(base); + } + status = do_list(mask, TAR_DO_LIST_ATTR, get_file_callback, false, true); + if (base) { + client_set_cur_dir(start_dir); + } if (!NT_STATUS_IS_OK(status)) { - status = cli_mkdir(cli, subpath); - if (!NT_STATUS_IS_OK(status)) { - DBG(0, ("Can't mkdir %s: %s\n", subpath, nt_errstr(status))); - err = 1; - goto out; - } - DBG(3, ("mkdir %s\n", subpath)); + DBG(0, ("do_list failed on %s (%s)\n", path, nt_errstr(status))); + err = 1; + goto out; } - - strlcat(subpath, "\\", len); - p = strtok_r(NULL, "/\\", &state); - } out: @@ -811,86 +771,56 @@ static int make_remote_path(const char *full_path) } /** - * tar_send_file - send @entry to the remote server - * @entry: current archive entry + * get_file_callback - do_list callback * - * Handle the creation of the parent directories and transfer the - * entry to a new remote file. + * Callback for client.c do_list(). Called for each file found on the + * share matching do_list mask. Recursively call do_list() with itself + * as callback when the current file is a directory. */ -static int tar_send_file(struct tar *t, struct archive_entry *entry) +static NTSTATUS get_file_callback(struct cli_state *cli, + struct file_info *finfo, + const char *dir) { - extern struct cli_state *cli; TALLOC_CTX *ctx = talloc_tos(); - char *dos_path; - char *full_path; - NTSTATUS status; - uint16_t remote_fd = (uint16_t) -1; - int err = 0; - int flags = O_RDWR | O_CREAT | O_TRUNC; - mode_t mode = archive_entry_filetype(entry); - - dos_path = talloc_strdup(ctx, archive_entry_pathname(entry)); - fix_unix_path(dos_path, true); - - full_path = talloc_strdup(ctx, client_get_cur_dir()); - full_path = talloc_strdup_append(full_path, dos_path); + NTSTATUS err = NT_STATUS_OK; + char *remote_name; + const char *initial_dir = client_get_cur_dir(); - if (mode != AE_IFREG && mode != AE_IFDIR) { - DBG(0, ("Skipping non-dir & non-regular file %s\n", full_path)); - goto out; - } + remote_name = talloc_asprintf(ctx, "%s%s", initial_dir, finfo->name); - if (make_remote_path(full_path)) { - err = 1; + if (strequal(finfo->name, "..") || strequal(finfo->name, ".")) { goto out; } - if (mode == AE_IFDIR) { + if (tar_create_skip_path(&tar_ctx, remote_name, finfo)) { + DBG(5, ("--- %s\n", remote_name)); goto out; } - status = cli_open(cli, full_path, flags, DENY_NONE, &remote_fd); - if (!NT_STATUS_IS_OK(status)) { - DBG(0, ("Error opening remote file %s: %s\n", - full_path, nt_errstr(status))); - err = 1; - goto out; - } + if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) { + char *old_dir; + char *new_dir; + char *mask; - for (;;) { - const void *buf; - size_t len; - off_t off; - int r; + old_dir = talloc_strdup(ctx, initial_dir); + new_dir = talloc_asprintf(ctx, "%s%s\\", initial_dir, finfo->name); + mask = talloc_asprintf(ctx, "%s*", new_dir); - r = archive_read_data_block(t->archive, &buf, &len, &off); - if (r == ARCHIVE_EOF) { - break; - } - if (r == ARCHIVE_WARN) { - DBG(0, ("Warning: %s\n", archive_error_string(t->archive))); - } - if (r == ARCHIVE_FATAL) { - DBG(0, ("Fatal: %s\n", archive_error_string(t->archive))); - err = 1; - goto close_out; + if (tar_get_file(&tar_ctx, remote_name, finfo)) { + err = NT_STATUS_UNSUCCESSFUL; + goto out; } - status = cli_writeall(cli, remote_fd, 0, buf, off, len, NULL); - if (!NT_STATUS_IS_OK(status)) { - DBG(0, ("Error writing remote file %s: %s\n", - full_path, nt_errstr(status))); - err = 1; - goto close_out; - } + client_set_cur_dir(new_dir); + do_list(mask, TAR_DO_LIST_ATTR, get_file_callback, false, true); + client_set_cur_dir(old_dir); } - close_out: - status = cli_close(cli, remote_fd); - if (!NT_STATUS_IS_OK(status)) { - DBG(0, ("Error losing remote file %s: %s\n", - full_path, nt_errstr(status))); - err = 1; + else { + if (tar_get_file(&tar_ctx, remote_name, finfo)) { + err = NT_STATUS_UNSUCCESSFUL; + goto out; + } } out: @@ -1006,546 +936,668 @@ static int tar_get_file(struct tar *t, const char *full_dos_path, } /** - * get_file_callback - do_list callback + * tar_extract - open archive and send files. + */ +static int tar_extract(struct tar *t) +{ + int err = 0; + int r; + struct archive_entry *entry; + const size_t bsize = t->mode.blocksize * TAR_BLOCK_UNIT; + + t->archive = archive_read_new(); + archive_read_support_format_all(t->archive); + archive_read_support_filter_all(t->archive); + + if (strequal(t->tar_path, "-")) { + r = archive_read_open_fd(t->archive, STDIN_FILENO, bsize); + } else { + r = archive_read_open_filename(t->archive, t->tar_path, bsize); + } + + if (r != ARCHIVE_OK) { + DBG(0, ("Can't open %s : %s\n", t->tar_path, + archive_error_string(t->archive))); + err = 1; + goto out; + } + + for (;;) { + r = archive_read_next_header(t->archive, &entry); + if (r == ARCHIVE_EOF) { + break; + } + if (r == ARCHIVE_WARN) { + DBG(0, ("Warning: %s\n", archive_error_string(t->archive))); + } + if (r == ARCHIVE_FATAL) { + DBG(0, ("Fatal: %s\n", archive_error_string(t->archive))); + err = 1; + goto out; + } + + if (tar_extract_skip_path(t, entry)) { + DBG(5, ("--- %s\n", archive_entry_pathname(entry))); + continue; + } + + DBG(5, ("+++ %s\n", archive_entry_pathname(entry))); + + if (tar_send_file(t, entry)) { + err = 1; + goto out; + } + } + + out: + r = archive_read_free(t->archive); + if (r != ARCHIVE_OK) { + DBG(0, ("Can't close %s : %s\n", t->tar_path, + archive_error_string(t->archive))); + err = 1; + } + return err; +} + +/** + * tar_send_file - send @entry to the remote server + * @entry: current archive entry * - * Callback for client.c do_list(). Called for each file found on the - * share matching do_list mask. Recursively call do_list() with itself - * as callback when the current file is a directory. + * Handle the creation of the parent directories and transfer the + * entry to a new remote file. */ -static NTSTATUS get_file_callback(struct cli_state *cli, - struct file_info *finfo, - const char *dir) +static int tar_send_file(struct tar *t, struct archive_entry *entry) { + extern struct cli_state *cli; TALLOC_CTX *ctx = talloc_tos(); - NTSTATUS err = NT_STATUS_OK; - char *remote_name; - const char *initial_dir = client_get_cur_dir(); + char *dos_path; + char *full_path; + NTSTATUS status; + uint16_t remote_fd = (uint16_t) -1; + int err = 0; + int flags = O_RDWR | O_CREAT | O_TRUNC; + mode_t mode = archive_entry_filetype(entry); - remote_name = talloc_asprintf(ctx, "%s%s", initial_dir, finfo->name); + dos_path = talloc_strdup(ctx, archive_entry_pathname(entry)); + fix_unix_path(dos_path, true); - if (strequal(finfo->name, "..") || strequal(finfo->name, ".")) { + full_path = talloc_strdup(ctx, client_get_cur_dir()); + full_path = talloc_strdup_append(full_path, dos_path); + + if (mode != AE_IFREG && mode != AE_IFDIR) { + DBG(0, ("Skipping non-dir & non-regular file %s\n", full_path)); goto out; } - if (tar_create_skip_path(&tar_ctx, remote_name, finfo)) { - DBG(5, ("--- %s\n", remote_name)); + if (make_remote_path(full_path)) { + err = 1; goto out; } - if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) { - char *old_dir; - char *new_dir; - char *mask; + if (mode == AE_IFDIR) { + goto out; + } - old_dir = talloc_strdup(ctx, initial_dir); - new_dir = talloc_asprintf(ctx, "%s%s\\", initial_dir, finfo->name); - mask = talloc_asprintf(ctx, "%s*", new_dir); + status = cli_open(cli, full_path, flags, DENY_NONE, &remote_fd); + if (!NT_STATUS_IS_OK(status)) { + DBG(0, ("Error opening remote file %s: %s\n", + full_path, nt_errstr(status))); + err = 1; + goto out; + } - if (tar_get_file(&tar_ctx, remote_name, finfo)) { - err = NT_STATUS_UNSUCCESSFUL; - goto out; + for (;;) { + const void *buf; + size_t len; + off_t off; + int r; + + r = archive_read_data_block(t->archive, &buf, &len, &off); + if (r == ARCHIVE_EOF) { + break; + } + if (r == ARCHIVE_WARN) { + DBG(0, ("Warning: %s\n", archive_error_string(t->archive))); + } + if (r == ARCHIVE_FATAL) { + DBG(0, ("Fatal: %s\n", archive_error_string(t->archive))); + err = 1; + goto close_out; } - client_set_cur_dir(new_dir); - do_list(mask, TAR_DO_LIST_ATTR, get_file_callback, false, true); - client_set_cur_dir(old_dir); + status = cli_writeall(cli, remote_fd, 0, buf, off, len, NULL); + if (!NT_STATUS_IS_OK(status)) { + DBG(0, ("Error writing remote file %s: %s\n", + full_path, nt_errstr(status))); + err = 1; + goto close_out; + } } - else { - if (tar_get_file(&tar_ctx, remote_name, finfo)) { - err = NT_STATUS_UNSUCCESSFUL; - goto out; - } + close_out: + status = cli_close(cli, remote_fd); + if (!NT_STATUS_IS_OK(status)) { + DBG(0, ("Error losing remote file %s: %s\n", + full_path, nt_errstr(status))); + err = 1; + } + + out: + return err; +} + +/** + * tar_add_selection_path - add a path to the path list + * @path: path to add + */ +static void tar_add_selection_path(struct tar *t, const char *path) +{ + TALLOC_CTX *ctx = talloc_tos(); + if (!t->path_list) { + t->path_list = str_list_make_empty(ctx); + t->path_list_size = 0; } - out: - return err; + t->path_list = str_list_add((const char**)t->path_list, path); + t->path_list_size++; + fix_unix_path(t->path_list[t->path_list_size - 1], true); } /** - * tar_create_from_list - fetch from path list in include mode + * tar_set_blocksize - set block size in TAR_BLOCK_UNIT */ -static int tar_create_from_list(struct tar *t) +static int tar_set_blocksize(struct tar *t, int size) { - TALLOC_CTX *ctx = talloc_tos(); - int err = 0; - NTSTATUS status; - const char *path, *mask, *base, *start_dir; - int i; + if (size <= 0 || size > TAR_MAX_BLOCK_SIZE) { + return 1; + } - start_dir = talloc_strdup(ctx, client_get_cur_dir()); + t->mode.blocksize = size; - for (i = 0; i < t->path_list_size; i++) { - path = t->path_list[i]; - base = path_base_name(path); - mask = talloc_asprintf(ctx, "%s\\%s", client_get_cur_dir(), path); + return 0; +} - DBG(5, ("incl. path='%s', base='%s', mask='%s'\n", - path, base ? base : "NULL", mask)); +/** + * tar_set_newer_than - set date threshold of saved files + * @filename: local path to a file + * + * Only files newer than the modification time of @filename will be + * saved. + * + * Note: this function set the global variable newer_than from + * client.c. Thus the time is not a field of the tar structure. See + * cmd_newer() to change its value from an interactive session. + */ +static int tar_set_newer_than(struct tar *t, const char *filename) +{ + extern time_t newer_than; + SMB_STRUCT_STAT stbuf; - if (base) { - base = talloc_asprintf(ctx, "%s%s\\", - client_get_cur_dir(), path_base_name(path)); - DBG(5, ("cd '%s' before do_list\n", base)); - client_set_cur_dir(base); - } - status = do_list(mask, TAR_DO_LIST_ATTR, get_file_callback, false, true); - if (base) { - client_set_cur_dir(start_dir); - } - if (!NT_STATUS_IS_OK(status)) { - DBG(0, ("do_list failed on %s (%s)\n", path, nt_errstr(status))); - err = 1; - goto out; - } + if (sys_stat(filename, &stbuf, false) != 0) { + DBG(0, ("Error setting newer-than time\n")); + return 1; } - out: - return err; + newer_than = convert_timespec_to_time_t(stbuf.st_ex_mtime); + DBG(1, ("Getting files newer than %s\n", time_to_asc(newer_than))); + return 0; } /** - * tar_create - create archive and fetch files + * tar_read_inclusion_file - set path list from file + * @filename: path to the list file + * + * Read and add each line of @filename to the path list. */ -static int tar_create(struct tar* t) +static int tar_read_inclusion_file (struct tar *t, const char* filename) { + char *line; TALLOC_CTX *ctx = talloc_tos(); - int r; - int err = 0; - NTSTATUS status; - const char *mask; + int fd = open(filename, O_RDONLY); - t->archive = archive_write_new(); + if (fd < 0) { + DBG(0, ("Can't open inclusion file '%s': %s\n", filename, strerror(errno))); + return 1; + } - if (!t->mode.dry) { - const int bsize = t->mode.blocksize * TAR_BLOCK_UNIT; - r = archive_write_set_bytes_per_block(t->archive, bsize); - if (r != ARCHIVE_OK) { - DBG(0, ("Can't use a block size of %d bytes", bsize)); - err = 1; - goto out; - } + while ((line = afdgets(fd, ctx, 0))) { + tar_add_selection_path(t, line); + } - /* - * Use PAX restricted format which is not the most - * conservative choice but has useful extensions and is widely - * supported - */ - r = archive_write_set_format_pax_restricted(t->archive); - if (r != ARCHIVE_OK) { - DBG(0, ("Can't use pax restricted format: %s\n", - archive_error_string(t->archive))); - err = 1; - goto out; - } + close(fd); + return 0; +} - if (strequal(t->tar_path, "-")) { - r = archive_write_open_fd(t->archive, STDOUT_FILENO); - } else { - r = archive_write_open_filename(t->archive, t->tar_path); - } +/** + * tar_path_in_list - return true if @path is in the path list + * @path: path to find + * @reverse: when true also try to find path list element in @path + * + * Look at each path of the path list and return true if @path is a + * subpath of one of them. + * + * If you want /path to be in the path list (path/a/, path/b/) set + * @reverse to true to try to match the other way around. + */ +static bool tar_path_in_list(struct tar *t, const char *path, bool reverse) +{ + int i; + const char *p = path; + const char *pattern; + bool res; - if (r != ARCHIVE_OK) { - DBG(0, ("Can't open %s: %s\n", t->tar_path, - archive_error_string(t->archive))); - err = 1; - goto out_close; - } - } + if (!p || !p[0]) + return false; - /* - * In inclusion mode, iterate on the inclusion list - */ - if (t->mode.selection == TAR_INCLUDE && t->path_list_size > 0) { - if (tar_create_from_list(t)) { - err = 1; - goto out_close; + p = skip_useless_char_in_path(p); + + for (i = 0; i < t->path_list_size; i++) { + pattern = skip_useless_char_in_path(t->path_list[i]); + res = is_subpath(p, pattern); + if (reverse) { + res = res || is_subpath(pattern, p); } - } else { - mask = talloc_asprintf(ctx, "%s\\*", client_get_cur_dir()); - DBG(5, ("tar_process do_list with mask: %s\n", mask)); - status = do_list(mask, TAR_DO_LIST_ATTR, get_file_callback, false, true); - if (!NT_STATUS_IS_OK(status)) { - DBG(0, ("do_list fail %s\n", nt_errstr(status))); - err = 1; - goto out_close; + if (res) { + return true; } } - out_close: - DBG(0, ("Total bytes received: %" PRIu64 "\n", t->total_size)); - - if (!t->mode.dry) { - r = archive_write_close(t->archive); - if (r != ARCHIVE_OK) { - DBG(0, ("Fatal: %s\n", archive_error_string(t->archive))); - err = 1; - goto out; - } - } - out: - archive_write_free(t->archive); - return err; + return false; } /** - * max_token - return upper limit for the number of token in @str + * tar_extract_skip_path - return true if @entry should be skipped + * @entry: current tar entry * - * The result is not exact, the actual number of token might be less - * than what is returned. + * Skip predicate for tar extraction (archive to server) only. */ -static int max_token (const char *str) +static bool tar_extract_skip_path(struct tar *t, + struct archive_entry *entry) { - const char *s = str; - int nb = 0; + const bool skip = true; + const char *fullpath = archive_entry_pathname(entry); + bool in = true; - if (!str) { - return 0; + if (t->path_list_size <= 0) { + return !skip; } - while (*s) { - if (isspace(*s)) { - nb++; - } - s++; + if (t->mode.regex) { + in = mask_match_list(fullpath, t->path_list, t->path_list_size, true); + } else { + in = tar_path_in_list(t, fullpath, false); } - nb++; + if (t->mode.selection == TAR_EXCLUDE) { + in = !in; + } - return nb; + return in ? !skip : skip; } /** - * cmd_tar - interactive command to start a tar backup/restoration + * tar_create_skip_path - return true if @fullpath shoud be skipped + * @fullpath: full remote path of the current file + * @finfo: remote file attributes * - * Check presence of argument, parse them and handle the request. + * Skip predicate for tar creation (server to archive) only. */ -int cmd_tar(void) +static bool tar_create_skip_path(struct tar *t, + const char *fullpath, + const struct file_info *finfo) { - TALLOC_CTX *ctx = talloc_tos(); - const extern char *cmd_ptr; - const char *flag; - const char **val; - char *buf; - int maxtok = max_token(cmd_ptr); - int i = 0; - int err = 0; + /* syntaxic sugar */ + const bool skip = true; + const mode_t mode = finfo->mode; + const bool isdir = mode & FILE_ATTRIBUTE_DIRECTORY; + const bool exclude = t->mode.selection == TAR_EXCLUDE; + bool in = true; - if (!next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { - DBG(0, ("tar [IXFbganN] [options] [path list]\n")); - return 1; + if (!isdir) { + + /* 1. if we dont want X and we have X, skip */ + if (!t->mode.system && (mode & FILE_ATTRIBUTE_SYSTEM)) { + return skip; + } + + if (!t->mode.hidden && (mode & FILE_ATTRIBUTE_HIDDEN)) { + return skip; + } + + /* 2. if we only want archive and it's not, skip */ + + if (t->mode.incremental && !(mode & FILE_ATTRIBUTE_ARCHIVE)) { + return skip; + } } - flag = buf; - val = talloc_array(ctx, const char*, maxtok); + /* 3. is it in the selection list? */ - while (next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { - val[i++] = buf; + /* + * tar_create_from_list() use the include list as a starting + * point, no need to check + */ + if (!exclude) { + return !skip; } - if (tar_parse_args(&tar_ctx, flag, val, i)) { - DBG(0, ("parse_args failed\n")); - err = 1; - goto out; + /* we are now in exclude mode */ + + /* no matter the selection, no list => include everything */ + if (t->path_list_size <= 0) { + return !skip; } - if (tar_process(&tar_ctx)) { - DBG(0, ("tar_process failed\n")); - err = 1; - goto out; + if (t->mode.regex) { + in = mask_match_list(fullpath, t->path_list, t->path_list_size, true); + } else { + in = tar_path_in_list(t, fullpath, isdir && !exclude); } - out: - return err; + return in ? skip : !skip; } /** - * tar_extract - open archive and send files. + * tar_to_process - return true if @t is ready to be processed + * + * @t is ready if it properly parsed command line arguments. */ -static int tar_extract(struct tar *t) +bool tar_to_process (struct tar *t) { - int err = 0; - int r; - struct archive_entry *entry; - const size_t bsize = t->mode.blocksize * TAR_BLOCK_UNIT; - - t->archive = archive_read_new(); - archive_read_support_format_all(t->archive); - archive_read_support_filter_all(t->archive); - - if (strequal(t->tar_path, "-")) { - r = archive_read_open_fd(t->archive, STDIN_FILENO, bsize); - } else { - r = archive_read_open_filename(t->archive, t->tar_path, bsize); - } - - if (r != ARCHIVE_OK) { - DBG(0, ("Can't open %s : %s\n", t->tar_path, - archive_error_string(t->archive))); - err = 1; - goto out; - } - - for (;;) { - r = archive_read_next_header(t->archive, &entry); - if (r == ARCHIVE_EOF) { - break; - } - if (r == ARCHIVE_WARN) { - DBG(0, ("Warning: %s\n", archive_error_string(t->archive))); - } - if (r == ARCHIVE_FATAL) { - DBG(0, ("Fatal: %s\n", archive_error_string(t->archive))); - err = 1; - goto out; - } + return t->to_process; +} - if (tar_extract_skip_path(t, entry)) { - DBG(5, ("--- %s\n", archive_entry_pathname(entry))); - continue; +/** + * skip_useless_char_in_path - skip leading slashes/dots + * + * Skip leading slashes, backslashes and dot-slashes. + */ +static const char* skip_useless_char_in_path(const char *p) +{ + while (p) { + if (*p == '/' || *p == '\\') { + p++; } - - DBG(5, ("+++ %s\n", archive_entry_pathname(entry))); - - if (tar_send_file(t, entry)) { - err = 1; - goto out; + else if (p[0] == '.' && (p[1] == '/' || p[1] == '\\')) { + p += 2; } + else + return p; } - - out: - r = archive_read_free(t->archive); - if (r != ARCHIVE_OK) { - DBG(0, ("Can't close %s : %s\n", t->tar_path, - archive_error_string(t->archive))); - err = 1; - } - return err; + return p; } /** - * tar_process - start processing archive + * is_subpath - return true if the path @sub is a subpath of @full. + * @sub: path to test + * @full: container path + * + * String comparaison is case-insensitive. + * + * Return true if @sub = @full */ -int tar_process(struct tar *t) +static bool is_subpath(const char *sub, const char *full) { - int rc = 0; + const char *full_copy = full; - switch(t->mode.operation) { - case TAR_EXTRACT: - rc = tar_extract(t); - break; - case TAR_CREATE: - rc = tar_create(t); - break; - default: - DBG(0, ("Invalid tar state\n")); - rc = 1; + while (*full && *sub && + (*full == *sub || tolower_m(*full) == tolower_m(*sub) || + (*full == '\\' && *sub=='/') || (*full == '/' && *sub=='\\'))) { + full++; sub++; } - DBG(5, ("tar_process done, err = %d\n", rc)); - return rc; + /* if full has a trailing slash, it compared equal, so full is an "initial" + string of sub. + */ + if (!*full && full != full_copy && (*(full-1) == '/' || *(full-1) == '\\')) + return true; + + /* ignore trailing slash on full */ + if (!*sub && (*full == '/' || *full == '\\') && !*(full+1)) + return true; + + /* check for full is an "initial" string of sub */ + if ((*sub == '/' || *sub == '\\') && !*full) + return true; + + return *full == *sub; } /** - * tar_parse_args - parse and set tar command line arguments - * @flag: string pointing to tar options - * @val: number of tar arguments - * @valsize: table of arguments after the flags (number of element in val) - * - * tar arguments work in a weird way. For each flag f that takes a - * value v, the user is supposed to type: - * - * on the CLI: - * -Tf1f2f3 v1 v2 v3 TARFILE PATHS... - * - * in the interactive session: - * tar f1f2f3 v1 v2 v3 TARFILE PATHS... - * - * @flag has only flags (eg. "f1f2f3") and @val has the arguments - * (values) following them (eg. ["v1", "v2", "v3", "TARFILE", "PATH1", - * "PATH2"]). - * - * There are only 2 flags that take an arg: b and N. The other flags - * just change the semantic of PATH or TARFILE. + * set_remote_attr - set DOS attributes of a remote file + * @filename: path to the file name + * @new_attr: attribute bit mask to use + * @mode: one of ATTR_SET or ATTR_UNSET * - * PATH can be a list of included/excluded paths, the path to a file - * containing a list of included/excluded paths to use (F flag). If no - * PATH is provided, the whole share is used (/). + * Update the file attributes with the one provided. */ -int tar_parse_args(struct tar* t, const char *flag, - const char **val, int valsize) +static int set_remote_attr(const char *filename, uint16 new_attr, int mode) { - TALLOC_CTX *ctx = talloc_tos(); - bool list = false; + extern struct cli_state *cli; + uint16 old_attr; + NTSTATUS status; - /* index of next value to use */ - int ival = 0; + status = cli_getatr(cli, filename, &old_attr, NULL, NULL); + if (!NT_STATUS_IS_OK(status)) { + DBG(0, ("cli_getatr failed: %s\n", nt_errstr(status))); + return 1; + } - /* - * Reset back some options - could be from interactive version - * all other modes are left as they are - */ - t->mode.operation = TAR_NO_OPERATION; - t->mode.selection = TAR_NO_SELECTION; - t->mode.dry = false; - t->to_process = false; - t->total_size = 0; + if (mode == ATTR_SET) { + new_attr |= old_attr; + } else { + new_attr = old_attr & ~new_attr; + } - while (*flag) { - switch(*flag++) { - /* operation */ - case 'c': - if (t->mode.operation != TAR_NO_OPERATION) { - printf("Tar must be followed by only one of c or x.\n"); - return 1; - } - t->mode.operation = TAR_CREATE; - break; - case 'x': - if (t->mode.operation != TAR_NO_OPERATION) { - printf("Tar must be followed by only one of c or x.\n"); - return 1; - } - t->mode.operation = TAR_EXTRACT; - break; + status = cli_setatr(cli, filename, new_attr, 0); + if (!NT_STATUS_IS_OK(status)) { + DBG(1, ("cli_setatr failed: %s\n", nt_errstr(status))); + return 1; + } + + return 0; +} - /* selection */ - case 'I': - if (t->mode.selection != TAR_NO_SELECTION) { - DBG(0,("Only one of I,X,F must be specified\n")); - return 1; - } - t->mode.selection = TAR_INCLUDE; - break; - case 'X': - if (t->mode.selection != TAR_NO_SELECTION) { - DBG(0,("Only one of I,X,F must be specified\n")); - return 1; - } - t->mode.selection = TAR_EXCLUDE; - break; - case 'F': - if (t->mode.selection != TAR_NO_SELECTION) { - DBG(0,("Only one of I,X,F must be specified\n")); - return 1; - } - t->mode.selection = TAR_INCLUDE; - list = true; - break; - /* blocksize */ - case 'b': - if (ival >= valsize) { - DBG(0, ("Option b must be followed by a blocksize\n")); - return 1; - } +/** + * make_remote_path - recursively make remote dirs + * @full_path: full hierarchy to create + * + * Create @full_path and each parent directories as needed. + */ +static int make_remote_path(const char *full_path) +{ + extern struct cli_state *cli; + TALLOC_CTX *ctx = talloc_tos(); + char *path; + char *subpath; + char *state; + char *last_backslash; + char *p; + int len; + NTSTATUS status; + int err = 0; - if (tar_set_blocksize(t, atoi(val[ival]))) { - DBG(0, ("Option b must be followed by a valid blocksize\n")); - return 1; - } + subpath = talloc_strdup(ctx, full_path); + path = talloc_strdup(ctx, full_path); + len = talloc_get_size(path) - 1; - ival++; - break; + last_backslash = strrchr_m(path, '\\'); - /* incremental mode */ - case 'g': - t->mode.incremental = true; - break; + if (!last_backslash) { + goto out; + } - /* newer than */ - case 'N': - if (ival >= valsize) { - DBG(0, ("Option N must be followed by valid file name\n")); - return 1; - } + *last_backslash = 0; - if (tar_set_newer_than(t, val[ival])) { - DBG(0,("Error setting newer-than time\n")); - return 1; + subpath[0] = 0; + p = strtok_r(path, "\\", &state); + + while (p) { + strlcat(subpath, p, len); + status = cli_chkpath(cli, subpath); + if (!NT_STATUS_IS_OK(status)) { + status = cli_mkdir(cli, subpath); + if (!NT_STATUS_IS_OK(status)) { + DBG(0, ("Can't mkdir %s: %s\n", subpath, nt_errstr(status))); + err = 1; + goto out; } + DBG(3, ("mkdir %s\n", subpath)); + } - ival++; - break; + strlcat(subpath, "\\", len); + p = strtok_r(NULL, "/\\", &state); - /* reset mode */ - case 'a': - t->mode.reset = true; - break; + } - /* verbose */ - case 'q': - t->mode.verbose = true; - break; + out: + return err; +} - /* regex match */ - case 'r': - t->mode.regex = true; - break; - /* dry run mode */ - case 'n': - if (t->mode.operation != TAR_CREATE) { - DBG(0, ("n is only meaningful when creating a tar-file\n")); - return 1; - } +#define XSET(v) [v] = #v +#define XTABLE(v, t) DBG(2, ("DUMP:%-20.20s = %s\n", #v, t[v])) +#define XBOOL(v) DBG(2, ("DUMP:%-20.20s = %d\n", #v, v ? 1 : 0)) +#define XSTR(v) DBG(2, ("DUMP:%-20.20s = %s\n", #v, v ? v : "NULL")) +#define XINT(v) DBG(2, ("DUMP:%-20.20s = %d\n", #v, v)) +#define XUINT64(v) DBG(2, ("DUMP:%-20.20s = %" PRIu64 "\n", #v, v)) - t->mode.dry = true; - DBG(0, ("dry_run set\n")); - break; +/** + * tar_dump - dump tar structure on stdout + */ +static void tar_dump(struct tar *t) +{ + int i; + const char* op[] = { + XSET(TAR_NO_OPERATION), + XSET(TAR_CREATE), + XSET(TAR_EXTRACT), + }; - default: - DBG(0,("Unknown tar option\n")); - return 1; - } + const char* sel[] = { + XSET(TAR_NO_SELECTION), + XSET(TAR_INCLUDE), + XSET(TAR_EXCLUDE), + }; + + XBOOL(t->to_process); + XTABLE(t->mode.operation, op); + XTABLE(t->mode.selection, sel); + XINT(t->mode.blocksize); + XBOOL(t->mode.hidden); + XBOOL(t->mode.system); + XBOOL(t->mode.incremental); + XBOOL(t->mode.reset); + XBOOL(t->mode.dry); + XBOOL(t->mode.verbose); + XUINT64(t->total_size); + XSTR(t->tar_path); + XINT(t->path_list_size); + + for (i = 0; t->path_list && t->path_list[i]; i++) { + DBG(2, ("DUMP: t->path_list[%2d] = %s\n", i, t->path_list[i])); } - /* no selection given? default selection is include */ - if (t->mode.selection == TAR_NO_SELECTION) { - t->mode.selection = TAR_INCLUDE; + DBG(2, ("DUMP:t->path_list @ %p (%d elem)\n", t->path_list, i)); +} +#undef XSET +#undef XTABLE +#undef XBOOL +#undef XSTR +#undef XINT + +/** + * max_token - return upper limit for the number of token in @str + * + * The result is not exact, the actual number of token might be less + * than what is returned. + */ +static int max_token (const char *str) +{ + const char *s = str; + int nb = 0; + + if (!str) { + return 0; } - if (valsize - ival < 1) { - DBG(0, ("No tar file given.\n")); - return 1; + while (*s) { + if (isspace(*s)) { + nb++; + } + s++; } - /* handle TARFILE */ - t->tar_path = talloc_strdup(ctx, val[ival]); - ival++; + nb++; - /* - * Make sure that dbf points to stderr if we are using stdout for - * tar output - */ - if (t->mode.operation == TAR_CREATE && strequal(t->tar_path, "-")) { - setup_logging("smbclient", DEBUG_STDERR); - } + return nb; +} - /* handle PATHs... */ +/** + * fix_unix_path - convert @path to a DOS path + * @path: path to convert + * @removeprefix: if true, remove leading ./ or /. + */ +static char *fix_unix_path (char *path, bool removeprefix) +{ + char *from = path, *to = path; - /* flag F -> read file list */ - if (list) { - if (valsize - ival != 1) { - DBG(0,("Option F must be followed by exactly one filename.\n")); - return 1; + if (!path || !*path) + return path; + + /* remove prefix: + * ./path => path + * /path => path + */ + if (removeprefix) { + /* /path */ + if (path[0] == '/' || path[0] == '\\') { + from += 1; } - if (tar_read_inclusion_file(t, val[ival])) { - return 1; + /* ./path */ + if (path[1] && path[0] == '.' && (path[1] == '/' || path[1] == '\\')) { + from += 2; } - ival++; } - /* otherwise store all the PATHs on the command line */ - else { - int i; - for (i = ival; i < valsize; i++) { - tar_add_selection_path(t, val[i]); + /* replace / with \ */ + while (*from) { + if (*from == '/') { + *to = '\\'; + } else { + *to = *from; } + from++; to++; } + *to = 0; - t->to_process = true; - tar_dump(t); - return 0; + return path; +} + +/** + * path_base_name - return @path basename + * + * If @path doesn't contain any directory separator return NULL. + */ +static char *path_base_name (const char *path) +{ + TALLOC_CTX *ctx = talloc_tos(); + char *base = NULL; + int last = -1; + int i; + + for (i = 0; path[i]; i++) { + if (path[i] == '\\' || path[i] == '/') { + last = i; + } + } + + if (last >= 0) { + base = talloc_strdup(ctx, path); + base[last] = 0; + } + + return base; } -- cgit