retval = ext2fs_read_inode(fs, ino, &inode);
if (retval) {
- com_err(__func__, retval, "while reading inode %u", ino);
+ com_err(__func__, retval, _("while reading inode %u"), ino);
return retval;
}
if (retval == EXT2_ET_DIR_NO_SPACE) {
retval = ext2fs_expand_dir(fs, parent_ino);
if (retval) {
- com_err(__func__, retval, "while expanding directory");
+ com_err(__func__, retval,
+ _("while expanding directory"));
return retval;
}
retval = ext2fs_link(fs, parent_ino, name, ino,
ext2_file_type(inode.i_mode));
}
if (retval) {
- com_err(__func__, retval, "while linking %s", name);
+ com_err(__func__, retval, _("while linking \"%s\""), name);
return retval;
}
retval = ext2fs_write_inode(fs, ino, &inode);
if (retval)
- com_err(__func__, retval, "while writing inode %u", ino);
+ com_err(__func__, retval, _("while writing inode %u"), ino);
return retval;
}
-/* Fill the uid, gid, mode and time for the inode */
-static void fill_inode(struct ext2_inode *inode, struct stat *st)
-{
- if (st != NULL) {
- inode->i_uid = st->st_uid;
- inode->i_gid = st->st_gid;
- inode->i_mode |= st->st_mode;
- inode->i_atime = st->st_atime;
- inode->i_mtime = st->st_mtime;
- inode->i_ctime = st->st_ctime;
- }
-}
-
/* Set the uid, gid, mode and time for the inode */
static errcode_t set_inode_extra(ext2_filsys fs, ext2_ino_t cwd,
ext2_ino_t ino, struct stat *st)
retval = ext2fs_read_inode(fs, ino, &inode);
if (retval) {
- com_err(__func__, retval, "while reading inode %u", ino);
+ com_err(__func__, retval, _("while reading inode %u"), ino);
return retval;
}
- fill_inode(&inode, st);
+ inode.i_uid = st->st_uid;
+ inode.i_gid = st->st_gid;
+ inode.i_mode |= st->st_mode;
+ inode.i_atime = st->st_atime;
+ inode.i_mtime = st->st_mtime;
+ inode.i_ctime = st->st_ctime;
retval = ext2fs_write_inode(fs, ino, &inode);
if (retval)
- com_err(__func__, retval, "while writing inode %u", ino);
+ com_err(__func__, retval, _("while writing inode %u"), ino);
return retval;
}
-static errcode_t set_inode_xattr(ext2_filsys fs, ext2_ino_t ino, const char *filename)
+static errcode_t set_inode_xattr(ext2_filsys fs, ext2_ino_t ino,
+ const char *filename)
{
#ifdef HAVE_LLISTXATTR
errcode_t retval, close_retval;
size = llistxattr(filename, NULL, 0);
if (size == -1) {
- com_err(__func__, errno, "llistxattr failed on %s", filename);
- return errno;
+ retval = errno;
+ com_err(__func__, retval, _("while listing attributes of \"%s\""),
+ filename);
+ return retval;
} else if (size == 0) {
return 0;
}
if (retval) {
if (retval == EXT2_ET_MISSING_EA_FEATURE)
return 0;
- com_err(__func__, retval, "while opening inode %u", ino);
+ com_err(__func__, retval, _("while opening inode %u"), ino);
return retval;
}
retval = ext2fs_get_mem(size, &list);
if (retval) {
- com_err(__func__, retval, "whilst allocating memory");
+ com_err(__func__, retval, _("while allocating memory"));
goto out;
}
size = llistxattr(filename, list, size);
if (size == -1) {
- com_err(__func__, errno, "llistxattr failed on %s", filename);
retval = errno;
+ com_err(__func__, retval, _("while listing attributes of \"%s\""),
+ filename);
goto out;
}
value_size = getxattr(filename, name, NULL, 0);
if (value_size == -1) {
- com_err(__func__, errno, "getxattr failed on %s",
- filename);
retval = errno;
+ com_err(__func__, retval,
+ _("while reading attribute \"%s\" of \"%s\""),
+ name, filename);
break;
}
retval = ext2fs_get_mem(value_size, &value);
if (retval) {
- com_err(__func__, retval, "whilst allocating memory");
+ com_err(__func__, retval, _("while allocating memory"));
break;
}
value_size = getxattr(filename, name, value, value_size);
if (value_size == -1) {
ext2fs_free_mem(&value);
- com_err(__func__, errno, "getxattr failed on %s",
- filename);
retval = errno;
+ com_err(__func__, retval,
+ _("while reading attribute \"%s\" of \"%s\""),
+ name, filename);
break;
}
ext2fs_free_mem(&value);
if (retval) {
com_err(__func__, retval,
- "while writing xattr %u", ino);
+ _("while writing attribute \"%s\" to inode %u"),
+ name, ino);
break;
}
ext2fs_free_mem(&list);
close_retval = ext2fs_xattrs_close(&handle);
if (close_retval) {
- com_err(__func__, retval, "while closing inode %u", ino);
+ com_err(__func__, retval, _("while closing inode %u"), ino);
retval = retval ? retval : close_retval;
}
return retval;
return EXT2_ET_INVALID_ARGUMENT;
}
- if (!(fs->flags & EXT2_FLAG_RW)) {
- com_err(__func__, 0, "Filesystem opened read/only");
- return EROFS;
- }
retval = ext2fs_new_inode(fs, cwd, 010755, 0, &ino);
if (retval) {
- com_err(__func__, retval, 0);
+ com_err(__func__, retval, _("while allocating inode \"%s\""),
+ name);
return retval;
}
if (retval == EXT2_ET_DIR_NO_SPACE) {
retval = ext2fs_expand_dir(fs, cwd);
if (retval) {
- com_err(__func__, retval, "while expanding directory");
+ com_err(__func__, retval,
+ _("while expanding directory"));
return retval;
}
retval = ext2fs_link(fs, cwd, name, ino, filetype);
}
if (retval) {
- com_err(name, retval, 0);
+ com_err(name, retval, _("while creating inode \"%s\""), name);
return retval;
}
if (ext2fs_test_inode_bitmap2(fs->inode_map, ino))
retval = ext2fs_write_new_inode(fs, ino, &inode);
if (retval)
- com_err(__func__, retval, "while creating inode %u", ino);
+ com_err(__func__, retval, _("while writing inode %u"), ino);
return retval;
}
} else
parent_ino = cwd;
-try_again:
retval = ext2fs_symlink(fs, parent_ino, 0, name, target);
if (retval == EXT2_ET_DIR_NO_SPACE) {
retval = ext2fs_expand_dir(fs, parent_ino);
if (retval) {
com_err("do_symlink_internal", retval,
- "while expanding directory");
+ _("while expanding directory"));
return retval;
}
- goto try_again;
+ retval = ext2fs_symlink(fs, parent_ino, 0, name, target);
}
if (retval)
- com_err("ext2fs_symlink", retval, 0);
+ com_err("ext2fs_symlink", retval,
+ _("while creating symlink \"%s\""), name);
return retval;
}
*cp = 0;
retval = ext2fs_namei(fs, root, cwd, name, &parent_ino);
if (retval) {
- com_err(name, retval, 0);
+ com_err(name, retval, _("while looking up \"%s\""),
+ name);
return retval;
}
name = cp+1;
} else
parent_ino = cwd;
-try_again:
retval = ext2fs_mkdir(fs, parent_ino, 0, name);
if (retval == EXT2_ET_DIR_NO_SPACE) {
retval = ext2fs_expand_dir(fs, parent_ino);
if (retval) {
- com_err(__func__, retval, "while expanding directory");
+ com_err(__func__, retval,
+ _("while expanding directory"));
return retval;
}
- goto try_again;
+ retval = ext2fs_mkdir(fs, parent_ino, 0, name);
}
if (retval)
- com_err("ext2fs_mkdir", retval, 0);
+ com_err("ext2fs_mkdir", retval,
+ _("while creating directory \"%s\""), name);
return retval;
}
fd = ext2fs_open_file(src, O_RDONLY, 0);
if (fd < 0) {
- com_err(src, errno, 0);
- return errno;
+ retval = errno;
+ com_err(__func__, retval, _("while opening \"%s\" to copy"),
+ src);
+ return retval;
}
if (fstat(fd, &statbuf) < 0) {
- com_err(src, errno, 0);
- close(fd);
- return errno;
+ retval = errno;
+ goto out;
}
retval = ext2fs_namei(fs, root, cwd, dest, &newfile);
if (retval == 0) {
- close(fd);
- return EXT2_ET_FILE_EXISTS;
+ retval = EXT2_ET_FILE_EXISTS;
+ goto out;
}
retval = ext2fs_new_inode(fs, cwd, 010755, 0, &newfile);
- if (retval) {
- com_err(__func__, retval, 0);
- close(fd);
- return retval;
- }
+ if (retval)
+ goto out;
#ifdef DEBUGFS
printf("Allocated inode: %u\n", newfile);
#endif
EXT2_FT_REG_FILE);
if (retval == EXT2_ET_DIR_NO_SPACE) {
retval = ext2fs_expand_dir(fs, cwd);
- if (retval) {
- com_err(__func__, retval, "while expanding directory");
- close(fd);
- return retval;
- }
+ if (retval)
+ goto out;
retval = ext2fs_link(fs, cwd, dest, newfile,
EXT2_FT_REG_FILE);
}
- if (retval) {
- com_err(dest, retval, 0);
- close(fd);
- return errno;
- }
+ if (retval)
+ goto out;
if (ext2fs_test_inode_bitmap2(fs->inode_map, newfile))
com_err(__func__, 0, "Warning: inode already set");
ext2fs_inode_alloc_stats2(fs, newfile, +1, 0);
fs->now ? fs->now : time(0);
inode.i_links_count = 1;
retval = ext2fs_inode_size_set(fs, &inode, statbuf.st_size);
- if (retval) {
- com_err(dest, retval, 0);
- close(fd);
- return retval;
- }
+ if (retval)
+ goto out;
if (EXT2_HAS_INCOMPAT_FEATURE(fs->super,
EXT4_FEATURE_INCOMPAT_INLINE_DATA)) {
inode.i_flags |= EXT4_INLINE_DATA_FL;
inode.i_flags &= ~EXT4_EXTENTS_FL;
retval = ext2fs_extent_open2(fs, newfile, &inode, &handle);
if (retval)
- return retval;
+ goto out;
ext2fs_extent_free(handle);
}
retval = ext2fs_write_new_inode(fs, newfile, &inode);
- if (retval) {
- com_err(__func__, retval, "while creating inode %u", newfile);
- close(fd);
- return retval;
- }
+ if (retval)
+ goto out;
if (inode.i_flags & EXT4_INLINE_DATA_FL) {
retval = ext2fs_inline_data_init(fs, newfile);
- if (retval) {
- com_err("copy_file", retval, 0);
- close(fd);
- return retval;
- }
+ if (retval)
+ goto out;
}
if (LINUX_S_ISREG(inode.i_mode)) {
retval = copy_file(fs, fd, &statbuf, newfile);
if (retval)
- com_err("copy_file", retval, _("while copying %s"), src);
+ goto out;
}
+out:
close(fd);
-
return retval;
}
int hdlink;
if (chdir(source_dir) < 0) {
- com_err(__func__, errno,
+ retval = errno;
+ com_err(__func__, retval,
_("while changing working directory to \"%s\""),
source_dir);
- return errno;
+ return retval;
}
if (!(dh = opendir("."))) {
- com_err(__func__, errno,
+ retval = errno;
+ com_err(__func__, retval,
_("while opening directory \"%s\""), source_dir);
- return errno;
+ return retval;
}
while ((dent = readdir(dh))) {
(!strcmp(dent->d_name, "..")))
continue;
if (lstat(dent->d_name, &st)) {
- com_err(__func__, errno, _("while lstat \"%s\""),
+ retval = errno;
+ com_err(__func__, retval, _("while lstat \"%s\""),
dent->d_name);
goto out;
}
read_cnt = readlink(name, ln_target,
sizeof(ln_target) - 1);
if (read_cnt == -1) {
- com_err(__func__, errno,
- _("while trying to readlink \"%s\""),
- name);
retval = errno;
+ com_err(__func__, retval,
+ _("while trying to read link \"%s\""),
+ name);
goto out;
}
ln_target[read_cnt] = '\0';
}
break;
case S_IFDIR:
+ /* Don't choke on /lost+found */
+ if (parent_ino == EXT2_ROOT_INO &&
+ strcmp(name, "lost+found") == 0)
+ goto find_lnf;
retval = do_mkdir_internal(fs, parent_ino, name, &st,
root);
if (retval) {
_("while making dir \"%s\""), name);
goto out;
}
+find_lnf:
retval = ext2fs_namei(fs, root, parent_ino,
name, &ino);
if (retval) {
}
/* Populate the dir recursively*/
retval = __populate_fs(fs, ino, name, root, hdlinks);
- if (retval) {
- com_err(__func__, retval,
- _("while adding dir \"%s\""), name);
+ if (retval)
goto out;
- }
if (chdir("..")) {
- com_err(__func__, errno, _("during cd .."));
retval = errno;
+ com_err(__func__, retval,
+ _("while changing directory"));
goto out;
}
break;
retval = ext2fs_namei(fs, root, parent_ino, name, &ino);
if (retval) {
- com_err(name, retval, 0);
+ com_err(name, retval, _("while looking up \"%s\""),
+ name);
goto out;
}
(hdlinks->size + HDLINK_CNT) *
sizeof(struct hdlink_s));
if (p == NULL) {
- com_err(name, errno,
- _("Not enough memory"));
retval = EXT2_ET_NO_MEMORY;
+ com_err(name, retval,
+ _("while saving inode data"));
goto out;
}
hdlinks->hdl = p;
struct hdlinks_s hdlinks;
errcode_t retval;
+ if (!(fs->flags & EXT2_FLAG_RW)) {
+ com_err(__func__, 0, "Filesystem opened readonly");
+ return EROFS;
+ }
+
hdlinks.count = 0;
hdlinks.size = HDLINK_CNT;
hdlinks.hdl = realloc(NULL, hdlinks.size * sizeof(struct hdlink_s));
if (hdlinks.hdl == NULL) {
- com_err(__func__, errno, "Not enough memory");
- return errno;
+ retval = errno;
+ com_err(__func__, retval, _("while allocating memory"));
+ return retval;
}
retval = __populate_fs(fs, parent_ino, source_dir, root, &hdlinks);