X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debugfs%2Fdump.c;h=4d3865153ce0d87945bf5182cdd570363e56a518;hb=2a13c84b513aa094d1cda727e92d35a89dd777da;hp=2cfe623ac589d1cbf038c1aed68e4533e5bac4cd;hpb=efac5a7f0d19b06276520b35bc986540eb22c34d;p=tools%2Fe2fsprogs.git diff --git a/debugfs/dump.c b/debugfs/dump.c index 2cfe623..4d38651 100644 --- a/debugfs/dump.c +++ b/debugfs/dump.c @@ -1,12 +1,15 @@ /* * dump.c --- dump the contents of an inode out to a file - * + * * Copyright (C) 1994 Theodore Ts'o. This file may be redistributed * under the terms of the GNU Public License. */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE /* for O_LARGEFILE */ +#endif +#include "config.h" #include #include #include @@ -22,7 +25,7 @@ #include #ifdef HAVE_GETOPT_H #include -#else +#else extern int optind; extern char *optarg; #endif @@ -51,7 +54,7 @@ static struct { { LINUX_S_IXOTH, S_IXOTH }, { 0, 0 } }; - + static mode_t mode_xlate(__u16 lmode) { mode_t mode = 0; @@ -88,9 +91,6 @@ static void fix_perms(const char *cmd, const struct ext2_inode *inode, if (i == -1) com_err(cmd, errno, "while changing ownership of %s", name); - if (fd != -1) - close(fd); - ut.actime = inode->i_atime; ut.modtime = inode->i_mtime; if (utime(name, &ut) == -1) @@ -102,11 +102,11 @@ static void dump_file(const char *cmdname, ext2_ino_t ino, int fd, { errcode_t retval; struct ext2_inode inode; - char buf[8192]; + char *buf = 0; ext2_file_t e2_file; int nbytes; - unsigned int got; - + unsigned int got, blocksize = current_fs->blocksize; + if (debugfs_read_inode(ino, &inode, cmdname)) return; @@ -115,9 +115,14 @@ static void dump_file(const char *cmdname, ext2_ino_t ino, int fd, com_err(cmdname, retval, "while opening ext2 file"); return; } + retval = ext2fs_get_mem(blocksize, &buf); + if (retval) { + com_err(cmdname, retval, "while allocating memory"); + return; + } while (1) { - retval = ext2fs_file_read(e2_file, buf, sizeof(buf), &got); - if (retval) + retval = ext2fs_file_read(e2_file, buf, blocksize, &got); + if (retval) com_err(cmdname, retval, "while reading ext2 file"); if (got == 0) break; @@ -125,17 +130,17 @@ static void dump_file(const char *cmdname, ext2_ino_t ino, int fd, if ((unsigned) nbytes != got) com_err(cmdname, errno, "while writing file"); } + if (buf) + ext2fs_free_mem(&buf); retval = ext2fs_file_close(e2_file); if (retval) { com_err(cmdname, retval, "while closing ext2 file"); return; } - + if (preserve) fix_perms("dump_file", &inode, fd, outname); - else if (fd != 1) - close(fd); - + return; } @@ -145,9 +150,8 @@ void do_dump(int argc, char **argv) int fd; int c; int preserve = 0; - const char *dump_usage = "Usage: dump_inode [-p] "; char *in_fn, *out_fn; - + reset_getopt(); while ((c = getopt (argc, argv, "p")) != EOF) { switch (c) { @@ -155,14 +159,14 @@ void do_dump(int argc, char **argv) preserve++; break; default: - com_err(argv[0], 0, dump_usage); + print_usage: + com_err(argv[0], 0, "Usage: dump_inode [-p] " + " "); return; } } - if (optind != argc-2) { - com_err(argv[0], 0, dump_usage); - return; - } + if (optind != argc-2) + goto print_usage; if (check_fs_open(argv[0])) return; @@ -171,7 +175,7 @@ void do_dump(int argc, char **argv) out_fn = argv[optind+1]; inode = string_to_inode(in_fn); - if (!inode) + if (!inode) return; fd = open(out_fn, O_CREAT | O_WRONLY | O_TRUNC | O_LARGEFILE, 0666); @@ -182,6 +186,11 @@ void do_dump(int argc, char **argv) } dump_file(argv[0], inode, fd, preserve, out_fn); + if (close(fd) != 0) { + com_err(argv[0], errno, "while closing %s for dump_inode", + out_fn); + return; + } return; } @@ -201,7 +210,7 @@ static void rdump_symlink(ext2_ino_t ino, struct ext2_inode *inode, /* Apparently, this is the right way to detect and handle fast * symlinks; see do_stat() in debugfs.c. */ - if (inode->i_blocks == 0) + if (ext2fs_inode_data_blocks2(current_fs, inode) == 0) strcpy(buf, (char *) inode->i_block); else { unsigned bytes = inode->i_size; @@ -260,10 +269,14 @@ static void rdump_inode(ext2_ino_t ino, struct ext2_inode *inode, int fd; fd = open(fullname, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, S_IRWXU); if (fd == -1) { - com_err("rdump", errno, "while dumping %s", fullname); + com_err("rdump", errno, "while opening %s", fullname); goto errout; } dump_file("rdump", ino, fd, 1, fullname); + if (close(fd) != 0) { + com_err("rdump", errno, "while closing %s", fullname); + goto errout; + } } else if (LINUX_S_ISDIR(inode->i_mode) && strcmp(name, ".") && strcmp(name, "..")) { errcode_t retval; @@ -271,7 +284,7 @@ static void rdump_inode(ext2_ino_t ino, struct ext2_inode *inode, /* Create the directory with 0700 permissions, because we * expect to have to create entries it. Then fix its perms * once we've done the traversal. */ - if (mkdir(fullname, S_IRWXU) == -1) { + if (name[0] && mkdir(fullname, S_IRWXU) == -1) { com_err("rdump", errno, "while making directory %s", fullname); goto errout; } @@ -289,7 +302,7 @@ errout: free(fullname); } -static int rdump_dirent(struct ext2_dir_entry *dirent, +static int rdump_dirent(struct ext2_dir_entry *dirent, int offset EXT2FS_ATTR((unused)), int blocksize EXT2FS_ATTR((unused)), char *buf EXT2FS_ATTR((unused)), void *private) @@ -299,8 +312,7 @@ static int rdump_dirent(struct ext2_dir_entry *dirent, const char *dumproot = private; struct ext2_inode inode; - thislen = ((dirent->name_len & 0xFF) < EXT2_NAME_LEN - ? (dirent->name_len & 0xFF) : EXT2_NAME_LEN); + thislen = ext2fs_dirent_name_len(dirent); strncpy(name, dirent->name, thislen); name[thislen] = 0; @@ -314,41 +326,46 @@ static int rdump_dirent(struct ext2_dir_entry *dirent, void do_rdump(int argc, char **argv) { - ext2_ino_t ino; - struct ext2_inode inode; struct stat st; + char *dest_dir; int i; - char *p; - if (common_args_process(argc, argv, 3, 3, "rdump", - " ", 0)) + if (common_args_process(argc, argv, 3, INT_MAX, "rdump", + "... ", 0)) return; - ino = string_to_inode(argv[1]); - if (!ino) - return; + /* Pull out last argument */ + dest_dir = argv[argc - 1]; + argc--; - /* Ensure ARGV[2] is a directory. */ - i = stat(argv[2], &st); - if (i == -1) { - com_err("rdump", errno, "while statting %s", argv[2]); + /* Ensure last arg is a directory. */ + if (stat(dest_dir, &st) == -1) { + com_err("rdump", errno, "while statting %s", dest_dir); return; } if (!S_ISDIR(st.st_mode)) { - com_err("rdump", 0, "%s is not a directory", argv[2]); + com_err("rdump", 0, "%s is not a directory", dest_dir); return; } - if (debugfs_read_inode(ino, &inode, argv[1])) - return; + for (i = 1; i < argc; i++) { + char *arg = argv[i], *basename; + struct ext2_inode inode; + ext2_ino_t ino = string_to_inode(arg); + if (!ino) + continue; - p = strrchr(argv[1], '/'); - if (p) - p++; - else - p = argv[1]; + if (debugfs_read_inode(ino, &inode, arg)) + continue; + + basename = strrchr(arg, '/'); + if (basename) + basename++; + else + basename = arg; - rdump_inode(ino, &inode, p, argv[2]); + rdump_inode(ino, &inode, basename, dest_dir); + } } void do_cat(int argc, char **argv) @@ -360,7 +377,7 @@ void do_cat(int argc, char **argv) fflush(stdout); fflush(stderr); - dump_file(argv[0], inode, 1, 0, argv[2]); + dump_file(argv[0], inode, 1, 0, argv[2]); return; }