diff options
Diffstat (limited to 'toys/pending')
| -rw-r--r-- | toys/pending/diff.c | 4 | ||||
| -rw-r--r-- | toys/pending/tar.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/toys/pending/diff.c b/toys/pending/diff.c index 1b3f80bb..80238614 100644 --- a/toys/pending/diff.c +++ b/toys/pending/diff.c @@ -768,7 +768,6 @@ void diff_main(void) struct stat st[2]; int j = 0, k = 1, start[2] = {1, 1}; char *files[2]; - struct dirtree *root; for (j = 0; j < 2; j++) { files[j] = toys.optargs[j]; @@ -799,8 +798,7 @@ void diff_main(void) if (S_ISDIR(st[0].st_mode) && S_ISDIR(st[1].st_mode)) { for (j = 0; j < 2; j++) { memset(&dir[j], 0, sizeof(dir)); - root = dirtree_add_node(0, files[j], 1); - if (root) dirtree_handle_callback(root, list_dir); + dirtree_handle_callback(dirtree_start(files[j], 1), list_dir); dir[j].nr_elm = TT.size; //size updated in list_dir qsort(&(dir[j].list[1]), (TT.size - 1), sizeof(char*), cmp); diff --git a/toys/pending/tar.c b/toys/pending/tar.c index f44465cc..c8b6dff8 100644 --- a/toys/pending/tar.c +++ b/toys/pending/tar.c @@ -788,9 +788,8 @@ void tar_main(void) for (tmp = TT.inc; tmp; tmp = tmp->next) { TT.handle = tar_hdl; //recurse thru dir and add files to archive - struct dirtree *root = dirtree_add_node(0,tmp->arg,toys.optflags & FLAG_h); - - if (root) dirtree_handle_callback(root, add_to_tar); + dirtree_handle_callback(dirtree_start(tmp->arg, toys.optflags & FLAG_h), + add_to_tar); } memset(toybuf, 0, 1024); writeall(tar_hdl->src_fd, toybuf, 1024); |