X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debugfs%2Fdebugfs.c;h=857c2243aad0b795b41229de1d372ec927eede75;hb=17390c047f5470eec005c5461a7926d03d6bbbe7;hp=3b3ce55d1f2cfb0a3564f897c6379735b3863154;hpb=601002bd2a144da02165529743a4b1621cfe9ae3;p=tools%2Fe2fsprogs.git

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 3b3ce55..857c224 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -34,6 +34,7 @@ extern int optreset;		/* defined by BSD, but not others */
 #include "ss/ss.h"
 #include "debugfs.h"
 #include "uuid/uuid.h"
+#include "e2p/e2p.h"
 
 #include "../version.h"
 
@@ -42,26 +43,44 @@ extern ss_request_table debug_cmds;
 ext2_filsys current_fs = NULL;
 ino_t	root, cwd;
 
-static void open_filesystem(char *device, int open_flags)
+static void open_filesystem(char *device, int open_flags, blk_t superblock,
+			    blk_t blocksize, int catastrophic)
 {
 	int	retval;
+
+	if (superblock != 0 && blocksize == 0) {
+		com_err(device, 0, "if you specify the superblock, you must also specify the block size");
+		current_fs = NULL;
+		return;
+	}
+
+	if (catastrophic && (open_flags & EXT2_FLAG_RW)) {
+		com_err(device, 0,
+			"opening read-only because of catastrophic mode");
+		open_flags &= ~EXT2_FLAG_RW;
+	}
 	
-	retval = ext2fs_open(device, open_flags, 0, 0,
+	retval = ext2fs_open(device, open_flags, superblock, blocksize,
 			     unix_io_manager, &current_fs);
 	if (retval) {
 		com_err(device, retval, "while opening filesystem");
 		current_fs = NULL;
 		return;
 	}
-	retval = ext2fs_read_inode_bitmap(current_fs);
-	if (retval) {
-		com_err(device, retval, "while reading inode bitmap");
-		goto errout;
-	}
-	retval = ext2fs_read_block_bitmap(current_fs);
-	if (retval) {
-		com_err(device, retval, "while reading block bitmap");
-		goto errout;
+
+	if (catastrophic)
+		com_err(device, 0, "catastrophic mode - not reading inode or group bitmaps");
+	else {
+		retval = ext2fs_read_inode_bitmap(current_fs);
+		if (retval) {
+			com_err(device, retval, "while reading inode bitmap");
+			goto errout;
+		}
+		retval = ext2fs_read_block_bitmap(current_fs);
+		if (retval) {
+			com_err(device, retval, "while reading block bitmap");
+			goto errout;
+		}
 	}
 	root = cwd = EXT2_ROOT_INO;
 	return;
@@ -75,15 +94,19 @@ errout:
 
 void do_open_filesys(int argc, char **argv)
 {
-	const char	*usage = "Usage: open [-w] <device>";
+	const char *usage = "Usage: open [-s superblock] [-b blocksize] [-c] [-w] <device>";
 	int	c;
+	int	catastrophic = 0;
+	blk_t	superblock = 0;
+	blk_t	blocksize = 0;
+	char	*tmp;
 	int open_flags = 0;
 	
 	optind = 0;
 #ifdef HAVE_OPTRESET
 	optreset = 1;		/* Makes BSD getopt happy */
 #endif
-	while ((c = getopt (argc, argv, "wf")) != EOF) {
+	while ((c = getopt (argc, argv, "wfcb:s:")) != EOF) {
 		switch (c) {
 		case 'w':
 			open_flags |= EXT2_FLAG_RW;
@@ -91,6 +114,25 @@ void do_open_filesys(int argc, char **argv)
 		case 'f':
 			open_flags |= EXT2_FLAG_FORCE;
 			break;
+		case 'c':
+			catastrophic = 1;
+			break;
+		case 'b':
+			blocksize = strtoul(optarg, &tmp, 0);
+			if (*tmp) {
+				com_err(argv[0], 0,
+					"Bad block size - %s", optarg);
+				return;
+			}
+			break;
+		case 's':
+			superblock = strtoul(optarg, &tmp, 0);
+			if (*tmp) {
+				com_err(argv[0], 0,
+					"Bad superblock number - %s", optarg);
+				return;
+			}
+			break;
 		default:
 			com_err(argv[0], 0, usage);
 			return;
@@ -102,7 +144,25 @@ void do_open_filesys(int argc, char **argv)
 	}
 	if (check_fs_not_open(argv[0]))
 		return;
-	open_filesystem(argv[optind], open_flags);
+	open_filesystem(argv[optind], open_flags,
+			superblock, blocksize, catastrophic);
+}
+
+void do_lcd(int argc, char **argv)
+{
+	const char *usage = "Usage: lcd <native dir>";
+
+	if (argc != 2) {
+		com_err(argv[0], 0, usage);
+		return;
+	}
+
+	if (chdir(argv[1]) == -1) {
+		com_err(argv[0], errno,
+			"while trying to change native directory to %s",
+			argv[1]);
+		return;
+	}
 }
 
 static void close_filesystem(NOARGS)
@@ -358,13 +418,8 @@ static void dump_inode(ino_t inode_num, struct ext2_inode inode)
 	else if (LINUX_S_ISSOCK(inode.i_mode)) i_type = "socket";
 	else i_type = "bad type";
 	fprintf(out, "Inode: %ld   Type: %s    ", inode_num, i_type);
-#if defined(HAVE_EXT2_INODE_VERSION)
-	fprintf(out, "Mode:  %04o   Flags: 0x%x   Version/Generation: %d\n",
-		inode.i_mode & 0777, inode.i_flags, inode.i_version);
-#else
-	fprintf(out, "Mode:  %04o   Flags: 0x%x   Version/Generation: %d\n",
+	fprintf(out, "Mode:  %04o   Flags: 0x%x   Generation: %u\n",
 		inode.i_mode & 0777, inode.i_flags, inode.i_generation);
-#endif
 	fprintf(out, "User: %5d   Group: %5d   Size: ",
 		inode.i_uid, inode.i_gid);
 	if (LINUX_S_ISDIR(inode.i_mode))
@@ -557,6 +612,8 @@ void do_testi(int argc, char *argv[])
 	}
 	if (check_fs_open(argv[0]))
 		return;
+	if (check_fs_bitmaps(argv[0]))
+		return;
 	inode = string_to_inode(argv[1]);
 	if (!inode) 
 		return;
@@ -627,6 +684,8 @@ void do_testb(int argc, char *argv[])
 	}
 	if (check_fs_open(argv[0]))
 		return;
+	if (check_fs_bitmaps(argv[0]))
+		return;
 	block = strtoul(argv[1], &tmp, 0);
 	if (!block || *tmp) {
 		com_err(argv[0], 0, "No block 0");
@@ -1442,19 +1501,23 @@ int main(int argc, char **argv)
 {
 	int		retval;
 	int		sci_idx;
-	const char	*usage = "Usage: debugfs [-f cmd_file] [-R request] [-V] [[-w] device]";
+	const char	*usage = "Usage: debugfs [-b blocksize] [-s superblock] [-f cmd_file] [-R request] [-V] [[-w] [-c] device]";
 	int		c;
 	int		open_flags = 0;
 	char		*request = 0;
 	int		exit_status = 0;
 	char		*cmd_file = 0;
+	blk_t		superblock = 0;
+	blk_t		blocksize = 0;
+	int		catastrophic = 0;
+	char		*tmp;
 	
 	initialize_ext2_error_table();
 	fprintf (stderr, "debugfs %s, %s for EXT2 FS %s, %s\n",
 		 E2FSPROGS_VERSION, E2FSPROGS_DATE,
 		 EXT2FS_VERSION, EXT2FS_DATE);
 
-	while ((c = getopt (argc, argv, "wR:f:V")) != EOF) {
+	while ((c = getopt (argc, argv, "wcR:f:b:s:V")) != EOF) {
 		switch (c) {
 		case 'R':
 			request = optarg;
@@ -1465,6 +1528,25 @@ int main(int argc, char **argv)
 		case 'w':
 			open_flags = EXT2_FLAG_RW;
 			break;
+		case 'b':
+			blocksize = strtoul(optarg, &tmp, 0);
+			if (*tmp) {
+				com_err(argv[0], 0,
+					"Bad block size - %s", optarg);
+				return 1;
+			}
+			break;
+		case 's':
+			superblock = strtoul(optarg, &tmp, 0);
+			if (*tmp) {
+				com_err(argv[0], 0,
+					"Bad superblock number - %s", optarg);
+				return 1;
+			}
+			break;
+		case 'c':
+			catastrophic = 1;
+			break;
 		case 'V':
 			/* Print version number and exit */
 			fprintf(stderr, "\tUsing %s\n",
@@ -1476,7 +1558,8 @@ int main(int argc, char **argv)
 		}
 	}
 	if (optind < argc)
-		open_filesystem(argv[optind], open_flags);
+		open_filesystem(argv[optind], open_flags,
+				superblock, blocksize, catastrophic);
 	
 	sci_idx = ss_create_invocation("debugfs", "0.0", (char *) NULL,
 				       &debug_cmds, &retval);
@@ -1506,6 +1589,5 @@ int main(int argc, char **argv)
 	if (current_fs)
 		close_filesystem();
 	
-	exit(exit_status);
+	return exit_status;
 }
-