fdisk: api: move disklabel type to cxt
PATCH v2 1/3 fdisk: api: move disklabel type to cxt
Get rid of it as a global variable as it belongs in the context. To compare a disklabel on the device, the fdisk_dev_is_disklabel() function is introduced. Also, to avoid naming issues, the fdisk_labeltype members where renamed to FDISK_DISKLABEL_<type>.
Signed-off-by Davidlohr Bueso <[email protected]>
--- fdisks/fdisk.c | 191 ++++++++++++++++++++++++------------------------ fdisks/fdisk.h | 34 +++++---- fdisks/fdiskaixlabel.c | 2 +- fdisks/fdiskbsdlabel.c | 2 +- fdisks/fdiskdoslabel.c | 2 +- fdisks/fdiskmaclabel.c | 2 +- fdisks/fdisksgilabel.c | 4 +- fdisks/fdisksunlabel.c | 8 +- fdisks/gpt.c | 14 ++-- fdisks/utils.c | 16 +++- 10 files changed, 146 insertions(+), 129 deletions(-)
fdisks/fdisk.c +97 -94
@@ -62,6 +62,7 @@ int MBRbuffer_changed;#define sector (s) ((s) & 0x3f)#define cylinder (s, c) ((c) | (((s) & 0xc0) << 2)) +#define fdisk_is_disklabel (c, x) fdisk_dev_is_disklabel(c, FDISK_DISKLABEL_ ## x)/* menu list description */
@@ -72,50 +73,50 @@ struct menulist_descr { };static const struct menulist_descr menulist[] = { - {'a' ,N_ ("toggle a bootable flag" ), {DOS_LABEL ,0 }}, - {'a' ,N_ ("toggle a read only flag" ), {SUN_LABEL ,0 }}, - {'a' ,N_ ("select bootable partition" ), {SGI_LABEL ,0 }}, - {'a' ,N_ ("change number of alternate cylinders" ), {0 ,SUN_LABEL }}, - {'b' ,N_ ("edit bsd disklabel" ), {DOS_LABEL ,0 }}, - {'b' ,N_ ("edit bootfile entry" ), {SGI_LABEL ,0 }}, - {'b' ,N_ ("move beginning of data in a partition" ), {0 ,DOS_LABEL }}, - {'c' ,N_ ("toggle the dos compatibility flag" ), {DOS_LABEL ,0 }}, - {'c' ,N_ ("toggle the mountable flag" ), {SUN_LABEL ,0 }}, - {'c' ,N_ ("select sgi swap partition" ), {SGI_LABEL ,0 }}, - {'c' ,N_ ("change number of cylinders" ), {0 ,DOS_LABEL |SUN_LABEL }}, - {'d' ,N_ ("delete a partition" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL |OSF_LABEL |GPT_LABEL ,0 }}, - {'d' ,N_ ("print the raw data in the partition table" ), {0 ,ANY_LABEL }}, - {'e' ,N_ ("change number of extra sectors per cylinder" ), {0 ,SUN_LABEL }}, - {'e' ,N_ ("list extended partitions" ), {0 ,DOS_LABEL }}, - {'e' ,N_ ("edit drive data" ), {OSF_LABEL ,0 }}, - {'f' ,N_ ("fix partition order" ), {0 ,DOS_LABEL }}, - {'g' ,N_ ("create an IRIX (SGI) partition table" ), {0 ,ANY_LABEL }}, - {'g' ,N_ ("create a new empty GPT partition table" ), {~OSF_LABEL ,0 }}, - {'h' ,N_ ("change number of heads" ), {0 ,DOS_LABEL |SUN_LABEL }}, - {'i' ,N_ ("change interleave factor" ), {0 ,SUN_LABEL }}, - {'i' ,N_ ("change the disk identifier" ), {0 ,DOS_LABEL }}, - {'i' ,N_ ("install bootstrap" ), {OSF_LABEL ,0 }}, - {'l' ,N_ ("list known partition types" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL |OSF_LABEL |GPT_LABEL ,0 }}, - {'m' ,N_ ("print this menu" ), {ANY_LABEL ,ANY_LABEL }}, - {'n' ,N_ ("add a new partition" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL |OSF_LABEL |GPT_LABEL ,0 }}, - {'o' ,N_ ("create a new empty DOS partition table" ), {~OSF_LABEL ,0 }}, - {'o' ,N_ ("change rotation speed (rpm)" ), {0 ,SUN_LABEL }}, - {'p' ,N_ ("print the partition table" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL |OSF_LABEL ,DOS_LABEL |SUN_LABEL }}, - {'q' ,N_ ("quit without saving changes" ), {ANY_LABEL ,ANY_LABEL }}, - {'r' ,N_ ("return to main menu" ), {OSF_LABEL ,DOS_LABEL |SUN_LABEL |SGI_LABEL |OSF_LABEL }}, - {'s' ,N_ ("create a new empty Sun disklabel" ), {~OSF_LABEL ,0 }}, - {'s' ,N_ ("change number of sectors/track" ), {0 ,DOS_LABEL |SUN_LABEL }}, - {'s' ,N_ ("show complete disklabel" ), {OSF_LABEL ,0 }}, - {'t' ,N_ ("change a partition's system id" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL |OSF_LABEL ,0 }}, - {'u' ,N_ ("change display/entry units" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL |OSF_LABEL ,0 }}, - {'v' ,N_ ("verify the partition table" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL ,DOS_LABEL |SUN_LABEL |SGI_LABEL }}, - {'w' ,N_ ("write table to disk and exit" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL |GPT_LABEL ,DOS_LABEL |SUN_LABEL |SGI_LABEL }}, - {'w' ,N_ ("write disklabel to disk" ), {OSF_LABEL ,0 }}, - {'x' ,N_ ("extra functionality (experts only)" ), {DOS_LABEL |SUN_LABEL |SGI_LABEL ,0 }}, + {'a' ,N_ ("toggle a bootable flag" ), {FDISK_DISKLABEL_DOS ,0 }}, + {'a' ,N_ ("toggle a read only flag" ), {FDISK_DISKLABEL_SUN ,0 }}, + {'a' ,N_ ("select bootable partition" ), {FDISK_DISKLABEL_SGI ,0 }}, + {'a' ,N_ ("change number of alternate cylinders" ), {0 ,FDISK_DISKLABEL_SUN }}, + {'b' ,N_ ("edit bsd disklabel" ), {FDISK_DISKLABEL_DOS ,0 }}, + {'b' ,N_ ("edit bootfile entry" ), {FDISK_DISKLABEL_SGI ,0 }}, + {'b' ,N_ ("move beginning of data in a partition" ), {0 ,FDISK_DISKLABEL_DOS }}, + {'c' ,N_ ("toggle the dos compatibility flag" ), {FDISK_DISKLABEL_DOS ,0 }}, + {'c' ,N_ ("toggle the mountable flag" ), {FDISK_DISKLABEL_SUN ,0 }}, + {'c' ,N_ ("select sgi swap partition" ), {FDISK_DISKLABEL_SGI ,0 }}, + {'c' ,N_ ("change number of cylinders" ), {0 ,FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN }}, + {'d' ,N_ ("delete a partition" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI |FDISK_DISKLABEL_OSF |FDISK_DISKLABEL_GPT ,0 }}, + {'d' ,N_ ("print the raw data in the partition table" ), {0 ,FDISK_DISKLABEL_ANY }}, + {'e' ,N_ ("change number of extra sectors per cylinder" ), {0 ,FDISK_DISKLABEL_SUN }}, + {'e' ,N_ ("list extended partitions" ), {0 ,FDISK_DISKLABEL_DOS }}, + {'e' ,N_ ("edit drive data" ), {FDISK_DISKLABEL_OSF ,0 }}, + {'f' ,N_ ("fix partition order" ), {0 ,FDISK_DISKLABEL_DOS }}, + {'g' ,N_ ("create an IRIX (SGI) partition table" ), {0 ,FDISK_DISKLABEL_ANY }}, + {'g' ,N_ ("create a new empty GPT partition table" ), {~FDISK_DISKLABEL_OSF ,0 }}, + {'h' ,N_ ("change number of heads" ), {0 ,FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN }}, + {'i' ,N_ ("change interleave factor" ), {0 ,FDISK_DISKLABEL_SUN }}, + {'i' ,N_ ("change the disk identifier" ), {0 ,FDISK_DISKLABEL_DOS }}, + {'i' ,N_ ("install bootstrap" ), {FDISK_DISKLABEL_OSF ,0 }}, + {'l' ,N_ ("list known partition types" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI |FDISK_DISKLABEL_OSF |FDISK_DISKLABEL_GPT ,0 }}, + {'m' ,N_ ("print this menu" ), {FDISK_DISKLABEL_ANY ,FDISK_DISKLABEL_ANY }}, + {'n' ,N_ ("add a new partition" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI |FDISK_DISKLABEL_OSF |FDISK_DISKLABEL_GPT ,0 }}, + {'o' ,N_ ("create a new empty DOS partition table" ), {~FDISK_DISKLABEL_OSF ,0 }}, + {'o' ,N_ ("change rotation speed (rpm)" ), {0 ,FDISK_DISKLABEL_SUN }}, + {'p' ,N_ ("print the partition table" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI |FDISK_DISKLABEL_OSF ,FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN }}, + {'q' ,N_ ("quit without saving changes" ), {FDISK_DISKLABEL_ANY ,FDISK_DISKLABEL_ANY }}, + {'r' ,N_ ("return to main menu" ), {FDISK_DISKLABEL_OSF ,FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI |FDISK_DISKLABEL_OSF }}, + {'s' ,N_ ("create a new empty Sun disklabel" ), {~FDISK_DISKLABEL_OSF ,0 }}, + {'s' ,N_ ("change number of sectors/track" ), {0 ,FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN }}, + {'s' ,N_ ("show complete disklabel" ), {FDISK_DISKLABEL_OSF ,0 }}, + {'t' ,N_ ("change a partition's system id" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI |FDISK_DISKLABEL_OSF ,0 }}, + {'u' ,N_ ("change display/entry units" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI |FDISK_DISKLABEL_OSF ,0 }}, + {'v' ,N_ ("verify the partition table" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI ,FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI }}, + {'w' ,N_ ("write table to disk and exit" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI |FDISK_DISKLABEL_GPT ,FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI }}, + {'w' ,N_ ("write disklabel to disk" ), {FDISK_DISKLABEL_OSF ,0 }}, + {'x' ,N_ ("extra functionality (experts only)" ), {FDISK_DISKLABEL_DOS |FDISK_DISKLABEL_SUN |FDISK_DISKLABEL_SGI ,0 }}, #if !defined (__alpha__) - {'x' ,N_ ("link BSD partition to non-BSD partition" ), {OSF_LABEL ,0 }}, + {'x' ,N_ ("link BSD partition to non-BSD partition" ), {FDISK_DISKLABEL_OSF ,0 }}, #endif - {'y' ,N_ ("change number of physical cylinders" ), {0 ,SUN_LABEL }}, + {'y' ,N_ ("change number of physical cylinders" ), {0 ,FDISK_DISKLABEL_SUN }}, };
@@ -134,7 +135,6 @@ int nowarn = 0, /* no warnings for fdisk -l/-s */unsigned int user_cylinders, user_heads, user_sectors;sector_t sector_offset =1 ;unsigned int units_per_sector =1 , display_in_cyl_units =0 ; -enum fdisk_labeltype disklabel;/* Current disklabel */ static void __attribute__ ((__noreturn__))usage (FILE *out) {
@@ -209,14 +209,14 @@ is_garbage_table(void) {return 0 ; } -void print_menu (enum menutype menu) +void print_menu (struct fdisk_context *cxt,enum menutype menu) {size_t i;puts (_ ("Command action" ));for (i =0 ; i <ARRAY_SIZE (menulist); i++) -if (menulist[i].label[menu] & disklabel) +if (menulist[i].label[menu] & cxt->disklabel)printf (" %c %s\n" , menulist[i].command, menulist[i].description); }
@@ -369,7 +369,7 @@ int warn_geometry(struct fdisk_context *cxt)char *m =NULL ;int prev =0 ; -if (disklabel ==SGI_LABEL )/* cannot set cylinders etc anyway */ +if (fdisk_is_disklabel (cxt,SGI ))/* cannot set cylinders etc anyway */ return 0 ;if (!cxt->geom.heads) prev =test_c (&m,_ ("heads" ));
@@ -741,13 +741,14 @@ get_partition_dflt(struct fdisk_context *cxt, int warn, int max, int dflt) { i =read_int (cxt,1 , dflt, max,0 ,_ ("Partition number" )) -1 ; pe = &ptes[i]; -if (warn && disklabel !=GPT_LABEL ) { -if ((disklabel !=SUN_LABEL && disklabel !=SGI_LABEL && !pe->part_table->sys_ind) - || (disklabel ==SUN_LABEL && +if (warn && !fdisk_is_disklabel (cxt,GPT )) { +if ((!fdisk_is_disklabel (cxt,SUN ) && + !fdisk_is_disklabel (cxt,SGI ) && !pe->part_table->sys_ind) + || (fdisk_is_disklabel (cxt,SUN ) && (!sunlabel->partitions[i].num_sectors || !sunlabel->part_tags[i].tag)) - || (disklabel ==SGI_LABEL && (!sgi_get_num_sectors (cxt, i))) - ) + || (fdisk_is_disklabel (cxt,SGI ) && + (!sgi_get_num_sectors (cxt, i))))fprintf (stderr,_ ("Warning: partition %d has empty type\n" ), i+1 );
@@ -767,7 +768,7 @@ get_existing_partition(struct fdisk_context *cxt, int warn, int max) {int pno =-1 ;int i; -if (disklabel !=DOS_LABEL ) +if (!fdisk_is_disklabel (cxt,DOS )) goto not_implemented;for (i =0 ; i < max; i++) {
@@ -985,7 +986,7 @@ list_disk_geometry(struct fdisk_context *cxt) { cxt->min_io_size, cxt->io_size);if (cxt->alignment_offset)printf (_ ("Alignment offset: %lu bytes\n" ), cxt->alignment_offset); -if (disklabel ==DOS_LABEL ) +if (fdisk_is_disklabel (cxt,DOS ))dos_print_mbr_id (cxt);printf ("\n" ); }
@@ -1130,24 +1131,24 @@ static void list_table(struct fdisk_context *cxt, int xtra)struct partition *p;int i, w; -if (disklabel ==SUN_LABEL ) { +if (fdisk_is_disklabel (cxt,SUN )) {sun_list_table (cxt, xtra);return ; } -if (disklabel ==SGI_LABEL ) { +if (fdisk_is_disklabel (cxt,SGI )) {sgi_list_table (cxt, xtra);return ; }list_disk_geometry (cxt); -if (disklabel ==GPT_LABEL ) { +if (fdisk_is_disklabel (cxt,GPT )) {gpt_list_table (cxt, xtra);return ; } -if (disklabel ==OSF_LABEL ) { +if (fdisk_is_disklabel (cxt,OSF )) {xbsd_print_disklabel (cxt, xtra);return ; }
@@ -1205,7 +1206,7 @@ static void list_table(struct fdisk_context *cxt, int xtra)/* Is partition table in disk order? It need not be, but... */ /* partition table entries are not checked for correct order if this is a sgi, sun or aix labeled disk... */ -if (disklabel ==DOS_LABEL &&wrong_p_order (NULL )) { +if (fdisk_is_disklabel (cxt,DOS ) &&wrong_p_order (NULL )) {printf (_ ("\nPartition table entries are not in disk order\n" )); } }
@@ -1311,8 +1312,9 @@ static void new_partition(struct fdisk_context *cxt)if (warn_geometry (cxt))return ; -if (disklabel ==SUN_LABEL || disklabel ==SGI_LABEL - || disklabel ==GPT_LABEL ) +if (fdisk_is_disklabel (cxt,SUN ) || +fdisk_is_disklabel (cxt,SGI ) || +fdisk_is_disklabel (cxt,GPT )) partnum =get_partition (cxt,0 , partitions);fdisk_add_partition (cxt, partnum,NULL );
@@ -1390,8 +1392,9 @@ static void print_raw(struct fdisk_context *cxt)int i;printf (_ ("Device: %s\n" ), cxt->dev_path); -if (disklabel ==SUN_LABEL || disklabel ==SGI_LABEL || - disklabel ==GPT_LABEL ) +if (fdisk_is_disklabel (cxt,SUN ) || +fdisk_is_disklabel (cxt,SGI ) || +fdisk_is_disklabel (cxt,GPT ))print_buffer (cxt, cxt->firstsector);else for (i =3 ; i < partitions; i++)print_buffer (cxt, ptes[i].sectorbuffer);
@@ -1463,34 +1466,34 @@ expert_command_prompt(struct fdisk_context *cxt) c =tolower (read_char (_ ("Expert command (m for help): " )));switch (c) {case 'a' : -if (disklabel ==SUN_LABEL ) +if (fdisk_is_disklabel (cxt,SUN ))sun_set_alt_cyl (cxt);break ;case 'b' : -if (disklabel ==DOS_LABEL ) +if (fdisk_is_disklabel (cxt,DOS ))move_begin (cxt,get_partition (cxt,0 , partitions));break ;case 'c' : user_cylinders = cxt->geom.cylinders =read_int (cxt,1 , cxt->geom.cylinders,1048576 ,0 ,_ ("Number of cylinders" )); -if (disklabel ==SUN_LABEL ) +if (fdisk_is_disklabel (cxt,SUN ))sun_set_ncyl (cxt, cxt->geom.cylinders);break ;case 'd' :print_raw (cxt);break ;case 'e' : -if (disklabel ==SGI_LABEL ) +if (fdisk_is_disklabel (cxt,SGI ))sgi_set_xcyl (); -else if (disklabel ==SUN_LABEL ) +else if (fdisk_is_disklabel (cxt,SUN ))sun_set_xcyl (cxt);else -if (disklabel ==DOS_LABEL ) -x_list_table (cxt,1 ); +if (fdisk_is_disklabel (cxt,DOS )) +x_list_table (cxt,1 );break ;case 'f' : -if (disklabel ==DOS_LABEL ) +if (fdisk_is_disklabel (cxt,DOS ))fix_partition_table_order ();break ;case 'g' :
@@ -1502,17 +1505,17 @@ expert_command_prompt(struct fdisk_context *cxt)update_units (cxt);break ;case 'i' : -if (disklabel ==SUN_LABEL ) +if (fdisk_is_disklabel (cxt,SUN ))sun_set_ilfact (cxt); -else if (disklabel ==DOS_LABEL ) +else if (fdisk_is_disklabel (cxt,DOS ))dos_set_mbr_id (cxt);break ;case 'o' : -if (disklabel ==SUN_LABEL ) +if (fdisk_is_disklabel (cxt,SUN ))sun_set_rspeed (cxt);break ;case 'p' : -if (disklabel ==SUN_LABEL ) +if (fdisk_is_disklabel (cxt,SUN ))list_table (cxt,1 );else x_list_table (cxt,0 );
@@ -1538,11 +1541,11 @@ expert_command_prompt(struct fdisk_context *cxt)write_table (cxt);break ;case 'y' : -if (disklabel ==SUN_LABEL ) +if (fdisk_is_disklabel (cxt,SUN ))sun_set_pcylcount (cxt);break ;default : -print_menu (EXPERT_MENU ); +print_menu (cxt,EXPERT_MENU ); } } }
@@ -1580,10 +1583,10 @@ static void print_partition_table_from_option(char *device, unsigned long sector* Try BSD -- TODO: move to list_table() too */ list_disk_geometry (cxt); -if (disklabel !=AIX_LABEL && disklabel !=MAC_LABEL ) +if (!fdisk_is_disklabel (cxt,AIX ) && + !fdisk_is_disklabel (cxt,MAC ))btrydev (cxt); - } -else + }else list_table (cxt,0 );fdisk_free_context (cxt);
@@ -1643,7 +1646,7 @@ static void command_prompt(struct fdisk_context *cxt) {int c; -if (disklabel ==OSF_LABEL ) { +if (fdisk_is_disklabel (cxt,OSF )) {putchar ('\n' );/* OSF label, and no DOS label */ printf(_("Detected an OSF/1 disklabel on %s, entering "
@@ -1651,7 +1654,7 @@ static void command_prompt(struct fdisk_context *cxt) cxt->dev_path);bsd_command_prompt (cxt);/* If we return we may want to make an empty DOS label? */ - disklabel =DOS_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_DOS ; }while (1 ) {
@@ -1659,34 +1662,34 @@ static void command_prompt(struct fdisk_context *cxt) c =tolower (read_char (_ ("Command (m for help): " )));switch (c) {case 'a' : -if (disklabel ==DOS_LABEL ) +if (fdisk_is_disklabel (cxt,DOS ))toggle_active (get_partition (cxt,1 , partitions)); -else if (disklabel ==SUN_LABEL ) +else if (fdisk_is_disklabel (cxt,SUN ))toggle_sunflags (cxt,get_partition (cxt,1 , partitions),SUN_FLAG_UNMNT ); -else if (disklabel ==SGI_LABEL ) +else if (fdisk_is_disklabel (cxt,SGI ))sgi_set_bootpartition (cxt,get_partition (cxt,1 , partitions));else unknown_command (c);break ;case 'b' : -if (disklabel ==SGI_LABEL ) +if (fdisk_is_disklabel (cxt,SGI ))sgi_set_bootfile (cxt); -else if (disklabel ==DOS_LABEL ) { - disklabel =OSF_LABEL ; +else if (fdisk_is_disklabel (cxt,DOS )) { + cxt->disklabel =FDISK_DISKLABEL_OSF ;bsd_command_prompt (cxt); - disklabel =DOS_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_DOS ; }else unknown_command (c);break ;case 'c' : -if (disklabel ==DOS_LABEL ) +if (fdisk_is_disklabel (cxt,DOS ))toggle_dos_compatibility_flag (cxt); -else if (disklabel ==SUN_LABEL ) +else if (fdisk_is_disklabel (cxt,SUN ))toggle_sunflags (cxt,get_partition (cxt,1 , partitions),SUN_FLAG_RONLY ); -else if (disklabel ==SGI_LABEL ) +else if (fdisk_is_disklabel (cxt,SGI ))sgi_set_swappartition (cxt,get_partition (cxt,1 , partitions));else
@@ -1699,7 +1702,7 @@ static void command_prompt(struct fdisk_context *cxt)fdisk_create_disklabel (cxt,"gpt" );break ;case 'i' : -if (disklabel ==SGI_LABEL ) +if (fdisk_is_disklabel (cxt,SGI ))create_sgiinfo (cxt);else unknown_command (c);
@@ -1708,7 +1711,7 @@ static void command_prompt(struct fdisk_context *cxt)list_partition_types (cxt);break ;case 'm' : -print_menu (MAIN_MENU ); +print_menu (cxt,MAIN_MENU );break ;case 'n' :new_partition (cxt);
@@ -1741,7 +1744,7 @@ static void command_prompt(struct fdisk_context *cxt)break ;default :unknown_command (c); -print_menu (MAIN_MENU ); +print_menu (cxt,MAIN_MENU ); } } }
fdisks/fdisk.h +18 -16
@@ -100,6 +100,20 @@ enum failure {typedef unsigned long long sector_t ;/* +* Supported partition table types (labels) +*/ +enum fdisk_labeltype { +FDISK_DISKLABEL_DOS =1 , +FDISK_DISKLABEL_SUN =2 , +FDISK_DISKLABEL_SGI =4 , +FDISK_DISKLABEL_AIX =8 , +FDISK_DISKLABEL_OSF =16 , +FDISK_DISKLABEL_MAC =32 , +FDISK_DISKLABEL_GPT =64 , +FDISK_DISKLABEL_ANY =-1 +}; + +/* * Partition types */ struct fdisk_parttype {
@@ -142,6 +156,8 @@ struct fdisk_context {unsigned long sector_size;/* logical size */ unsigned long alignment_offset; +enum fdisk_labeltype disklabel;/* current disklabel */ +unsigned long grain;/* alignment unit */ /* geometry */
@@ -194,6 +210,7 @@ extern const struct fdisk_label gpt_label;extern struct fdisk_context *fdisk_new_context_from_filename (const char *fname,int readonly);extern int fdisk_dev_has_topology (struct fdisk_context *cxt);extern int fdisk_dev_has_disklabel (struct fdisk_context *cxt); +extern int fdisk_dev_is_disklabel (struct fdisk_context *cxt,enum fdisk_labeltype l);extern int fdisk_dev_sectsz_is_default (struct fdisk_context *cxt);extern void fdisk_free_context (struct fdisk_context *cxt);extern void fdisk_zeroize_firstsector (struct fdisk_context *cxt);
@@ -241,7 +258,7 @@ extern struct partition *get_part_table(int);extern unsigned int read_int (struct fdisk_context *cxt,unsigned int low,unsigned int dflt,unsigned int high,unsigned int base,char *mesg); -extern void print_menu (enum menutype ); +extern void print_menu (struct fdisk_context *cxt,enum menutype menu);extern void print_partition_size (struct fdisk_context *cxt,int num,sector_t start,sector_t stop,int sysid);extern void fill_bounds (sector_t *first,sector_t *last);
@@ -267,21 +284,6 @@ extern const char * str_units(int);extern sector_t get_nr_sects (struct partition *p); -/* -* Supported partition table types (labels) -*/ -enum fdisk_labeltype { -DOS_LABEL =1 , -SUN_LABEL =2 , -SGI_LABEL =4 , -AIX_LABEL =8 , -OSF_LABEL =16 , -MAC_LABEL =32 , -GPT_LABEL =64 , -ANY_LABEL =-1 -}; - -extern enum fdisk_labeltype disklabel;extern int MBRbuffer_changed;/* start_sect and nr_sects are stored little endian on all machines */
fdisks/fdiskaixlabel.c +1 -1
@@ -58,7 +58,7 @@ static int aix_probe_label(struct fdisk_context *cxt)return 0 ; } other_endian = (aixlabel->magic ==AIX_LABEL_MAGIC_SWAPPED ); - disklabel =AIX_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_AIX ; partitions=1016 ; volumes =15 ;aix_info ();
fdisks/fdiskbsdlabel.c +1 -1
@@ -305,7 +305,7 @@ bsd_command_prompt (struct fdisk_context *cxt)break ;#endif default : -print_menu (MAIN_MENU ); +print_menu (cxt,MAIN_MENU );break ; } }
fdisks/fdiskdoslabel.c +1 -1
@@ -115,7 +115,7 @@ void dos_init(struct fdisk_context *cxt) {int i; - disklabel =DOS_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_DOS ; partitions =4 ; ext_index =0 ; extended_offset =0 ;
fdisks/fdiskmaclabel.c +1 -1
@@ -76,7 +76,7 @@ mac_probe_label(struct fdisk_context *cxt) IS_MAC: other_endian = (maclabel->magic ==MAC_LABEL_MAGIC_SWAPPED );// =? - disklabel =MAC_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_MAC ; partitions=1016 ;// =? volumes =15 ;// =? mac_info ();
fdisks/fdisksgilabel.c +2 -2
@@ -154,7 +154,7 @@ sgi_probe_label(struct fdisk_context *cxt) {fprintf (stderr,_ ("Detected sgi disklabel with wrong checksum.\n" )); } - disklabel =SGI_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_SGI ; partitions=16 ; volumes =15 ;return 1 ;
@@ -818,7 +818,7 @@ static int sgi_create_disklabel(struct fdisk_context *cxt) sgilabel->devparam.xylogics_writecont =SSWAP16 (0 );memset (&(sgilabel->directory),0 ,sizeof (struct volume_directory )*15 );memset (&(sgilabel->partitions),0 ,sizeof (struct sgi_partition )*16 ); - disklabel =SGI_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_SGI ; partitions =16 ; volumes =15 ;sgi_set_entire (cxt);
fdisks/fdisksunlabel.c +4 -4
@@ -72,9 +72,9 @@ static void set_sun_partition(struct fdisk_context *cxt,print_partition_size (cxt, i +1 , start, stop, sysid); } -static void init (void ) +static void init (struct fdisk_context *cxt) { - disklabel =SUN_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_SUN ; partitions =SUN_NUM_PARTITIONS ; }
@@ -89,7 +89,7 @@ static int sun_probe_label(struct fdisk_context *cxt)return 0 ; } -init (); +init (cxt); other_endian = (sunlabel->magic ==SUN_LABEL_MAGIC_SWAPPED ); ush = ((unsigned short *) (sunlabel +1 )) -1 ;
@@ -159,7 +159,7 @@ static int sun_create_disklabel(struct fdisk_context *cxt) other_endian =0 ;#endif -init (); +init (cxt);fdisk_zeroize_firstsector (cxt); sunlabel->magic =SSWAP16 (SUN_LABEL_MAGIC );
fdisks/gpt.c +7 -7
@@ -970,16 +970,16 @@ done:/* * Initialize fdisk-specific variables - call once probing passes! */ -static void gpt_init (void ) +static void gpt_init (struct fdisk_context *cxt) { - disklabel =GPT_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_GPT ; partitions =le32_to_cpu (pheader->npartition_entries); }/* * Deinitialize fdisk-specific variables */ -static void gpt_deinit (void ) +static void gpt_deinit (struct fdisk_context *cxt) {free (ents);free (pheader);
@@ -988,7 +988,7 @@ static void gpt_deinit(void) pheader =NULL ; bheader =NULL ; - disklabel =ANY_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_ANY ; partitions =0 ; }
@@ -1022,7 +1022,7 @@ static int gpt_probe_label(struct fdisk_context *cxt)/* OK, probing passed, now initialize backup header and fdisk variables. */ bheader =gpt_get_bheader (cxt); -gpt_init (); +gpt_init (cxt);printf (_ ("\nWARNING: fdisk GPT support is currently new, and therefore " "in an experimental phase. Use at your own discretion.\n\n" ));
@@ -1523,7 +1523,7 @@ static int gpt_create_disklabel(struct fdisk_context *cxt)* dealing with a new, empty disk - so always allocate memory * to deal with the data structures whatever the case is. */ -gpt_deinit (); +gpt_deinit (cxt); rc =gpt_mknew_pmbr (cxt);if (rc <0 )
@@ -1546,7 +1546,7 @@ static int gpt_create_disklabel(struct fdisk_context *cxt)gpt_recompute_crc (pheader, ents);gpt_recompute_crc (bheader, ents); -gpt_init (); +gpt_init (cxt); DBG(LABEL, dbgprint("created new empty GPT disklabel " "(GUID: %08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X)", pheader->disk_guid.time_low, pheader->disk_guid.time_mid,
fdisks/utils.c +14 -2
@@ -133,7 +133,7 @@ static int __probe_labels(struct fdisk_context *cxt) {size_t i; - disklabel =ANY_LABEL ; + cxt->disklabel =FDISK_DISKLABEL_ANY ;update_units (cxt);for (i =0 ; i <ARRAY_SIZE (labels); i++) {
@@ -376,7 +376,19 @@ int fdisk_dev_has_topology(struct fdisk_context *cxt)*/ int fdisk_dev_has_disklabel (struct fdisk_context *cxt) { -return cxt && disklabel !=ANY_LABEL ; +return cxt && cxt->disklabel !=FDISK_DISKLABEL_ANY ; +} + +/** +* fdisk_dev_is_disklabel: +* @cxt: fdisk context +* @l: disklabel type +* +* Returns: return 1 if there is @l disklabel on the device. +*/ +int fdisk_dev_is_disklabel (struct fdisk_context *cxt,enum fdisk_labeltype l) +{ +return cxt && cxt->disklabel == l; }/**
Signature · 1 line
1.7.9.5
Quoted 11 lines · Davidlohr Bueso
fdisks/fdisk.c | 191 ++++++++++++++++++++++++------------------------ fdisks/fdisk.h | 34 +++++---- fdisks/fdiskaixlabel.c | 2 +- fdisks/fdiskbsdlabel.c | 2 +- fdisks/fdiskdoslabel.c | 2 +- fdisks/fdiskmaclabel.c | 2 +- fdisks/fdisksgilabel.c | 4 +- fdisks/fdisksunlabel.c | 8 +- fdisks/gpt.c | 14 ++-- fdisks/utils.c | 16 +++- 10 files changed, 146 insertions(+), 129 deletions(-)
Applied, thanks.
Signature · 2 lines
Karel Zak <[email protected]> http://karelzak.blogspot.com