From patchwork Wed Aug 28 05:25:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 270350 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0CF682C00AA for ; Wed, 28 Aug 2013 15:30:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754381Ab3H1Fag (ORCPT ); Wed, 28 Aug 2013 01:30:36 -0400 Received: from mail.windriver.com ([147.11.1.11]:63250 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754004Ab3H1Faf (ORCPT ); Wed, 28 Aug 2013 01:30:35 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id r7S5UXA7006139 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 27 Aug 2013 22:30:33 -0700 (PDT) Received: from pek-hostel-vm06.wrs.com (128.224.153.176) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.2.347.0; Tue, 27 Aug 2013 22:30:32 -0700 From: Robert Yang To: CC: , Subject: [RFC 02/10] misc/util.c: implement populate_fs() Date: Wed, 28 Aug 2013 13:25:52 +0800 Message-ID: <1377667560-20089-3-git-send-email-liezhi.yang@windriver.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377667560-20089-1-git-send-email-liezhi.yang@windriver.com> References: <1377667560-20089-1-git-send-email-liezhi.yang@windriver.com> MIME-Version: 1.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Use opendir() and readdir() to read the native directory, then use lstat() to identify the file type and call the corresponding function to add the file to the filesystem, call the populate_fs() recursively if it is a directory. NOTE: the libext2fs doesn't support create the socket file at them moment. Signed-off-by: Robert Yang --- misc/util.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/misc/util.c b/misc/util.c index cbc7cc0..6d87393 100644 --- a/misc/util.c +++ b/misc/util.c @@ -337,4 +337,94 @@ errcode_t do_write_internal(ext2_ino_t cwd, const char *src, const char *dest) /* Copy files from source_dir to fs */ errcode_t populate_fs(ext2_ino_t parent_ino, const char *source_dir) { + const char *name; + DIR *dh; + struct dirent *dent; + struct stat st; + char ln_target[PATH_MAX]; + char *func_name = "populate_fs"; + ext2_ino_t ino; + errcode_t retval; + int read_cnt; + + root = EXT2_ROOT_INO; + + if (chdir(source_dir) < 0) { + com_err(func_name, errno, + _("while changing working directory to \"%s\""), source_dir); + return errno; + } + + if (!(dh = opendir("."))) { + com_err(func_name, errno, + _("while openning directory \"%s\""), source_dir); + return errno; + } + + while((dent = readdir(dh))) { + if((!strcmp(dent->d_name, ".")) || (!strcmp(dent->d_name, ".."))) + continue; + lstat(dent->d_name, &st); + name = dent->d_name; + + switch(st.st_mode & S_IFMT) { + case S_IFCHR: + case S_IFBLK: + case S_IFIFO: + if ((retval = do_mknod_internal(parent_ino, name, &st))) { + com_err(func_name, retval, + _("while creating special file \"%s\""), name); + return retval; + } + break; + case S_IFSOCK: + /* FIXME: there is no make sockect function atm. */ + com_err(func_name, 0, + _("ignoring sockect file\"%s\""), name); + break; + case S_IFLNK: + if((read_cnt = readlink(name, ln_target, sizeof(ln_target))) == -1) { + com_err(func_name, errno, + _("while trying to readlink \"%s\""), name); + return errno; + } + ln_target[read_cnt] = '\0'; + if ((retval = do_symlink_internal(parent_ino, name, ln_target))) { + com_err(func_name, retval, + _("while writing symlink\"%s\""), name); + return retval; + } + break; + case S_IFREG: + if ((retval = do_write_internal(parent_ino, name, name))) { + com_err(func_name, retval, + _("while writing file \"%s\""), name); + return retval; + } + break; + case S_IFDIR: + if ((retval = do_mkdir_internal(parent_ino, name, &st))) { + com_err(func_name, retval, + _("while making dir \"%s\""), name); + return retval; + } + if ((retval = ext2fs_namei(current_fs, root, parent_ino, name, &ino))) { + com_err(name, retval, 0); + return retval; + } + /* Populate the dir recursively*/ + retval = populate_fs(ino, name); + if (retval) { + com_err(func_name, retval, _("while adding dir \"%s\""), name); + return retval; + } + chdir(".."); + break; + default: + com_err(func_name, 0, + _("ignoring entry \"%s\""), name); + } + } + closedir(dh); + return retval; }