X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=debugfs%2Fdump.c;h=8d9788641ebcc80f1b72db30106b1f6b7dc8644a;hb=64ac23537ea19d91ecabe52129bb7fa73b1c9043;hp=0ea6e3541f0802dd8eb86d658ffe1b2709118546;hpb=88494bb6d440f703db98b6cc4452f63d7aa392b9;p=tools%2Fe2fsprogs.git diff --git a/debugfs/dump.c b/debugfs/dump.c index 0ea6e35..8d97886 100644 --- a/debugfs/dump.c +++ b/debugfs/dump.c @@ -1,10 +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 @@ -20,7 +25,7 @@ #include #ifdef HAVE_GETOPT_H #include -#else +#else extern int optind; extern char *optarg; #endif @@ -49,7 +54,7 @@ static struct { { LINUX_S_IXOTH, S_IXOTH }, { 0, 0 } }; - + static mode_t mode_xlate(__u16 lmode) { mode_t mode = 0; @@ -86,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) @@ -100,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; @@ -113,27 +115,32 @@ 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; nbytes = write(fd, buf, got); - if (nbytes != got) + 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; } @@ -143,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) { @@ -153,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; @@ -169,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); @@ -180,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; } @@ -256,12 +267,16 @@ static void rdump_inode(ext2_ino_t ino, struct ext2_inode *inode, rdump_symlink(ino, inode, fullname); else if (LINUX_S_ISREG(inode->i_mode)) { int fd; - fd = open(fullname, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU); + 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; @@ -287,16 +302,17 @@ errout: free(fullname); } -static int rdump_dirent(struct ext2_dir_entry *dirent, int offset, - int blocksize, char *buf, void *private) +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) { - char name[EXT2_NAME_LEN]; + char name[EXT2_NAME_LEN + 1]; int thislen; const char *dumproot = private; struct ext2_inode inode; - thislen = ((dirent->name_len & 0xFF) < EXT2_NAME_LEN - ? (dirent->name_len & 0xFF) : EXT2_NAME_LEN); + thislen = dirent->name_len & 0xFF; strncpy(name, dirent->name, thislen); name[thislen] = 0; @@ -310,41 +326,46 @@ static int rdump_dirent(struct ext2_dir_entry *dirent, int offset, 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) @@ -356,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; }