From 4dc69cb9cd97e9a1f233a0f19ee8035929fa6065 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 11 Jun 2019 13:34:15 +0200 Subject: cleanup: merge rest of block.c into mkfs.c Signed-off-by: David Oberhollenzer --- mkfs/block.c | 84 ------------------------------------------------------------ 1 file changed, 84 deletions(-) delete mode 100644 mkfs/block.c (limited to 'mkfs/block.c') diff --git a/mkfs/block.c b/mkfs/block.c deleted file mode 100644 index 73d43e8..0000000 --- a/mkfs/block.c +++ /dev/null @@ -1,84 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -#include "mkfs.h" -#include "util.h" - -static int process_file(data_writer_t *data, file_info_t *fi) -{ - int ret, infd; - - infd = open(fi->input_file, O_RDONLY); - if (infd < 0) { - perror(fi->input_file); - return -1; - } - - ret = write_data_from_fd(data, fi, infd); - - close(infd); - return ret; -} - -static void print_name(tree_node_t *n) -{ - if (n->parent != NULL) { - print_name(n->parent); - fputc('/', stdout); - } - - fputs(n->name, stdout); -} - -static int find_and_process_files(data_writer_t *data, tree_node_t *n, - bool quiet) -{ - if (S_ISDIR(n->mode)) { - for (n = n->data.dir->children; n != NULL; n = n->next) { - if (find_and_process_files(data, n, quiet)) - return -1; - } - return 0; - } - - if (S_ISREG(n->mode)) { - if (!quiet) { - fputs("packing ", stdout); - print_name(n); - fputc('\n', stdout); - } - - return process_file(data, n->data.file); - } - - return 0; -} - -int write_data_to_image(data_writer_t *data, fstree_t *fs, options_t *opt) -{ - bool need_restore = false; - const char *ptr; - int ret; - - if (opt->packdir != NULL) { - if (pushd(opt->packdir)) - return -1; - need_restore = true; - } else { - ptr = strrchr(opt->infile, '/'); - - if (ptr != NULL) { - if (pushdn(opt->infile, ptr - opt->infile)) - return -1; - - need_restore = true; - } - } - - ret = find_and_process_files(data, fs->root, opt->quiet); - - ret = ret == 0 ? data_writer_flush_fragments(data) : ret; - - if (need_restore) - ret = ret == 0 ? popd() : ret; - - return ret; -} -- cgit v1.2.3