diff options
Diffstat (limited to 'archive.c')
| -rw-r--r-- | archive.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -171,8 +171,8 @@ static void queue_directory(const unsigned char *sha1, unsigned mode, int stage, struct archiver_context *c) { struct directory *d; - size_t len = base->len + 1 + strlen(filename) + 1; - d = xmalloc(sizeof(*d) + len); + size_t len = st_add4(base->len, 1, strlen(filename), 1); + d = xmalloc(st_add(sizeof(*d), len)); d->up = c->bottom; d->baselen = base->len; d->mode = mode; @@ -322,7 +322,7 @@ static int path_exists(struct tree *tree, const char *path) pathspec.recursive = 1; ret = read_tree_recursive(tree, "", 0, 0, &pathspec, reject_entry, &pathspec); - free_pathspec(&pathspec); + clear_pathspec(&pathspec); return ret != 0; } @@ -458,11 +458,11 @@ static int parse_archive_args(int argc, const char **argv, argc = parse_options(argc, argv, NULL, opts, archive_usage, 0); if (remote) - die("Unexpected option --remote"); + die(_("Unexpected option --remote")); if (exec) - die("Option --exec can only be used together with --remote"); + die(_("Option --exec can only be used together with --remote")); if (output) - die("Unexpected option --output"); + die(_("Unexpected option --output")); if (!base) base = ""; @@ -484,14 +484,14 @@ static int parse_archive_args(int argc, const char **argv, usage_with_options(archive_usage, opts); *ar = lookup_archiver(format); if (!*ar || (is_remote && !((*ar)->flags & ARCHIVER_REMOTE))) - die("Unknown archive format '%s'", format); + die(_("Unknown archive format '%s'"), format); args->compression_level = Z_DEFAULT_COMPRESSION; if (compression_level != -1) { if ((*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS) args->compression_level = compression_level; else { - die("Argument not supported for format '%s': -%d", + die(_("Argument not supported for format '%s': -%d"), format, compression_level); } } |