Merge tag 'android-7.1.2_r39' into nougat-x86

[android-x86/external-e2fsprogs.git] / ext2ed / ext2ed.h

diff --git a/ext2ed/ext2ed.h b/ext2ed/ext2ed.h
index 34d836f..b9b43b4 100644 (file)
--- a/ext2ed/ext2ed.h
+++ b/ext2ed/ext2ed.h
@@ -28,20 +28,12 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
-#ifndef VAR_DIR
-       #define VAR_DIR "/var/lib/ext2ed"               /* The configuration file will be searched here */
-#endif
-
 #define DEBUG                                          /* Activate self-sanity checks */
 
-#include <linux/ext2_fs.h>                             /* Main kernel ext2 include file */
-#include <linux/stat.h>
+#include <ext2fs/ext2_fs.h>                            /* Main kernel ext2 include file */
+#include <sys/stat.h>
 
-#ifdef OLD_NCURSES                                     /* The ncurses interface */
-       #include <ncurses/ncurses.h>
-#else
-       #include <ncurses/curses.h>
-#endif
+#include <ncurses.h>
 
 #define MAX_FIELDS             400
 
@@ -49,14 +41,14 @@ Copyright (C) 1995 Gadi Oxman
 #define MAX_COMMANDS_NUM       30                      /* Maximum number of commands of one type */
 #define REMEMBER_COUNT         30                      /* Object memory size */
 
-/* 
+/*
        The user screen consists of four parts:
 
                1.      Title window (title_win).
                2.      Show (status) window (show_win).
                3.      Main show pad (show_pad).
                4.      Command window (command_win).
-       
+
 */
 
 /*
@@ -97,12 +89,17 @@ struct struct_descriptor {                          /* Describes an object */
        unsigned char name [60];
        unsigned short fields_num;
        unsigned char field_names [MAX_FIELDS][80];
+       unsigned char field_types [MAX_FIELDS];
        unsigned short field_lengths [MAX_FIELDS];
        unsigned short field_positions [MAX_FIELDS];
        struct struct_commands type_commands;
        struct struct_descriptor *prev,*next;
 };
 
+#define FIELD_TYPE_INT   1
+#define FIELD_TYPE_UINT   2
+#define FIELD_TYPE_CHAR   3
+
 struct struct_type_data {                              /* The object's data is usually here */
        long offset_in_block;
 
@@ -132,7 +129,7 @@ struct struct_file_system_info {                    /* Important information about the filesystem
 struct struct_file_info {                              /* Used to handle files and directories */
 
        struct ext2_inode *inode_ptr;
-       
+
        long inode_offset;
        long global_block_num,global_block_offset;
        long block_num,blocks_count;
@@ -143,7 +140,7 @@ struct struct_file_info {                           /* Used to handle files and directories */
 
        int display;
        /* The following is used if the file is a directory */
-       
+
        long dir_entry_num,dir_entries_count;
        long dir_entry_offset;
 };
@@ -435,4 +432,4 @@ extern void show_info (void);
 extern void redraw_all (void);
 extern void close_windows (void);
 
-#endif /* EXT2ED_EDITOR_H */
\ No newline at end of file
+#endif /* EXT2ED_EDITOR_H */