debian: break out locale files into a separate package

[tools/e2fsprogs.git] / ext2ed / super_com.c

diff --git a/ext2ed/super_com.c b/ext2ed/super_com.c
index 0541ff3..a998970 100644 (file)
--- a/ext2ed/super_com.c
+++ b/ext2ed/super_com.c
@@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,14 +27,14 @@ void type_ext2_super_block___show (char *command_line)
 {
        struct ext2_super_block *super;
        super=&type_data.u.t_ext2_super_block;
-       
+
        show (command_line);
 
-       if (super->s_blocks_count != 0) {
-               wmove (show_pad,2,40);wprintw (show_pad,"%2.2f%%",100*(float) super->s_r_blocks_count/ (float) super->s_blocks_count);
-               wmove (show_pad,3,40);wprintw (show_pad,"%2.2f%%",100*(float) super->s_free_blocks_count/ (float) super->s_blocks_count);
+       if (ext2fs_blocks_count(super) != 0) {
+               wmove (show_pad,2,40);wprintw (show_pad,"%2.2f%%",100*(float) ext2fs_r_blocks_count(super)/ (float) ext2fs_blocks_count(super));
+               wmove (show_pad,3,40);wprintw (show_pad,"%2.2f%%",100*(float) ext2fs_free_blocks_count(super)/ (float) ext2fs_blocks_count(super));
        }
-       
+
        if (super->s_inodes_count != 0) {
                wmove (show_pad,4,40);wprintw (show_pad,"%2.2f%%",100*(float) super->s_free_inodes_count/ (float) super->s_inodes_count);
        }
@@ -60,7 +61,7 @@ void type_ext2_super_block___show (char *command_line)
                        wprintw (show_pad,"Unknown");
                        break;
        }
-       
+
        wmove (show_pad,16,40);
        if (type_data.u.t_ext2_super_block.s_state & 0x1)
                wprintw (show_pad,"clean ");
@@ -71,9 +72,9 @@ void type_ext2_super_block___show (char *command_line)
                wprintw (show_pad,"with errors ");
        else
                wprintw (show_pad,"with no errors");
-       
+
        wmove (show_pad,17,40);
-       
+
        switch (type_data.u.t_ext2_super_block.s_errors) {
                case EXT2_ERRORS_CONTINUE:
                        wprintw (show_pad,"Continue");
@@ -90,7 +91,7 @@ void type_ext2_super_block___show (char *command_line)
        }
 
        wmove (show_pad,21,40);
-       
+
        switch (type_data.u.t_ext2_super_block.s_creator_os) {
 
                case EXT2_OS_LINUX:
@@ -101,15 +102,11 @@ void type_ext2_super_block___show (char *command_line)
                        wprintw (show_pad,"Hurd");
                        break;
 
-               case EXT2_OS_MASIX:
-                       wprintw (show_pad,"Masix");
-                       break;
-
                default:
                        wprintw (show_pad,"Unknown");
                        break;
        }
-       
+
        refresh_show_pad ();
 
        wmove (show_win,1,0);wprintw (show_win,"\n");wmove (show_win,2,0);
@@ -125,7 +122,7 @@ void type_ext2_super_block___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;
@@ -133,12 +130,12 @@ void type_ext2_super_block___gocopy (char *command_line)
        ptr=parse_word (ptr,buffer);
 
        copy_num=atol (buffer);
-       
+
        offset=file_system_info.super_block_offset+copy_num*file_system_info.no_blocks_in_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;
-       }       
+       }
 
        super_info.copy_num=copy_num;
        device_offset=offset;
@@ -151,7 +148,7 @@ void type_ext2_super_block___setactivecopy (char *command_line)
 
 {
        struct ext2_super_block sb;
-       
+
        sb=type_data.u.t_ext2_super_block;
        dispatch ("gocopy 0");
        type_data.u.t_ext2_super_block=sb;