Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / debugfs / debugfs.c

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 2d248252e5ad4ac5c3851e6d593651c2b470d8d3..8fa24123918152fdd9371f241113e4ee68c0a043 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -569,10 +569,6 @@ void internal_dump_inode(FILE *out, const char *prefix,
                frag = inode->osd2.hurd2.h_i_frag;
                fsize = inode->osd2.hurd2.h_i_fsize;
                break;
-           case EXT2_OS_MASIX:
-               frag = inode->osd2.masix2.m_i_frag;
-               fsize = inode->osd2.masix2.m_i_fsize;
-               break;
            default:
                frag = fsize = 0;
        }
@@ -789,7 +785,8 @@ static void modify_u8(char *com, const char *prompt,
 
        sprintf(buf, format, *val);
        printf("%30s    [%s] ", prompt, buf);
-       fgets(buf, sizeof(buf), stdin);
+       if (!fgets(buf, sizeof(buf), stdin))
+               return;
        if (buf[strlen (buf) - 1] == '\n')
                buf[strlen (buf) - 1] = '\0';
        if (!buf[0])
@@ -810,7 +807,8 @@ static void modify_u16(char *com, const char *prompt,
 
        sprintf(buf, format, *val);
        printf("%30s    [%s] ", prompt, buf);
-       fgets(buf, sizeof(buf), stdin);
+       if (!fgets(buf, sizeof(buf), stdin))
+               return;
        if (buf[strlen (buf) - 1] == '\n')
                buf[strlen (buf) - 1] = '\0';
        if (!buf[0])
@@ -831,7 +829,8 @@ static void modify_u32(char *com, const char *prompt,
 
        sprintf(buf, format, *val);
        printf("%30s    [%s] ", prompt, buf);
-       fgets(buf, sizeof(buf), stdin);
+       if (!fgets(buf, sizeof(buf), stdin))
+               return;
        if (buf[strlen (buf) - 1] == '\n')
                buf[strlen (buf) - 1] = '\0';
        if (!buf[0])
@@ -899,10 +898,6 @@ void do_modify_inode(int argc, char *argv[])
                frag = &inode.osd2.hurd2.h_i_frag;
                fsize = &inode.osd2.hurd2.h_i_fsize;
                break;
-           case EXT2_OS_MASIX:
-               frag = &inode.osd2.masix2.m_i_frag;
-               fsize = &inode.osd2.masix2.m_i_fsize;
-               break;
            default:
                frag = fsize = 0;
        }
@@ -1011,7 +1006,7 @@ static void make_link(char *sourcename, char *destname)
        struct ext2_inode inode;
        int             retval;
        ext2_ino_t      dir;
-       char            *dest, *cp, *basename;
+       char            *dest, *cp, *base_name;
 
        /*
         * Get the source inode
@@ -1019,17 +1014,17 @@ static void make_link(char *sourcename, char *destname)
        ino = string_to_inode(sourcename);
        if (!ino)
                return;
-       basename = strrchr(sourcename, '/');
-       if (basename)
-               basename++;
+       base_name = strrchr(sourcename, '/');
+       if (base_name)
+               base_name++;
        else
-               basename = sourcename;
+               base_name = sourcename;
        /*
         * Figure out the destination.  First see if it exists and is
         * a directory.  
         */
        if (! (retval=ext2fs_namei(current_fs, root, cwd, destname, &dir)))
-               dest = basename;
+               dest = base_name;
        else {
                /*
                 * OK, it doesn't exist.  See if it is
@@ -1124,19 +1119,19 @@ static void unlink_file_by_name(char *filename)
 {
        int             retval;
        ext2_ino_t      dir;
-       char            *basename;
+       char            *base_name;
        
-       basename = strrchr(filename, '/');
-       if (basename) {
-               *basename++ = '\0';
+       base_name = strrchr(filename, '/');
+       if (base_name) {
+               *base_name++ = '\0';
                dir = string_to_inode(filename);
                if (!dir)
                        return;
        } else {
                dir = cwd;
-               basename = filename;
+               base_name = filename;
        }
-       retval = ext2fs_unlink(current_fs, dir, basename, 0, 0);
+       retval = ext2fs_unlink(current_fs, dir, base_name, 0, 0);
        if (retval)
                com_err("unlink_file_by_name", retval, 0);
        return;