Merge tag 'android-8.1.0_r69' into oreo-x86

[android-x86/external-e2fsprogs.git] / ext2ed / group_com.c

diff --git a/ext2ed/group_com.c b/ext2ed/group_com.c
index ee6aabc..aaed16e 100644 (file)
--- a/ext2ed/group_com.c
+++ b/ext2ed/group_com.c
@@ -12,6 +12,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,11 +20,11 @@ Copyright (C) 1995 Gadi Oxman
 #include "ext2ed.h"
 
 void type_ext2_group_desc___next (char *command_line)
- 
+
 {
        long entry_offset=1;
        char *ptr,buffer [80];
-       
+
        ptr=parse_word (command_line,buffer);
        if (*ptr!=0) {
                ptr=parse_word (ptr,buffer);
@@ -39,7 +40,7 @@ void type_ext2_group_desc___prev (char *command_line)
 {
        long entry_offset=1;
        char *ptr,buffer [80];
-       
+
        ptr=parse_word (command_line,buffer);
        if (*ptr!=0) {
                ptr=parse_word (ptr,buffer);
@@ -55,7 +56,7 @@ void type_ext2_group_desc___entry (char *command_line)
 {
        long group_num;
        char *ptr,buffer [80];
-       
+
        ptr=parse_word (command_line,buffer);
        if (*ptr==0) {
                wprintw (command_win,"Error - No argument specified\n");refresh_command_win ();return;
@@ -63,11 +64,11 @@ void type_ext2_group_desc___entry (char *command_line)
        ptr=parse_word (ptr,buffer);
 
        group_num=atol (buffer);
-       
+
        if (group_num < 0 || group_num >= file_system_info.groups_count) {
                wprintw (command_win,"Error - Entry number out of bounds\n");refresh_command_win ();return;
        }
-       
+
        device_offset=file_system_info.first_group_desc_offset+group_num*sizeof (struct ext2_group_desc);
 
        sprintf (buffer,"setoffset %ld",device_offset);dispatch (buffer);
@@ -81,7 +82,7 @@ void type_ext2_group_desc___gocopy (char *command_line)
 {
        unsigned long copy_num,offset;
        char *ptr,buffer [80];
-       
+
        ptr=parse_word (command_line,buffer);
        if (*ptr==0) {
                wprintw (command_win,"Error - No argument specified\n");refresh_command_win ();return;
@@ -89,12 +90,12 @@ void type_ext2_group_desc___gocopy (char *command_line)
        ptr=parse_word (ptr,buffer);
 
        copy_num=atol (buffer);
-       
+
        offset=file_system_info.first_group_desc_offset+copy_num*file_system_info.super_block.s_blocks_per_group*file_system_info.block_size;
-       
+
        if (offset > file_system_info.file_system_size) {
                wprintw (command_win,"Error - Copy number out of bounds\n");refresh_command_win ();return;
-       }       
+       }
 
        group_info.copy_num=copy_num;
        device_offset=offset+group_info.group_num*sizeof (struct ext2_group_desc);
@@ -108,12 +109,12 @@ void type_ext2_group_desc___show (char *command_line)
 
 {
        long group_num,temp;
-       
+
        temp=(device_offset-file_system_info.first_group_desc_offset) % (file_system_info.super_block.s_blocks_per_group*file_system_info.block_size);
        group_num=temp/sizeof (struct ext2_group_desc);
 
        show (command_line);
-       
+
        wmove (show_win,1,0);wprintw (show_win,"\n");wmove (show_win,2,0);
        wprintw (show_win,"Group %ld of %ld ",group_num,file_system_info.groups_count-1);
        wprintw (show_win,"in copy %ld ",group_info.copy_num);
@@ -136,7 +137,7 @@ void type_ext2_group_desc___inode (char *command_line)
 {
        long inode_offset;
        char buffer [80];
-       
+
        inode_offset=type_data.u.t_ext2_group_desc.bg_inode_table;
        sprintf (buffer,"setoffset block %ld",inode_offset);dispatch (buffer);
        sprintf (buffer,"settype ext2_inode");dispatch (buffer);
@@ -147,10 +148,10 @@ void type_ext2_group_desc___blockbitmap (char *command_line)
 {
        long block_bitmap_offset;
        char buffer [80];
-       
+
        block_bitmap_info.entry_num=0;
        block_bitmap_info.group_num=group_info.group_num;
-       
+
        block_bitmap_offset=type_data.u.t_ext2_group_desc.bg_block_bitmap;
        sprintf (buffer,"setoffset block %ld",block_bitmap_offset);dispatch (buffer);
        sprintf (buffer,"settype block_bitmap");dispatch (buffer);
@@ -161,10 +162,10 @@ void type_ext2_group_desc___inodebitmap (char *command_line)
 {
        long inode_bitmap_offset;
        char buffer [80];
-       
+
        inode_bitmap_info.entry_num=0;
        inode_bitmap_info.group_num=group_info.group_num;
-       
+
        inode_bitmap_offset=type_data.u.t_ext2_group_desc.bg_inode_bitmap;
        sprintf (buffer,"setoffset block %ld",inode_bitmap_offset);dispatch (buffer);
        sprintf (buffer,"settype inode_bitmap");dispatch (buffer);
@@ -174,7 +175,7 @@ void type_ext2_group_desc___setactivecopy (char *command_line)
 
 {
        struct ext2_group_desc gd;
-       
+
        gd=type_data.u.t_ext2_group_desc;
        dispatch ("gocopy 0");
        type_data.u.t_ext2_group_desc=gd;