diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2001-04-21 02:12:13 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2001-04-21 02:12:13 +0000 |
| commit | 89dc02d94480ffc10e81d91f3c17ddff25530f18 (patch) | |
| tree | b7159867025cc63f664a395dcdfb18d4f37d8922 | |
| parent | 56c14a647354b6b77fdc0c2f6c5e2f1c433ec410 (diff) | |
| download | busybox-89dc02d94480ffc10e81d91f3c17ddff25530f18.tar.gz | |
Clearly define out exclude list code, as recommended by Larry Doolittle
| -rw-r--r-- | libbb/untar.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libbb/untar.c b/libbb/untar.c index a77d94f61..70f7eb6a6 100644 --- a/libbb/untar.c +++ b/libbb/untar.c @@ -103,7 +103,8 @@ extern char *untar(FILE *src_tar_file, FILE *output, const int untar_function, next_header_offset += (512 - size % 512); } - /* If an exclude list is specified check current file against list + /* If an exclude list is specified check current file against list */ +#if 0 if (*exclude_list != NULL) { i = 0; while (exclude_list[i] != 0) { @@ -115,8 +116,8 @@ extern char *untar(FILE *src_tar_file, FILE *output, const int untar_function, if (exclude_list[i] != 0) { continue; } - } */ - + } +#endif if (untar_function & (extract_contents | extract_verbose_extract | extract_contents_to_file)) { fprintf(output, "%s\n", raw_tar_header.name); } @@ -152,7 +153,7 @@ extern char *untar(FILE *src_tar_file, FILE *output, const int untar_function, strcat(file_name, "."); strcat(file_name, file_extension); - full_name = concat_path_file(strndup(dir, strlen(dir) - strlen(strrchr(dir, '/'))), file_name); + full_name = concat_path_file(xstrndup(dir, strlen(dir) - strlen(strrchr(dir, '/'))), file_name); } else { full_name = xstrdup(dir); } |