linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Robert Yang <liezhi.yang@windriver.com>
To: <tytso@mit.edu>, <dvhart@linux.intel.com>
Cc: <linux-ext4@vger.kernel.org>
Subject: [PATCH V4 02/11] misc/create_inode.c: copy files recursively
Date: Sat, 1 Mar 2014 03:06:06 -0500	[thread overview]
Message-ID: <1393661175-459-3-git-send-email-liezhi.yang@windriver.com> (raw)
In-Reply-To: <1393661175-459-1-git-send-email-liezhi.yang@windriver.com>

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 can't create the socket file.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
---
 misc/create_inode.c |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/misc/create_inode.c b/misc/create_inode.c
index 46aaa60..b68b910 100644
--- a/misc/create_inode.c
+++ b/misc/create_inode.c
@@ -1,5 +1,13 @@
 #include "create_inode.h"
 
+#if __STDC_VERSION__ < 199901L
+# if __GNUC__ >= 2
+#  define __func__ __FUNCTION__
+# else
+#  define __func__ "<unknown>"
+# endif
+#endif
+
 /* Make a special file which is block, character and fifo */
 errcode_t do_mknod_internal(ext2_ino_t cwd, const char *name, struct stat *st)
 {
@@ -23,4 +31,93 @@ 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];
+	ext2_ino_t	ino;
+	errcode_t	retval;
+	int		read_cnt;
+
+	root = EXT2_ROOT_INO;
+
+	if (chdir(source_dir) < 0) {
+		com_err(__func__, errno,
+			_("while changing working directory to \"%s\""), source_dir);
+		return errno;
+	}
+
+	if (!(dh = opendir("."))) {
+		com_err(__func__, 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__, retval,
+						_("while creating special file \"%s\""), name);
+					return retval;
+				}
+				break;
+			case S_IFSOCK:
+				/* FIXME: there is no make socket function atm. */
+				com_err(__func__, 0,
+					_("ignoring socket file \"%s\""), name);
+				continue;
+			case S_IFLNK:
+				if((read_cnt = readlink(name, ln_target, sizeof(ln_target))) == -1) {
+					com_err(__func__, 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__, retval,
+						_("while writing symlink\"%s\""), name);
+					return retval;
+				}
+				break;
+			case S_IFREG:
+				if ((retval = do_write_internal(parent_ino, name, name))) {
+					com_err(__func__, retval,
+						_("while writing file \"%s\""), name);
+					return retval;
+				}
+				break;
+			case S_IFDIR:
+				if ((retval = do_mkdir_internal(parent_ino, name, &st))) {
+					com_err(__func__, 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__, retval, _("while adding dir \"%s\""), name);
+					return retval;
+				}
+				chdir("..");
+				break;
+			default:
+				com_err(__func__, 0,
+					_("ignoring entry \"%s\""), name);
+		}
+	}
+	closedir(dh);
+	return retval;
 }
-- 
1.7.10.4


  parent reply	other threads:[~2014-03-01  8:06 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-01  8:06 [PATCH V4 00/11] 2fsprogs/mke2fs: add an option: -d root-directory Robert Yang
2014-03-01  8:06 ` [PATCH V4 01/11] mke2fs: add the ability to copy files from a given directory Robert Yang
2014-03-01  8:06 ` Robert Yang [this message]
2014-03-01  8:06 ` [PATCH V4 03/11] misc/create_inode.c: create special file Robert Yang
2014-03-01  8:06 ` [PATCH V4 04/11] misc/create_inode.c: create symlink Robert Yang
2014-03-01  8:06 ` [PATCH V4 05/11] misc/create_inode.c: copy regular file Robert Yang
2014-03-06 19:06   ` Darrick J. Wong
2014-03-06 19:47     ` Theodore Ts'o
2014-03-06 20:14       ` Darrick J. Wong
2014-03-06 22:57         ` Theodore Ts'o
2014-03-07  1:24           ` Robert Yang
2014-03-07  2:56             ` Darrick J. Wong
2014-03-07  3:22               ` Robert Yang
2014-03-07  2:38           ` Darrick J. Wong
2014-03-01  8:06 ` [PATCH V4 06/11] misc/create_inode.c: create directory Robert Yang
2014-03-01  8:06 ` [PATCH V4 07/11] misc/create_inode.c: set owner/mode/time for the inode Robert Yang
2014-03-01  8:06 ` [PATCH V4 08/11] mke2fs.c: add an option: -d root-directory Robert Yang
2014-03-01  8:06 ` [PATCH V4 09/11] misc/create_inode.c: handle hardlinks Robert Yang
2014-03-01  8:06 ` [PATCH V4 10/11] debugfs: use the functions in misc/create_inode.c Robert Yang
2014-03-01  8:06 ` [PATCH V4 11/11] mke2fs.8.in: update the manual for the -d option Robert Yang
2014-03-06  8:21 ` [PATCH V4 00/11] 2fsprogs/mke2fs: add an option: -d root-directory Darren Hart
2014-03-06  9:39   ` Robert Yang
2014-03-06 16:30     ` Theodore Ts'o
2014-03-07  2:51       ` Robert Yang
2014-03-07  2:59         ` Darrick J. Wong
2014-03-07  3:24           ` Robert Yang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1393661175-459-3-git-send-email-liezhi.yang@windriver.com \
    --to=liezhi.yang@windriver.com \
    --cc=dvhart@linux.intel.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).