Many files:
  Checkin of e2fsprogs 0.5b

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
new file mode 100644
index 0000000..b92746a
--- /dev/null
+++ b/debugfs/debugfs.c
@@ -0,0 +1,1142 @@
+/*
+ * debugfs.c --- a program which allows you to attach an ext2fs
+ * filesystem and play with it.
+ *
+ * Copyright (C) 1993 Theodore Ts'o.  This file may be redistributed
+ * under the terms of the GNU Public License.
+ * 
+ * Modifications by Robert Sanders <gt8134b@prism.gatech.edu>
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <time.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "et/com_err.h"
+#include "ss/ss.h"
+#include "debugfs.h"
+
+extern ss_request_table debug_cmds;
+
+ext2_filsys fs = NULL;
+ino_t	root, cwd;
+
+void open_filesystem(char *device, int open_flags)
+{
+	int	retval;
+	
+	retval = ext2fs_open(device, open_flags, 0, 0, unix_io_manager, &fs);
+	if (retval) {
+		com_err(device, retval, "while opening filesystem");
+		fs = NULL;
+		return;
+	}
+	retval = ext2fs_read_inode_bitmap(fs);
+	if (retval) {
+		com_err(device, retval, "while reading inode bitmap");
+		goto errout;
+	}
+	retval = ext2fs_read_block_bitmap(fs);
+	if (retval) {
+		com_err(device, retval, "while reading block bitmap");
+		goto errout;
+	}
+	root = cwd = EXT2_ROOT_INO;
+	return;
+
+errout:
+	retval = ext2fs_close(fs);
+	if (retval)
+		com_err(device, retval, "while trying to close filesystem");
+	fs = NULL;
+}
+
+void do_open_filesys(int argc, char **argv)
+{
+	char	*usage = "Usage: open [-w] <device>";
+	char	c;
+	int open_flags = 0;
+	
+	optind = 0;
+	while ((c = getopt (argc, argv, "w")) != EOF) {
+		switch (c) {
+		case 'w':
+			open_flags = EXT2_FLAG_RW;
+			break;
+		default:
+			com_err(argv[0], 0, usage);
+			return;
+		}
+	}
+	if (optind != argc-1) {
+		com_err(argv[0], 0, usage);
+		return;
+	}
+	if (check_fs_not_open(argv[0]))
+		return;
+	open_filesystem(argv[optind], open_flags);
+}
+
+void close_filesystem()
+{
+	int	retval;
+	
+	if (fs->flags & EXT2_FLAG_IB_DIRTY) {
+		retval = ext2fs_write_inode_bitmap(fs);
+		if (retval)
+			com_err("ext2fs_write_inode_bitmap", retval, "");
+	}
+	if (fs->flags & EXT2_FLAG_BB_DIRTY) {
+		retval = ext2fs_write_block_bitmap(fs);
+		if (retval)
+			com_err("ext2fs_write_block_bitmap", retval, "");
+	}
+	retval = ext2fs_close(fs);
+	if (retval)
+		com_err("ext2fs_close", retval, "");
+	fs = NULL;
+	return;
+}
+
+void do_close_filesys(int argc, char **argv)
+{
+	if (argc > 1) {
+		com_err(argv[0], 0, "Usage: close_filesys");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	close_filesystem();
+}
+
+void do_init_filesys(int argc, char **argv)
+{
+	char	*usage = "Usage: initialize <device> <blocksize>";
+	struct ext2_super_block param;
+	errcode_t	retval;
+	char		*tmp;
+	
+	if (argc != 3) {
+		com_err(argv[0], 0, usage);
+		return;
+	}
+	if (check_fs_not_open(argv[0]))
+		return;
+
+	memset(&param, 0, sizeof(struct ext2_super_block));
+	param.s_blocks_count = strtoul(argv[2], &tmp, 0);
+	if (*tmp) {
+		com_err(argv[0], 0, "Bad blocks count - %s", argv[2]);
+		return;
+	}
+	retval = ext2fs_initialize(argv[1], 0, &param, unix_io_manager, &fs);
+	if (retval) {
+		com_err(argv[1], retval, "while initializing filesystem");
+		fs = NULL;
+		return;
+	}
+	root = cwd = EXT2_ROOT_INO;
+	return;
+}
+
+void do_show_super_stats(int argc, char *argv[])
+{
+	int	i;
+	FILE 	*out;
+
+	if (argc > 1) {
+		com_err(argv[0], 0, "Usage: show_super");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	out = open_pager();
+	fprintf(out, "Filesystem is read-%s\n", fs->flags & EXT2_FLAG_RW ?
+	        "write" : "only");
+	fprintf(out, "Last mount time = %s", ctime(&fs->super->s_mtime));
+	fprintf(out, "Last write time = %s", ctime(&fs->super->s_wtime));
+	fprintf(out, "Mount counts = %d (maximal = %d)\n",
+		fs->super->s_mnt_count, fs->super->s_max_mnt_count);
+	fprintf(out, "Superblock size = %d\n", sizeof(struct ext2_super_block));
+	fprintf(out, "Block size = %d, fragment size = %d\n",
+		EXT2_BLOCK_SIZE(fs->super), EXT2_FRAG_SIZE(fs->super));
+	fprintf(out, "%ld inodes, %ld free\n", fs->super->s_inodes_count,
+	        fs->super->s_free_inodes_count);
+	fprintf(out, "%ld blocks, %ld free, %ld reserved, first block = %ld\n",
+	        fs->super->s_blocks_count, fs->super->s_free_blocks_count,
+	        fs->super->s_r_blocks_count, fs->super->s_first_data_block);
+	fprintf(out, "%ld blocks per group\n", fs->super->s_blocks_per_group);
+	fprintf(out, "%ld fragments per group\n", fs->super->s_frags_per_group);
+	fprintf(out, "%ld inodes per group\n", EXT2_INODES_PER_GROUP(fs->super));
+	fprintf(out, "%d inodes per block\n", EXT2_INODES_PER_BLOCK(fs->super));
+	fprintf(out, "%ld group%s (%ld descriptors block%s)\n",
+		fs->group_desc_count, (fs->group_desc_count != 1) ? "s" : "",
+		fs->desc_blocks, (fs->desc_blocks != 1) ? "s" : "");
+	for (i = 0; i < fs->group_desc_count; i++)
+		fprintf(out, " Group %2d: block bitmap at %ld, "
+		        "inode bitmap at %ld, "
+		        "inode table at %ld\n"
+		        "           %d free block%s, "
+		        "%d free inode%s, "
+		        "%d used director%s\n",
+		        i, fs->group_desc[i].bg_block_bitmap,
+		        fs->group_desc[i].bg_inode_bitmap,
+		        fs->group_desc[i].bg_inode_table,
+		        fs->group_desc[i].bg_free_blocks_count,
+		        fs->group_desc[i].bg_free_blocks_count != 1 ? "s" : "",
+		        fs->group_desc[i].bg_free_inodes_count,
+		        fs->group_desc[i].bg_free_inodes_count != 1 ? "s" : "",
+		        fs->group_desc[i].bg_used_dirs_count,
+		        fs->group_desc[i].bg_used_dirs_count != 1 ? "ies" : "y");
+	close_pager(out);
+}
+
+struct list_blocks_struct {
+	FILE	*f;
+	int	total;
+};
+
+int list_blocks_proc(ext2_filsys fs, blk_t *blocknr, int blockcnt, void *private)
+{
+	struct list_blocks_struct *lb = (struct list_blocks_struct *) private;
+
+	fprintf(lb->f, "%ld ", *blocknr);
+	lb->total++;
+	return 0;
+}
+
+
+void dump_blocks(FILE *f, ino_t inode)
+{
+	struct list_blocks_struct lb;
+
+	fprintf(f, "BLOCKS:\n");
+	lb.total = 0;
+	lb.f = f;
+	ext2fs_block_iterate(fs,inode,0,NULL,list_blocks_proc,(void *)&lb);
+	if (lb.total)
+		fprintf(f, "\nTOTAL: %d\n", lb.total);
+	fprintf(f,"\n");
+}
+
+
+void dump_inode(ino_t inode_num, struct ext2_inode inode)
+{
+	char *i_type;
+	FILE	*out;
+	
+	out = open_pager();
+	if (S_ISDIR(inode.i_mode)) i_type = "directory";
+	else if (S_ISREG(inode.i_mode)) i_type = "regular";
+	else if (S_ISLNK(inode.i_mode)) i_type = "symlink";
+	else if (S_ISBLK(inode.i_mode)) i_type = "block special";
+	else if (S_ISCHR(inode.i_mode)) i_type = "character special";
+	else if (S_ISFIFO(inode.i_mode)) i_type = "FIFO";
+	else if (S_ISSOCK(inode.i_mode)) i_type = "socket";
+	else i_type = "bad type";
+	fprintf(out, "Inode: %ld   Type: %s    ", inode_num, i_type);
+	fprintf(out, "Mode:  %04o   Flags: 0x%lx   Version: %ld\n",
+		inode.i_mode & 0777, inode.i_flags, inode.i_version);
+	fprintf(out, "User: %5d   Group: %5d   Size: %ld\n",  
+		inode.i_uid, inode.i_gid, inode.i_size);
+	fprintf(out, "File ACL: %ld    Directory ACL: %ld\n",
+		inode.i_file_acl, inode.i_dir_acl);
+	fprintf(out, "Links: %d   Blockcount: %ld\n", inode.i_links_count,
+		inode.i_blocks);
+	fprintf(out, "Fragment:  Address: %ld    Number: %d    Size: %d\n",
+		inode.i_faddr, inode.i_frag, inode.i_fsize);
+	fprintf(out, "ctime: 0x%08lx -- %s", inode.i_ctime,
+		ctime(&inode.i_ctime));
+	fprintf(out, "atime: 0x%08lx -- %s", inode.i_atime,
+		ctime(&inode.i_atime));
+	fprintf(out, "mtime: 0x%08lx -- %s", inode.i_mtime,
+		ctime(&inode.i_mtime));
+	if (inode.i_dtime) 
+	  fprintf(out, "dtime: 0x%08lx -- %s", inode.i_dtime,
+		  ctime(&inode.i_dtime));
+	if (S_ISLNK(inode.i_mode) && inode.i_blocks == 0)
+		fprintf(out, "Fast_link_dest: %s\n", (char *)inode.i_block);
+	else
+		dump_blocks(out, inode_num);
+	close_pager(out);
+}
+
+
+void do_stat(int argc, char *argv[])
+{
+	ino_t	inode;
+	struct ext2_inode inode_buf;
+	int retval;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: stat <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	inode = string_to_inode(argv[1]);
+	if (!inode) 
+		return;
+
+	retval = ext2fs_read_inode(fs,inode,&inode_buf);
+	if (retval) 
+	  {
+	    com_err(argv[0], 0, "Reading inode");
+	    return;
+	  }
+
+	dump_inode(inode,inode_buf);
+	return;
+}
+
+void do_chroot(int argc, char *argv[])
+{
+	ino_t inode;
+	int retval;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: chroot <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	inode = string_to_inode(argv[1]);
+	if (!inode) 
+		return;
+
+	retval = ext2fs_check_directory(fs, inode);
+	if (retval)  {
+		com_err(argv[1], retval, "");
+		return;
+	}
+	root = inode;
+}
+
+void do_clri(int argc, char *argv[])
+{
+	ino_t inode;
+	int retval;
+	struct ext2_inode inode_buf;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: clri <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	if (!(fs->flags & EXT2_FLAG_RW)) {
+		com_err(argv[0], 0, "Filesystem opened read/only");
+		return;
+	}
+	inode = string_to_inode(argv[1]);
+	if (!inode) 
+		return;
+
+	retval = ext2fs_read_inode(fs, inode, &inode_buf);
+	if (retval) {
+		com_err(argv[0], 0, "while trying to read inode %d", inode);
+		return;
+	}
+	memset(&inode_buf, 0, sizeof(inode_buf));
+	retval = ext2fs_write_inode(fs, inode, &inode_buf);
+	if (retval) {
+		com_err(argv[0], retval, "while trying to write inode %d",
+			inode);
+		return;
+	}
+}
+
+void do_freei(int argc, char *argv[])
+{
+	ino_t inode;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: freei <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	if (!(fs->flags & EXT2_FLAG_RW)) {
+		com_err(argv[0], 0, "Filesystem opened read/only");
+		return;
+	}
+	inode = string_to_inode(argv[1]);
+	if (!inode) 
+		return;
+
+	if (!ext2fs_test_inode_bitmap(fs,fs->inode_map,inode))
+		com_err(argv[0], 0, "Warning: inode already clear");
+	ext2fs_unmark_inode_bitmap(fs,fs->inode_map,inode);
+	ext2fs_mark_ib_dirty(fs);
+}
+
+void do_seti(int argc, char *argv[])
+{
+	ino_t inode;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: seti <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	if (!(fs->flags & EXT2_FLAG_RW)) {
+		com_err(argv[0], 0, "Filesystem opened read/only");
+		return;
+	}
+	inode = string_to_inode(argv[1]);
+	if (!inode) 
+		return;
+
+	if (ext2fs_test_inode_bitmap(fs,fs->inode_map,inode))
+		com_err(argv[0], 0, "Warning: inode already set");
+	ext2fs_mark_inode_bitmap(fs,fs->inode_map,inode);
+	ext2fs_mark_ib_dirty(fs);
+}
+
+void do_testi(int argc, char *argv[])
+{
+	ino_t inode;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: testi <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	inode = string_to_inode(argv[1]);
+	if (!inode) 
+		return;
+
+	if (ext2fs_test_inode_bitmap(fs,fs->inode_map,inode))
+		printf("Inode %ld is marked in use\n", inode);
+	else
+		printf("Inode %ld is not in use\n", inode);
+}
+
+
+void do_freeb(int argc, char *argv[])
+{
+	blk_t block;
+	char *tmp;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: freeb <block>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	if (!(fs->flags & EXT2_FLAG_RW)) {
+		com_err(argv[0], 0, "Filesystem opened read/only");
+		return;
+	}
+	block = strtoul(argv[1], &tmp, 0);
+	if (!block || *tmp) {
+		com_err(argv[0], 0, "No block 0");
+		return;
+	} 
+	if (!ext2fs_test_block_bitmap(fs,fs->block_map,block))
+		com_err(argv[0], 0, "Warning: block already clear");
+	ext2fs_unmark_block_bitmap(fs,fs->block_map,block);
+	ext2fs_mark_bb_dirty(fs);
+}
+
+void do_setb(int argc, char *argv[])
+{
+	blk_t block;
+	char *tmp;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: setb <block>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	if (!(fs->flags & EXT2_FLAG_RW)) {
+		com_err(argv[0], 0, "Filesystem opened read/only");
+		return;
+	}
+	block = strtoul(argv[1], &tmp, 0);
+	if (!block || *tmp) {
+		com_err(argv[0], 0, "No block 0");
+		return;
+	} 
+	if (ext2fs_test_block_bitmap(fs,fs->block_map,block))
+		com_err(argv[0], 0, "Warning: block already set");
+	ext2fs_mark_block_bitmap(fs,fs->block_map,block);
+	ext2fs_mark_bb_dirty(fs);
+}
+
+void do_testb(int argc, char *argv[])
+{
+	blk_t block;
+	char *tmp;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: testb <block>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	block = strtoul(argv[1], &tmp, 0);
+	if (!block || *tmp) {
+		com_err(argv[0], 0, "No block 0");
+		return;
+	} 
+	if (ext2fs_test_block_bitmap(fs,fs->block_map,block))
+		printf("Block %ld marked in use\n", block);
+	else printf("Block %ld not in use\n", block);
+}
+
+void modify_char(char *com, char *prompt, char *format, u_char *val)
+{
+	char buf[200];
+	u_char v;
+	char *tmp;
+
+	sprintf(buf, format, *val);
+	printf("%30s    [%s] ", prompt, buf);
+	fgets(buf, sizeof(buf), stdin);
+	if (buf[strlen (buf) - 1] == '\n')
+		buf[strlen (buf) - 1] = '\0';
+	if (!buf[0])
+		return;
+	v = strtol(buf, &tmp, 0);
+	if (*tmp)
+		com_err(com, 0, "Bad value - %s", buf);
+	else
+		*val = v;
+}
+
+void modify_short(char *com, char *prompt, char *format, u_short *val)
+{
+	char buf[200];
+	u_short v;
+	char *tmp;
+
+	sprintf(buf, format, *val);
+	printf("%30s    [%s] ", prompt, buf);
+	fgets(buf, sizeof(buf), stdin);
+	if (buf[strlen (buf) - 1] == '\n')
+		buf[strlen (buf) - 1] = '\0';
+	if (!buf[0])
+		return;
+	v = strtol(buf, &tmp, 0);
+	if (*tmp)
+		com_err(com, 0, "Bad value - %s", buf);
+	else
+		*val = v;
+}
+
+void modify_long(char *com, char *prompt, char *format, u_long *val)
+{
+	char buf[200];
+	u_long v;
+	char *tmp;
+
+	sprintf(buf, format, *val);
+	printf("%30s    [%s] ", prompt, buf);
+	fgets(buf, sizeof(buf), stdin);
+	if (buf[strlen (buf) - 1] == '\n')
+		buf[strlen (buf) - 1] = '\0';
+	if (!buf[0])
+		return;
+	v = strtol(buf, &tmp, 0);
+	if (*tmp)
+		com_err(com, 0, "Bad value - %s", buf);
+	else
+		*val = v;
+}
+
+
+void do_modify_inode(int argc, char *argv[])
+{
+	struct ext2_inode inode;
+	ino_t inode_num;
+	int i;
+	errcode_t	retval;
+	char	buf[80];
+	char *hex_format = "0x%x";
+	char *octal_format = "0%o";
+	char *decimal_format = "%d";
+	
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: modify_inode <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	if (!(fs->flags & EXT2_FLAG_RW)) {
+		com_err(argv[0], 0, "Filesystem opened read/only");
+		return;
+	}
+
+	inode_num = string_to_inode(argv[1]);
+	if (!inode_num) 
+		return;
+
+	retval = ext2fs_read_inode(fs, inode_num, &inode);
+	if (retval) {
+		com_err(argv[1], retval, "while trying to read inode %d",
+			inode_num);
+		return;
+	}
+	
+	modify_short(argv[0], "Mode", octal_format, &inode.i_mode);
+	modify_short(argv[0], "User ID", decimal_format, &inode.i_uid);
+	modify_short(argv[0], "Group ID", decimal_format, &inode.i_gid);
+	modify_long(argv[0], "Size", decimal_format, &inode.i_size);
+	modify_long(argv[0], "Creation time", decimal_format, &inode.i_ctime);
+	modify_long(argv[0], "Modification time", decimal_format, &inode.i_mtime);
+	modify_long(argv[0], "Access time", decimal_format, &inode.i_atime);
+	modify_long(argv[0], "Deletion time", decimal_format, &inode.i_dtime);
+	modify_short(argv[0], "Link count", decimal_format, &inode.i_links_count);
+	modify_long(argv[0], "Block count", decimal_format, &inode.i_blocks);
+	modify_long(argv[0], "File flags", hex_format, &inode.i_flags);
+	modify_long(argv[0], "Reserved1", decimal_format, &inode.i_reserved1);
+	modify_long(argv[0], "File acl", decimal_format, &inode.i_file_acl);
+	modify_long(argv[0], "Directory acl", decimal_format, &inode.i_dir_acl);
+	modify_long(argv[0], "Fragment address", decimal_format, &inode.i_faddr);
+	modify_char(argv[0], "Fragment number", decimal_format, &inode.i_frag);
+	modify_char(argv[0], "Fragment size", decimal_format, &inode.i_fsize);
+	for (i=0;  i < EXT2_NDIR_BLOCKS; i++) {
+		sprintf(buf, "Direct Block #%d", i);
+		modify_long(argv[0], buf, decimal_format, &inode.i_block[i]);
+	}
+	modify_long(argv[0], "Indirect Block", decimal_format,
+		    &inode.i_block[EXT2_IND_BLOCK]);    
+	modify_long(argv[0], "Double Indirect Block", decimal_format,
+		    &inode.i_block[EXT2_DIND_BLOCK]);
+	modify_long(argv[0], "Triple Indirect Block", decimal_format,
+		    &inode.i_block[EXT2_TIND_BLOCK]);
+	retval = ext2fs_write_inode(fs, inode_num, &inode);
+	if (retval) {
+		com_err(argv[1], retval, "while trying to write inode %d",
+			inode_num);
+		return;
+	}
+}
+
+/*
+ * list directory
+ */
+
+struct list_dir_struct {
+	FILE	*f;
+	int	col;
+};
+
+int list_dir_proc(struct ext2_dir_entry *dirent,
+		  int	offset,
+		  int	blocksize,
+		  char	*buf,
+		  void	*private)
+{
+	char	name[EXT2_NAME_LEN];
+	char	tmp[EXT2_NAME_LEN + 16];
+
+	struct list_dir_struct *ls = (struct list_dir_struct *) private;
+	int	thislen;
+
+	thislen = (dirent->name_len < EXT2_NAME_LEN) ? dirent->name_len :
+		EXT2_NAME_LEN;
+	strncpy(name, dirent->name, thislen);
+	name[thislen] = '\0';
+
+	sprintf(tmp, "%ld (%d) %s   ", dirent->inode, dirent->rec_len, name);
+	thislen = strlen(tmp);
+
+	if (ls->col + thislen > 80) {
+		fprintf(ls->f, "\n");
+		ls->col = 0;
+	}
+	fprintf(ls->f, "%s", tmp);
+	ls->col += thislen;
+		
+	return 0;
+}
+
+void do_list_dir(int argc, char *argv[])
+{
+	ino_t	inode;
+	int	retval;
+	struct list_dir_struct ls;
+	
+	if (argc > 2) {
+		com_err(argv[0], 0, "Usage: list_dir [pathname]");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	if (argc == 2)
+		inode = string_to_inode(argv[1]);
+	else
+		inode = cwd;
+	if (!inode)
+		return;
+
+	ls.f = open_pager();
+	ls.col = 0;
+	retval = ext2fs_dir_iterate(fs, inode, DIRENT_FLAG_INCLUDE_EMPTY,
+				    0, list_dir_proc, &ls);
+	fprintf(ls.f, "\n");
+	close_pager(ls.f);
+	if (retval)
+		com_err(argv[1], retval, "");
+
+	return;
+}
+
+void do_change_working_dir(int argc, char *argv[])
+{
+	ino_t	inode;
+	int	retval;
+	
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: cd <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	inode = string_to_inode(argv[1]);
+	if (!inode) 
+		return;
+
+	retval = ext2fs_check_directory(fs, inode);
+	if (retval) {
+		com_err(argv[1], retval, "");
+		return;
+	}
+	cwd = inode;
+	return;
+}
+
+void do_iname(int argc, char *argv[])
+{
+	ino_t	inode;
+	
+	if (argc > 2) {
+		com_err(argv[0], 0, "Usage: iname <inode>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	inode = strtoul(argv[1], NULL, 0);
+	com_err(argv[0],0,"Function unimplemented");
+	return;
+}
+
+void do_print_working_directory(int argc, char *argv[])
+{
+	int	retval;
+	char	*pathname = NULL;
+	
+	if (argc > 1) {
+		com_err(argv[0], 0, "Usage: print_working_directory");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	retval = ext2fs_get_pathname(fs, cwd, 0, &pathname);
+	if (retval) {
+		com_err(argv[0], retval,
+			"while trying to get pathname of cwd");
+	}
+	printf("[pwd]   INODE: %6ld  PATH: %s\n", cwd, pathname);
+	free(pathname);
+	retval = ext2fs_get_pathname(fs, root, 0, &pathname);
+	if (retval) {
+		com_err(argv[0], retval,
+			"while trying to get pathname of root");
+	}
+	printf("[root]  INODE: %6ld  PATH: %s\n", root, pathname);
+	free(pathname);
+	return;
+}
+
+
+void make_link(char *sourcename, char *destname)
+{
+	ino_t	inode;
+	int	retval;
+	ino_t	dir;
+	char	*dest, *cp, *basename;
+
+	/*
+	 * Get the source inode
+	 */
+	inode = string_to_inode(sourcename);
+	if (!inode)
+		return;
+	basename = strrchr(sourcename, '/');
+	if (basename)
+		basename++;
+	else
+		basename = sourcename;
+	/*
+	 * Figure out the destination.  First see if it exists and is
+	 * a directory.  
+	 */
+	if (! (retval=ext2fs_namei(fs, root, cwd, destname, &dir)))
+		dest = basename;
+	else {
+		/*
+		 * OK, it doesn't exist.  See if it is
+		 * '<dir>/basename' or 'basename'
+		 */
+		cp = strrchr(destname, '/');
+		if (cp) {
+			*cp = 0;
+			dir = string_to_inode(destname);
+			if (!dir)
+				return;
+			dest = cp+1;
+		} else {
+			dir = cwd;
+			dest = destname;
+		}
+	}
+	
+	retval = ext2fs_link(fs, dir, dest, inode, 0);
+	if (retval)
+		com_err("make_link", retval, "");
+	return;
+}
+
+
+void do_link(int argc, char *argv[])
+{
+	if (argc != 3) {
+		com_err(argv[0], 0, "Usage: link <source_file> <dest_name>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	make_link(argv[1], argv[2]);
+}
+
+
+void unlink_file_by_name(char *filename)
+{
+	int	retval;
+	ino_t	dir;
+	char	*basename;
+	
+	basename = strrchr(filename, '/');
+	if (basename) {
+		*basename++ = '0';
+		dir = string_to_inode(filename);
+		if (!dir)
+			return;
+	} else {
+		dir = cwd;
+		basename = filename;
+	}
+	retval = ext2fs_unlink(fs, dir, basename, 0, 0);
+	if (retval)
+		com_err("unlink_file_by_name", retval, "");
+	return;
+}
+
+void do_unlink(int argc, char *argv[])
+{
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: unlink <pathname>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	unlink_file_by_name(argv[1]);
+}
+
+void do_find_free_block(int argc, char *argv[])
+{
+	blk_t	free_blk, goal;
+	errcode_t	retval;
+	char		*tmp;
+	
+	if (argc > 2 || *argv[1] == '?') {
+		com_err(argv[0], 0, "Usage: find_free_block <goal>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	if (argc > 1) {
+		goal = strtol(argv[1], &tmp, 0);
+		if (*tmp) {
+			com_err(argv[0], 0, "Bad goal - %s", argv[1]);
+			return;
+		}
+	}
+	else
+		goal = fs->super->s_first_data_block;
+
+	retval = ext2fs_new_block(fs, goal, 0, &free_blk);
+	if (retval)
+		com_err("ext2fs_new_block", retval, "");
+	else
+		printf("Free block found: %ld\n", free_blk);
+
+}
+
+void do_find_free_inode(int argc, char *argv[])
+{
+	ino_t	free_inode, dir;
+	int	mode;
+	int	retval;
+	char	*tmp;
+	
+	if (argc > 3 || *argv[1] == '?') {
+		com_err(argv[0], 0, "Usage: find_free_inode <dir> <mode>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	if (argc > 1) {
+		dir = strtol(argv[1], &tmp, 0);
+		if (*tmp) {
+			com_err(argv[0], 0, "Bad dir - %s", argv[1]);
+			return;
+		}
+	}
+	else
+		dir = root;
+	if (argc > 2) {
+		mode = strtol(argv[2], &tmp, 0);
+		if (*tmp) {
+			com_err(argv[0], 0, "Bad mode - %s", argv[2]);
+			return;
+		}
+	}
+	else
+		mode = 010755;
+
+	retval = ext2fs_new_inode(fs, dir, mode, 0, &free_inode);
+	if (retval)
+		com_err("ext2fs_new_inode", retval, "");
+	else
+		printf("Free inode found: %ld\n", free_inode);
+}
+
+/*
+ * Doesn't change directories count --->  add this later
+ */
+
+void do_mkdir(int argc, char *argv[])
+{
+	char	*cp;
+	ino_t	parent;
+	char	*name;
+	errcode_t retval;
+
+	if (check_fs_open(argv[0]))
+		return;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: mkdir <file>");
+		return;
+	}
+
+	cp = strrchr(argv[1], '/');
+	if (cp) {
+		*cp = 0;
+		parent = string_to_inode(argv[1]);
+		if (!parent) {
+			com_err(argv[1], ENOENT, "");
+			return;
+		}
+		name = cp+1;
+	} else {
+		parent = cwd;
+		name = argv[1];
+	}
+
+
+	retval = ext2fs_mkdir(fs, parent, 0, name);
+	if (retval) {
+		com_err("ext2fs_mkdir", retval, "");
+		return;
+	}
+
+}
+
+void do_rmdir(int argc, char *argv[])
+{
+	printf("Unimplemented\n");
+}
+
+
+int release_blocks_proc(ext2_filsys fs, blk_t *blocknr, int blockcnt, void *private)
+{
+	printf("%ld ", *blocknr);
+	ext2fs_unmark_block_bitmap(fs,fs->block_map,*blocknr);
+	return 0;
+}
+
+void kill_file_by_inode(ino_t inode)
+{
+	struct ext2_inode inode_buf;
+
+	ext2fs_read_inode(fs, inode, &inode_buf);
+	inode_buf.i_dtime = time(NULL);
+	ext2fs_write_inode(fs, inode, &inode_buf);
+
+	printf("Kill file by inode %ld\n", inode);
+	ext2fs_block_iterate(fs,inode,0,NULL,release_blocks_proc,NULL);
+	ext2fs_unmark_inode_bitmap(fs,fs->inode_map,inode);
+
+	ext2fs_mark_bb_dirty(fs);
+	ext2fs_mark_ib_dirty(fs);
+}
+
+
+void do_kill_file(int argc, char *argv[])
+{
+	ino_t inode_num;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: kill_file <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	inode_num = string_to_inode(argv[1]);
+	if (!inode_num) {
+		com_err(argv[0], 0, "Cannot find file");
+		return;
+	}
+	kill_file_by_inode(inode_num);
+}
+
+void do_rm(int argc, char *argv[])
+{
+	int retval;
+	ino_t inode_num;
+	struct ext2_inode inode;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: rm <filename>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+
+	retval = ext2fs_namei(fs, root, cwd, argv[1], &inode_num);
+	if (retval) {
+		com_err(argv[0], 0, "Cannot find file");
+		return;
+	}
+
+	retval = ext2fs_read_inode(fs,inode_num,&inode);
+	if (retval) {
+		com_err(argv[0], retval, "while reading file's inode");
+		return;
+	}
+
+	if (S_ISDIR(inode.i_mode)) {
+		com_err(argv[0], 0, "file is a directory");
+		return;
+	}
+
+	--inode.i_links_count;
+	retval = ext2fs_write_inode(fs,inode_num,&inode);
+	if (retval) {
+		com_err(argv[0], retval, "while writing inode");
+		return;
+	}
+
+	unlink_file_by_name(argv[1]);
+	if (inode.i_links_count == 0)
+		kill_file_by_inode(inode_num);
+}
+
+void do_show_debugfs_params(int argc, char *argv[])
+{
+	FILE *out = stdout;
+
+	fprintf(out, "Open mode: read-%s\n",
+		fs->flags & EXT2_FLAG_RW ? "write" : "only");
+	fprintf(out, "Filesystem in use: %s\n",
+		fs ? fs->device_name : "--none--");
+}
+
+void do_expand_dir(int argc, char *argv[])
+{
+	ino_t inode;
+	int retval;
+
+	if (argc != 2) {
+		com_err(argv[0], 0, "Usage: expand_dir <file>");
+		return;
+	}
+	if (check_fs_open(argv[0]))
+		return;
+	inode = string_to_inode(argv[1]);
+	if (!inode)
+		return;
+
+	retval = ext2fs_expand_dir(fs, inode);
+	if (retval)
+		com_err("ext2fs_expand_dir", retval, "");
+	return;
+}
+
+void main(int argc, char **argv)
+{
+	int	retval;
+	int	sci_idx;
+	char	*usage = "Usage: debugfs [[-w] device]";
+	char	c;
+	int open_flags = 0;
+	
+	initialize_ext2_error_table();
+
+	while ((c = getopt (argc, argv, "w")) != EOF) {
+		switch (c) {
+		case 'w':
+			open_flags = EXT2_FLAG_RW;
+			break;
+		default:
+			com_err(argv[0], 0, usage);
+			return;
+		}
+	}
+	if (optind < argc)
+		open_filesystem(argv[optind], open_flags);
+	
+	sci_idx = ss_create_invocation("debugfs", "0.0", (char *) NULL,
+				       &debug_cmds, &retval);
+	if (retval) {
+		ss_perror(sci_idx, retval, "creating invocation");
+		exit(1);
+	}
+
+	(void) ss_add_request_table (sci_idx, &ss_std_requests, 1, &retval);
+	if (retval) {
+		ss_perror(sci_idx, retval, "adding standard requests");
+		exit (1);
+	}
+
+	ss_listen(sci_idx);
+
+	if (fs)
+		close_filesystem();
+	
+	exit(0);
+}
+