libfdisk: (sun) move driver from fdisk to library

 ... and also add fdisk_info_new_partition()

Signed-off-by: Karel Zak <kzak@redhat.com>

7 files changed, 9 insertions, 1048 deletions

diff --git a/fdisks/Makemodule.am b/fdisks/Makemodule.am
index ebda3361d..7532d6d23 100644
--- a/fdisks/Makemodule.am
+++ b/fdisks/Makemodule.am
@@ -17,8 +17,6 @@ fdisk_SOURCES = \
 	fdisks/fdiskmaclabel.h \
 	fdisks/fdisksgilabel.c \
 	fdisks/fdisksgilabel.h \
-	fdisks/fdisksunlabel.c \
-	fdisks/fdisksunlabel.h \
 	fdisks/partname.c \
 	fdisks/common.h
 
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 0149d59f0..1964e4af8 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -35,7 +35,7 @@
 #include "strutils.h"
 #include "closestream.h"
 
-#include "fdisksunlabel.h"
+#include "pt-sun.h"		/* to toggle flags */
 #include "fdisksgilabel.h"
 #include "fdiskmaclabel.h"
 #include "fdiskdoslabel.h"
@@ -683,18 +683,6 @@ static void verify(struct fdisk_context *cxt)
 	fdisk_verify_disklabel(cxt);
 }
 
-void print_partition_size(struct fdisk_context *cxt,
-			  int num, sector_t start, sector_t stop, int sysid)
-{
-	char *str = size_to_human_string(SIZE_SUFFIX_3LETTER | SIZE_SUFFIX_SPACE,
-				     (uint64_t)(stop - start + 1) * cxt->sector_size);
-	struct fdisk_parttype *t = fdisk_get_parttype_from_code(cxt, sysid);
-
-	printf(_("Partition %d of type %s and of size %s is set\n"),
-			num, t ? t->name : _("Unknown"), str);
-	free(str);
-}
-
 static void new_partition(struct fdisk_context *cxt)
 {
 	assert(cxt);
diff --git a/fdisks/fdisk.h b/fdisks/fdisk.h
index 99ef3255e..45d86c94a 100644
--- a/fdisks/fdisk.h
+++ b/fdisks/fdisk.h
@@ -84,7 +84,6 @@ 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(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 char *partition_type(struct fdisk_context *cxt, unsigned char type);
 extern char read_chars(struct fdisk_context *cxt, char *mesg);
@@ -94,9 +93,6 @@ extern unsigned int read_int_with_suffix(struct fdisk_context *cxt,
 					 unsigned int low, unsigned int dflt, unsigned int high,
 				  unsigned int base, char *mesg, int *is_suffix_used);
 
-#define PLURAL	0
-#define SINGULAR 1
-
 extern sector_t get_nr_sects(struct partition *p);
 
 extern int nowarn;
diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index 5fd1da823..44dc40e12 100644
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -522,9 +522,10 @@ static void set_partition(struct fdisk_context *cxt,
 	set_start_sect(p, start - offset);
 	set_nr_sects(p, stop - start + 1);
 
-	if (!doext)
-		print_partition_size(cxt, i + 1, start, stop, sysid);
-
+	if (!doext) {
+		struct fdisk_parttype *t = fdisk_get_parttype_from_code(cxt, sysid);
+		fdisk_info_new_partition(cxt, i + 1, start, stop, t);
+	}
 	if (is_dos_compatible(cxt) && (start/(cxt->geom.sectors*cxt->geom.heads) > 1023))
 		start = cxt->geom.heads*cxt->geom.sectors*1024 - 1;
 	set_hsc(p->head, p->sector, p->cyl, start);
diff --git a/fdisks/fdisksgilabel.c b/fdisks/fdisksgilabel.c
index 796b4580f..15a25c503 100644
--- a/fdisks/fdisksgilabel.c
+++ b/fdisks/fdisksgilabel.c
@@ -629,8 +629,10 @@ static int sgi_set_partition(struct fdisk_context *cxt, size_t i,
 
 	if (sgi_gaps(cxt) < 0)	/* rebuild freelist */
 		printf(_("Partition overlap on the disk.\n"));
-	if (length)
-		print_partition_size(cxt, i + 1, start, start + length, sys);
+	if (length) {
+		struct fdisk_parttype *t = fdisk_get_parttype_from_code(cxt, sys);
+		fdisk_info_new_partition(cxt, i + 1, start, start + length, t);
+	}
 
 	return 0;
 }
diff --git a/fdisks/fdisksunlabel.c b/fdisks/fdisksunlabel.c
deleted file mode 100644
index 864a8b5a6..000000000
--- a/fdisks/fdisksunlabel.c
+++ /dev/null
@@ -1,1010 +0,0 @@
-/*
- * fdisksunlabel.c
- *
- * I think this is mostly, or entirely, due to
- * 	Jakub Jelinek (jj@sunsite.mff.cuni.cz), July 1996
- *
- * Merged with fdisk for other architectures, aeb, June 1998.
- *
- * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *      Internationalization
- */
-
-#include <stdio.h>		/* stderr */
-#include <stdlib.h>		/* qsort */
-#include <string.h>		/* strstr */
-#include <unistd.h>		/* write */
-#include <sys/ioctl.h>		/* ioctl */
-
-#include "nls.h"
-#include "blkdev.h"
-#include "bitops.h"
-
-#include "common.h"
-#include "fdisk.h"
-#include "fdiskdoslabel.h"
-#include "fdisksunlabel.h"
-
-/*
- * in-memory fdisk SUN stuff
- */
-struct fdisk_sun_label {
-	struct fdisk_label	head;		/* generic part */
-	struct sun_disklabel   *header;		/* on-disk data (pointer to cxt->firstsector) */
-};
-
-static struct fdisk_parttype sun_parttypes[] = {
-	{SUN_TAG_UNASSIGNED, N_("Unassigned")},
-	{SUN_TAG_BOOT, N_("Boot")},
-	{SUN_TAG_ROOT, N_("SunOS root")},
-	{SUN_TAG_SWAP, N_("SunOS swap")},
-	{SUN_TAG_USR, N_("SunOS usr")},
-	{SUN_TAG_WHOLEDISK, N_("Whole disk")},
-	{SUN_TAG_STAND, N_("SunOS stand")},
-	{SUN_TAG_VAR, N_("SunOS var")},
-	{SUN_TAG_HOME, N_("SunOS home")},
-	{SUN_TAG_ALTSCTR, N_("SunOS alt sectors")},
-	{SUN_TAG_CACHE, N_("SunOS cachefs")},
-	{SUN_TAG_RESERVED, N_("SunOS reserved")},
-	{SUN_TAG_LINUX_SWAP, N_("Linux swap")},
-	{SUN_TAG_LINUX_NATIVE, N_("Linux native")},
-	{SUN_TAG_LINUX_LVM, N_("Linux LVM")},
-	{SUN_TAG_LINUX_RAID, N_("Linux raid autodetect")},
-	{ 0, NULL }
-};
-
-/* return poiter buffer with on-disk data */
-static inline struct sun_disklabel *self_disklabel(struct fdisk_context *cxt)
-{
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	return ((struct fdisk_sun_label *) cxt->label)->header;
-}
-
-/* return in-memory sun fdisk data */
-static inline struct fdisk_sun_label *self_label(struct fdisk_context *cxt)
-{
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	return (struct fdisk_sun_label *) cxt->label;
-}
-
-static void set_sun_partition(struct fdisk_context *cxt, size_t i,
-		uint32_t start,uint32_t stop, uint16_t sysid)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-
-	sunlabel->vtoc.infos[i].id = cpu_to_be16(sysid);
-	sunlabel->vtoc.infos[i].flags = cpu_to_be16(0);
-	sunlabel->partitions[i].start_cylinder =
-		cpu_to_be32(start / (cxt->geom.heads * cxt->geom.sectors));
-	sunlabel->partitions[i].num_sectors = cpu_to_be32(stop - start);
-	fdisk_label_set_changed(cxt->label, 1);
-	print_partition_size(cxt, i + 1, start, stop, sysid);
-}
-
-static size_t count_used_partitions(struct fdisk_context *cxt)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	size_t ct = 0, i;
-
-	assert(sunlabel);
-
-	for (i = 0; i < cxt->label->nparts_max; i++) {
-		if (sunlabel->partitions[i].num_sectors)
-			ct++;
-	}
-	return ct;
-}
-
-static int sun_probe_label(struct fdisk_context *cxt)
-{
-	struct fdisk_sun_label *sun;
-	struct sun_disklabel *sunlabel;
-	unsigned short *ush;
-	int csum;
-	int need_fixing = 0;
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	/* map first sector to header */
-	sun = (struct fdisk_sun_label *) cxt->label;
-	sun->header = (struct sun_disklabel *) cxt->firstsector;
-	sunlabel = sun->header;
-
-	if (be16_to_cpu(sunlabel->magic) != SUN_LABEL_MAGIC) {
-		sun->header = NULL;
-		return 0;		/* failed */
-	}
-
-	ush = ((unsigned short *) (sunlabel + 1)) - 1;
-	for (csum = 0; ush >= (unsigned short *)sunlabel;)
-		csum ^= *ush--;
-
-	if (csum) {
-		fdisk_warnx(cxt, _("Detected sun disklabel with wrong checksum.\n"
-			      "Probably you'll have to set all the values,\n"
-			      "e.g. heads, sectors, cylinders and partitions\n"
-			      "or force a fresh label (s command in main menu)"));
-		return 1;
-	}
-
-	/* map first sector buffer to sun header */
-	sun = (struct fdisk_sun_label *) cxt->label;
-	sun->header = (struct sun_disklabel *) cxt->firstsector;
-
-	cxt->label->nparts_max = SUN_MAXPARTITIONS;
-	cxt->geom.heads = be16_to_cpu(sunlabel->nhead);
-	cxt->geom.cylinders = be16_to_cpu(sunlabel->ncyl);
-	cxt->geom.sectors = be16_to_cpu(sunlabel->nsect);
-
-	if (be32_to_cpu(sunlabel->vtoc.version) != SUN_VTOC_VERSION) {
-		fdisk_warnx(cxt, _("Detected sun disklabel with wrong version [%d]."),
-			be32_to_cpu(sunlabel->vtoc.version));
-		need_fixing = 1;
-	}
-	if (be32_to_cpu(sunlabel->vtoc.sanity) != SUN_VTOC_SANITY) {
-		fdisk_warnx(cxt, _("Detected sun disklabel with wrong vtoc.sanity [0x%08x]."),
-			be32_to_cpu(sunlabel->vtoc.sanity));
-		need_fixing = 1;
-	}
-	if (be16_to_cpu(sunlabel->vtoc.nparts) != SUN_MAXPARTITIONS) {
-		fdisk_warnx(cxt, _("Detected sun disklabel with wrong vtoc.nparts [%u]."),
-			be16_to_cpu(sunlabel->vtoc.nparts));
-		need_fixing = 1;
-	}
-	if (need_fixing) {
-		fdisk_warnx(cxt, _("Warning: Wrong values need to be fixed up and "
-			           "will be corrected by w(rite)"));
-
-		sunlabel->vtoc.version = cpu_to_be32(SUN_VTOC_VERSION);
-		sunlabel->vtoc.sanity = cpu_to_be32(SUN_VTOC_SANITY);
-		sunlabel->vtoc.nparts = cpu_to_be16(SUN_MAXPARTITIONS);
-
-		ush = (unsigned short *)sunlabel;
-		csum = 0;
-		while(ush < (unsigned short *)(&sunlabel->csum))
-			csum ^= *ush++;
-		sunlabel->csum = csum;
-
-		fdisk_label_set_changed(cxt->label, 1);
-	}
-
-	cxt->label->nparts_cur = count_used_partitions(cxt);
-
-	return 1;
-}
-
-static void ask_geom(struct fdisk_context *cxt)
-{
-	uintmax_t res;
-
-	assert(cxt);
-
-	if (fdisk_ask_number(cxt, 1, 1, 1024, _("Heads"), &res) == 0)
-		cxt->geom.heads = res;
-	if (fdisk_ask_number(cxt, 1, 1, 1024, _("Sectors/track"), &res) == 0)
-		cxt->geom.sectors = res;
-	if (fdisk_ask_number(cxt, 1, 1, USHRT_MAX, _("Cylinders"), &res) == 0)
-		cxt->geom.cylinders = res;
-}
-
-static int sun_create_disklabel(struct fdisk_context *cxt)
-{
-	struct hd_geometry geometry;
-	sector_t llsectors, llcyls;
-	unsigned int ndiv, sec_fac;
-	int res;
-
-	struct fdisk_sun_label *sun;		/* libfdisk sun handler */
-	struct sun_disklabel *sunlabel;	/* on disk data */
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	fdisk_info(cxt, _("Building a new Sun disklabel."));
-
-	/* map first sector to header */
-	fdisk_zeroize_firstsector(cxt);
-	sun = (struct fdisk_sun_label *) cxt->label;
-	sun->header = (struct sun_disklabel *) cxt->firstsector;
-
-	sunlabel = sun->header;
-
-	cxt->label->nparts_max = SUN_MAXPARTITIONS;
-	fdisk_zeroize_firstsector(cxt);
-
-	sunlabel->magic = cpu_to_be16(SUN_LABEL_MAGIC);
-	sunlabel->vtoc.version = cpu_to_be32(SUN_VTOC_VERSION);
-	sunlabel->vtoc.sanity = cpu_to_be32(SUN_VTOC_SANITY);
-	sunlabel->vtoc.nparts = cpu_to_be16(SUN_MAXPARTITIONS);
-
-	res = blkdev_get_sectors(cxt->dev_fd, &llsectors);
-	sec_fac = cxt->sector_size / 512;
-
-#ifdef HDIO_GETGEO
-	if (!ioctl(cxt->dev_fd, HDIO_GETGEO, &geometry)) {
-	        cxt->geom.heads = geometry.heads;
-	        cxt->geom.sectors = geometry.sectors;
-		if (res == 0) {
-			llcyls = llsectors / (cxt->geom.heads * cxt->geom.sectors * sec_fac);
-			cxt->geom.cylinders = llcyls;
-			if (cxt->geom.cylinders != llcyls)
-				cxt->geom.cylinders = ~0;
-		} else {
-			cxt->geom.cylinders = geometry.cylinders;
-			fdisk_warnx(cxt,
-				_("Warning:  BLKGETSIZE ioctl failed on %s.  "
-				  "Using geometry cylinder value of %llu.\n"
-				  "This value may be truncated for devices"
-				  " > 33.8 GB."),
-				cxt->dev_path, cxt->geom.cylinders);
-		}
-	} else
-#endif
-		ask_geom(cxt);
-
-	sunlabel->acyl   = cpu_to_be16(2);
-	sunlabel->pcyl   = cpu_to_be16(cxt->geom.cylinders);
-	sunlabel->ncyl   = cpu_to_be16(cxt->geom.cylinders - 2);
-	sunlabel->rpm    = cpu_to_be16(5400);
-	sunlabel->intrlv = cpu_to_be16(1);
-	sunlabel->apc    = cpu_to_be16(0);
-
-	sunlabel->nhead  = cpu_to_be16(cxt->geom.heads);
-	sunlabel->nsect  = cpu_to_be16(cxt->geom.sectors);
-	sunlabel->ncyl   = cpu_to_be16(cxt->geom.cylinders);
-
-	snprintf((char *) sunlabel->label_id, sizeof(sunlabel->label_id),
-		 "Linux cyl %llu alt %u hd %u sec %llu",
-		 cxt->geom.cylinders, be16_to_cpu(sunlabel->acyl),
-		 cxt->geom.heads, cxt->geom.sectors);
-
-	if (cxt->geom.cylinders * cxt->geom.heads * cxt->geom.sectors >= 150 * 2048) {
-	        ndiv = cxt->geom.cylinders - (50 * 2048 / (cxt->geom.heads * cxt->geom.sectors)); /* 50M swap */
-	} else
-	        ndiv = cxt->geom.cylinders * 2 / 3;
-
-	set_sun_partition(cxt, 0, 0, ndiv * cxt->geom.heads * cxt->geom.sectors,
-			  SUN_TAG_LINUX_NATIVE);
-	set_sun_partition(cxt, 1, ndiv * cxt->geom.heads * cxt->geom.sectors,
-			  cxt->geom.cylinders * cxt->geom.heads * cxt->geom.sectors,
-			  SUN_TAG_LINUX_SWAP);
-	sunlabel->vtoc.infos[1].flags |= cpu_to_be16(SUN_FLAG_UNMNT);
-
-	set_sun_partition(cxt, 2, 0,
-			  cxt->geom.cylinders * cxt->geom.heads * cxt->geom.sectors,
-			  SUN_TAG_WHOLEDISK);
-
-	{
-		unsigned short *ush = (unsigned short *)sunlabel;
-		unsigned short csum = 0;
-		while(ush < (unsigned short *)(&sunlabel->csum))
-			csum ^= *ush++;
-		sunlabel->csum = csum;
-	}
-
-	fdisk_label_set_changed(cxt->label, 1);
-	cxt->label->nparts_cur = count_used_partitions(cxt);
-
-	return 0;
-}
-
-static int sun_toggle_partition_flag(struct fdisk_context *cxt, size_t i, unsigned long flag)
-{
-	struct sun_disklabel *sunlabel;
-	struct sun_info *p;
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	if (i >= cxt->label->nparts_max)
-		return -EINVAL;
-
-	sunlabel = self_disklabel(cxt);
-	p = &sunlabel->vtoc.infos[i];
-
-	switch (flag) {
-	case SUN_FLAG_UNMNT:
-		p->flags ^= cpu_to_be16(SUN_FLAG_UNMNT);
-		fdisk_label_set_changed(cxt->label, 1);
-		break;
-	case SUN_FLAG_RONLY:
-		p->flags ^= cpu_to_be16(SUN_FLAG_RONLY);
-		fdisk_label_set_changed(cxt->label, 1);
-		break;
-	default:
-		return 1;
-	}
-
-	return 0;
-}
-
-static void fetch_sun(struct fdisk_context *cxt,
-		      uint32_t *starts,
-		      uint32_t *lens,
-		      uint32_t *start,
-		      uint32_t *stop)
-{
-	struct sun_disklabel *sunlabel;
-	int continuous = 1;
-	size_t i;
-
-	assert(cxt);
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	sunlabel = self_disklabel(cxt);
-
-	*start = 0;
-	*stop = cxt->geom.cylinders * cxt->geom.heads * cxt->geom.sectors;
-
-	for (i = 0; i < cxt->label->nparts_max; i++) {
-		struct sun_partition *part = &sunlabel->partitions[i];
-		struct sun_info *info = &sunlabel->vtoc.infos[i];
-
-		if (part->num_sectors &&
-		    be16_to_cpu(info->id) != SUN_TAG_UNASSIGNED &&
-		    be16_to_cpu(info->id) != SUN_TAG_WHOLEDISK) {
-			starts[i] = be32_to_cpu(part->start_cylinder) *
-				     cxt->geom.heads * cxt->geom.sectors;
-			lens[i] = be32_to_cpu(part->num_sectors);
-			if (continuous) {
-				if (starts[i] == *start)
-					*start += lens[i];
-				else if (starts[i] + lens[i] >= *stop)
-					*stop = starts[i];
-				else
-					continuous = 0;
-				        /* There will be probably more gaps
-					  than one, so lets check afterwards */
-			}
-		} else {
-			starts[i] = 0;
-			lens[i] = 0;
-		}
-	}
-}
-
-static int verify_sun_cmp(int *a, int *b, void *data)
-{
-    unsigned int *verify_sun_starts = (unsigned int *) data;
-
-    if (*a == -1)
-	    return 1;
-    if (*b == -1)
-	    return -1;
-    if (verify_sun_starts[*a] > verify_sun_starts[*b])
-	    return 1;
-    return -1;
-}
-
-static int sun_verify_disklabel(struct fdisk_context *cxt)
-{
-    uint32_t starts[SUN_MAXPARTITIONS], lens[SUN_MAXPARTITIONS], start, stop;
-    uint32_t i,j,k,starto,endo;
-    int array[SUN_MAXPARTITIONS];
-    unsigned int *verify_sun_starts;
-
-    assert(cxt);
-    assert(cxt->label);
-    assert(fdisk_is_disklabel(cxt, SUN));
-
-    verify_sun_starts = starts;
-
-    fetch_sun(cxt, starts, lens, &start, &stop);
-
-    for (k = 0; k < 7; k++) {
-	for (i = 0; i < SUN_MAXPARTITIONS; i++) {
-	    if (k && (lens[i] % (cxt->geom.heads * cxt->geom.sectors))) {
-	        fdisk_warnx(cxt, _("Partition %d doesn't end on cylinder boundary"), i+1);
-	    }
-	    if (lens[i]) {
-	        for (j = 0; j < i; j++)
-	            if (lens[j]) {
-	                if (starts[j] == starts[i]+lens[i]) {
-	                    starts[j] = starts[i]; lens[j] += lens[i];
-	                    lens[i] = 0;
-	                } else if (starts[i] == starts[j]+lens[j]){
-	                    lens[j] += lens[i];
-	                    lens[i] = 0;
-	                } else if (!k) {
-	                    if (starts[i] < starts[j]+lens[j] &&
-				starts[j] < starts[i]+lens[i]) {
-	                        starto = starts[i];
-	                        if (starts[j] > starto)
-					starto = starts[j];
-	                        endo = starts[i]+lens[i];
-	                        if (starts[j]+lens[j] < endo)
-					endo = starts[j]+lens[j];
-	                        fdisk_warnx(cxt, _("Partition %d overlaps with others in "
-				       "sectors %d-%d"), i+1, starto, endo);
-	                    }
-	                }
-	            }
-	    }
-	}
-    }
-
-    for (i = 0; i < SUN_MAXPARTITIONS; i++) {
-        if (lens[i])
-            array[i] = i;
-        else
-            array[i] = -1;
-    }
-    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
-	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
-	  verify_sun_starts);
-
-    if (array[0] == -1) {
-	fdisk_info(cxt, _("No partitions defined"));
-	return 0;
-    }
-    stop = cxt->geom.cylinders * cxt->geom.heads * cxt->geom.sectors;
-    if (starts[array[0]])
-        fdisk_warnx(cxt, _("Unused gap - sectors 0-%d"), starts[array[0]]);
-    for (i = 0; i < 7 && array[i+1] != -1; i++) {
-        fdisk_warnx(cxt, _("Unused gap - sectors %d-%d"),
-	       (starts[array[i]] + lens[array[i]]),
-	       starts[array[i+1]]);
-    }
-    start = (starts[array[i]] + lens[array[i]]);
-    if (start < stop)
-        fdisk_warnx(cxt, _("Unused gap - sectors %d-%d"), start, stop);
-    return 0;
-}
-
-static int sun_add_partition(
-		struct fdisk_context *cxt,
-		size_t n,
-		struct fdisk_parttype *t)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	uint32_t starts[SUN_MAXPARTITIONS], lens[SUN_MAXPARTITIONS];
-	struct sun_partition *part = &sunlabel->partitions[n];
-	struct sun_info *info = &sunlabel->vtoc.infos[n];
-	uint32_t start, stop, stop2;
-	int whole_disk = 0, sys = t ? t->type : SUN_TAG_LINUX_NATIVE;
-	struct fdisk_ask *ask;
-	int rc;
-
-	char mesg[256];
-	size_t i;
-	unsigned int first, last;
-
-	if (part->num_sectors && be16_to_cpu(info->id) != SUN_TAG_UNASSIGNED) {
-		fdisk_info(cxt, _("Partition %zd is already defined.  Delete "
-			"it before re-adding it."), n + 1);
-		return -EINVAL;
-	}
-
-	fetch_sun(cxt, starts, lens, &start, &stop);
-
-	if (stop <= start) {
-		if (n == 2)
-			whole_disk = 1;
-		else {
-			fdisk_info(cxt, _("Other partitions already cover the "
-				"whole disk. Delete some/shrink them before retry."));
-			return -EINVAL;
-		}
-	}
-	snprintf(mesg, sizeof(mesg), _("First %s"),
-			fdisk_context_get_unit(cxt, SINGULAR));
-	for (;;) {
-		ask = fdisk_new_ask();
-		if (!ask)
-			return -ENOMEM;
-
-		fdisk_ask_set_query(ask, mesg);
-		fdisk_ask_set_type(ask, FDISK_ASKTYPE_NUMBER);
-
-		if (whole_disk) {
-			fdisk_ask_number_set_low(ask,     0);	/* minimal */
-			fdisk_ask_number_set_default(ask, 0);	/* default */
-			fdisk_ask_number_set_high(ask,    0);	/* maximal */
-		} else {
-			fdisk_ask_number_set_low(ask,     fdisk_scround(cxt, start));	/* minimal */
-			fdisk_ask_number_set_default(ask, fdisk_scround(cxt, start));	/* default */
-			fdisk_ask_number_set_high(ask,    fdisk_scround(cxt, stop));	/* maximal */
-		}
-		rc = fdisk_do_ask(cxt, ask);
-		first = fdisk_ask_number_get_result(ask);
-		fdisk_free_ask(ask);
-
-		if (rc)
-			return rc;
-
-		if (fdisk_context_use_cylinders(cxt))
-			first *= fdisk_context_get_units_per_sector(cxt);
-		else {
-			/* Starting sector has to be properly aligned */
-			int cs = cxt->geom.heads * cxt->geom.sectors;
-			int x = first % cs;
-
-			if (x)
-				first += cs - x;
-		}
-		if (n == 2 && first != 0)
-			fdisk_warnx(cxt, _("\
-It is highly recommended that the third partition covers the whole disk\n\
-and is of type `Whole disk'"));
-		/* ewt asks to add: "don't start a partition at cyl 0"
-		   However, edmundo@rano.demon.co.uk writes:
-		   "In addition to having a Sun partition table, to be able to
-		   boot from the disc, the first partition, /dev/sdX1, must
-		   start at cylinder 0. This means that /dev/sdX1 contains
-		   the partition table and the boot block, as these are the
-		   first two sectors of the disc. Therefore you must be
-		   careful what you use /dev/sdX1 for. In particular, you must
-		   not use a partition starting at cylinder 0 for Linux swap,
-		   as that would overwrite the partition table and the boot
-		   block. You may, however, use such a partition for a UFS
-		   or EXT2 file system, as these file systems leave the first
-		   1024 bytes undisturbed. */
-		/* On the other hand, one should not use partitions
-		   starting at block 0 in an md, or the label will
-		   be trashed. */
-		for (i = 0; i < cxt->label->nparts_max; i++)
-			if (lens[i] && starts[i] <= first
-			            && starts[i] + lens[i] > first)
-				break;
-		if (i < cxt->label->nparts_max && !whole_disk) {
-			if (n == 2 && !first) {
-			    whole_disk = 1;
-			    break;
-			}
-			fdisk_warnx(cxt, _("Sector %d is already allocated"), first);
-		} else
-			break;
-	}
-	stop = cxt->geom.cylinders * cxt->geom.heads * cxt->geom.sectors;	/* ancient */
-	stop2 = stop;
-	for (i = 0; i < cxt->label->nparts_max; i++) {
-		if (starts[i] > first && starts[i] < stop)
-			stop = starts[i];
-	}
-	snprintf(mesg, sizeof(mesg),
-		 _("Last %s or +%s or +size{K,M,G,T,P}"),
-		 fdisk_context_get_unit(cxt, SINGULAR),
-		 fdisk_context_get_unit(cxt, PLURAL));
-
-	ask = fdisk_new_ask();
-	if (!ask)
-		return -ENOMEM;
-
-	fdisk_ask_set_query(ask, mesg);
-	fdisk_ask_set_type(ask, FDISK_ASKTYPE_OFFSET);
-
-	if (whole_disk) {
-		fdisk_ask_number_set_low(ask,     fdisk_scround(cxt, stop2));	/* minimal */
-		fdisk_ask_number_set_default(ask, fdisk_scround(cxt, stop2));	/* default */
-		fdisk_ask_number_set_high(ask,    fdisk_scround(cxt, stop2));	/* maximal */
-		fdisk_ask_number_set_base(ask,    0);
-	} else if (n == 2 && !first) {
-		fdisk_ask_number_set_low(ask,     fdisk_scround(cxt, first));	/* minimal */
-		fdisk_ask_number_set_default(ask, fdisk_scround(cxt, stop2));	/* default */
-		fdisk_ask_number_set_high(ask,    fdisk_scround(cxt, stop2));	/* maximal */
-		fdisk_ask_number_set_base(ask,	  fdisk_scround(cxt, first));
-	} else {
-		fdisk_ask_number_set_low(ask,     fdisk_scround(cxt, first));	/* minimal */
-		fdisk_ask_number_set_default(ask, fdisk_scround(cxt, stop));	/* default */
-		fdisk_ask_number_set_high(ask,    fdisk_scround(cxt, stop));	/* maximal */
-		fdisk_ask_number_set_base(ask,    fdisk_scround(cxt, first));
-	}
-
-	if (fdisk_context_use_cylinders(cxt))
-		fdisk_ask_number_set_unit(ask,
-			     cxt->sector_size *
-			     fdisk_context_get_units_per_sector(cxt));
-	else
-		fdisk_ask_number_set_unit(ask,	cxt->sector_size);
-
-	rc = fdisk_do_ask(cxt, ask);
-	last = fdisk_ask_number_get_result(ask);
-
-	fdisk_free_ask(ask);
-	if (rc)
-		return rc;
-
-	if (n == 2 && !first) {
-		if (last >= stop2) {
-		    whole_disk = 1;
-		    last = stop2;
-		} else if (last > stop) {
-		    fdisk_warnx(cxt,
-   _("You haven't covered the whole disk with the 3rd partition, but your value\n"
-     "%d %s covers some other partition. Your entry has been changed\n"
-     "to %d %s"),
-			fdisk_scround(cxt, last), fdisk_context_get_unit(cxt, SINGULAR),
-			fdisk_scround(cxt, stop), fdisk_context_get_unit(cxt, SINGULAR));
-		    last = stop;
-		}
-	} else if (!whole_disk && last > stop)
-		last = stop;
-
-	if (whole_disk)
-		sys = SUN_TAG_WHOLEDISK;
-
-	set_sun_partition(cxt, n, first, last, sys);
-	cxt->label->nparts_cur = count_used_partitions(cxt);
-	return 0;
-}
-
-static int sun_delete_partition(struct fdisk_context *cxt,
-		size_t partnum)
-{
-	struct sun_disklabel *sunlabel;
-	struct sun_partition *part;
-	struct sun_info *info;
-	unsigned int nsec;
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	sunlabel = self_disklabel(cxt);
-	part = &sunlabel->partitions[partnum];
-	info = &sunlabel->vtoc.infos[partnum];
-
-	if (partnum == 2 &&
-	    be16_to_cpu(info->id) == SUN_TAG_WHOLEDISK &&
-	    !part->start_cylinder &&
-	    (nsec = be32_to_cpu(part->num_sectors))
-	    == cxt->geom.heads * cxt->geom.sectors * cxt->geom.cylinders)
-		fdisk_info(cxt, _("If you want to maintain SunOS/Solaris compatibility, "
-			 "consider leaving this "
-			 "partition as Whole disk (5), starting at 0, with %u "
-			 "sectors"), nsec);
-	info->id = cpu_to_be16(SUN_TAG_UNASSIGNED);
-	part->num_sectors = 0;
-	cxt->label->nparts_cur = count_used_partitions(cxt);
-	fdisk_label_set_changed(cxt->label, 1);
-	return 0;
-}
-
-
-static int sun_list_disklabel(struct fdisk_context *cxt)
-{
-	struct sun_disklabel *sunlabel;
-	struct tt *tb = NULL;
-	size_t i;
-	int rc;
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	sunlabel = self_disklabel(cxt);
-
-	if (fdisk_context_display_details(cxt))
-		fdisk_info(cxt,
-		_("Label geometry: %d rpm, %d alternate and %d physical cylinders,\n"
-		  "                %d extra sects/cyl, interleave %d:1\n"
-		  "Label ID: %s\n"
-		  "Volume ID: %s"),
-		       be16_to_cpu(sunlabel->rpm),
-		       be16_to_cpu(sunlabel->acyl),
-		       be16_to_cpu(sunlabel->pcyl),
-		       be16_to_cpu(sunlabel->apc),
-		       be16_to_cpu(sunlabel->intrlv),
-		       sunlabel->label_id,
-		       *sunlabel->vtoc.volume_id ? sunlabel->vtoc.volume_id : _("<none>"));
-
-	tb = tt_new_table(TT_FL_FREEDATA);
-	if (!tb)
-		return -ENOMEM;
-
-	tt_define_column(tb, _("Device"), 0.2, 0);
-	tt_define_column(tb, _("Flag"),     2, TT_FL_RIGHT);
-	tt_define_column(tb, _("Start"),    9, TT_FL_RIGHT);
-	tt_define_column(tb, _("End"),      9, TT_FL_RIGHT);
-	/* TRANSLATORS: keep one blank space behind 'Blocks' */
-	tt_define_column(tb, _("Blocks "),  9, TT_FL_RIGHT);
-	tt_define_column(tb, _("Id"),       2, TT_FL_RIGHT);
-	tt_define_column(tb, _("System"), 0.2, TT_FL_TRUNC);
-
-	for (i = 0 ; i < cxt->label->nparts_max; i++) {
-		struct sun_partition *part = &sunlabel->partitions[i];
-		uint16_t flags = be16_to_cpu(sunlabel->vtoc.infos[i].flags);
-		uint32_t start, len;
-		struct fdisk_parttype *t;
-		struct tt_line *ln;
-		char *p;
-
-		if (!part->num_sectors)
-			continue;
-		ln = tt_add_line(tb, NULL);
-		if (!ln)
-			continue;
-
-		start = be32_to_cpu(part->start_cylinder)
-				* cxt->geom.heads
-				* cxt->geom.sectors;
-
-		len = be32_to_cpu(part->num_sectors);
-		t = fdisk_get_partition_type(cxt, i);
-
-		p = fdisk_partname(cxt->dev_path, i + 1);
-		if (p)
-			tt_line_set_data(ln, 0, p);	/* devname */
-		if ((flags & SUN_FLAG_UNMNT || flags & SUN_FLAG_RONLY)
-		    && asprintf(&p, "%c%c",
-				flags & SUN_FLAG_UNMNT ? 'u' : ' ',
-				flags & SUN_FLAG_RONLY ? 'r' : ' ') > 0)
-			tt_line_set_data(ln, 1, p);	/* flags */
-		if (asprintf(&p, "%ju", (uintmax_t) fdisk_scround(cxt, start)) > 0)
-			tt_line_set_data(ln, 2, p);	/* start */
-		if (asprintf(&p, "%ju",	(uintmax_t) fdisk_scround(cxt, start + len)) > 0)
-			tt_line_set_data(ln, 3, p);	/* end */
-		if (asprintf(&p, "%lu%c",
-				(unsigned long) len / 2,
-				len & 1 ? '+' : ' ') > 0)
-			tt_line_set_data(ln, 4, p);	/* blocks + flag */
-		if (asprintf(&p, "%2x", t->type) > 0)
-			tt_line_set_data(ln, 5, p);	/* type ID */
-		if (t->name)
-			tt_line_set_data(ln, 6, strdup(t->name)); /* type Name */
-
-		fdisk_free_parttype(t);
-	}
-
-	rc = fdisk_print_table(cxt, tb);
-	tt_free_table(tb);
-
-	return rc;
-}
-
-
-void fdisk_sun_set_alt_cyl(struct fdisk_context *cxt)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	uintmax_t res;
-	int rc = fdisk_ask_number(cxt, 0,			/* low */
-			be16_to_cpu(sunlabel->acyl),		/* default */
-			65535,					/* high */
-			_("Number of alternate cylinders"),	/* query */
-			&res);					/* result */
-	if (!rc)
-		sunlabel->acyl = cpu_to_be16(res);
-}
-
-void fdisk_sun_set_ncyl(struct fdisk_context *cxt, int cyl)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	sunlabel->ncyl = cpu_to_be16(cyl);
-}
-
-void fdisk_sun_set_xcyl(struct fdisk_context *cxt)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	uintmax_t res;
-	int rc = fdisk_ask_number(cxt, 0,			/* low */
-			be16_to_cpu(sunlabel->apc),		/* default */
-			cxt->geom.sectors,			/* high */
-			_("Extra sectors per cylinder"),	/* query */
-			&res);					/* result */
-	if (!rc)
-		sunlabel->apc = cpu_to_be16(res);
-}
-
-void fdisk_sun_set_ilfact(struct fdisk_context *cxt)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	uintmax_t res;
-	int rc = fdisk_ask_number(cxt, 1,			/* low */
-			be16_to_cpu(sunlabel->intrlv),		/* default */
-			32,					/* high */
-			_("Interleave factor"),	/* query */
-			&res);					/* result */
-	if (!rc)
-		sunlabel->intrlv = cpu_to_be16(res);
-}
-
-void fdisk_sun_set_rspeed(struct fdisk_context *cxt)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	uintmax_t res;
-	int rc = fdisk_ask_number(cxt, 1,			/* low */
-			be16_to_cpu(sunlabel->rpm),		/* default */
-			USHRT_MAX,				/* high */
-			_("Rotation speed (rpm)"),		/* query */
-			&res);					/* result */
-	if (!rc)
-		sunlabel->rpm = cpu_to_be16(res);
-
-}
-
-void fdisk_sun_set_pcylcount(struct fdisk_context *cxt)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	uintmax_t res;
-	int rc = fdisk_ask_number(cxt, 0,			/* low */
-			be16_to_cpu(sunlabel->pcyl),		/* default */
-			USHRT_MAX,				/* high */
-			_("Number of physical cylinders"),	/* query */
-			&res);					/* result */
-	if (!rc)
-		sunlabel->pcyl = cpu_to_be16(res);
-}
-
-static int sun_write_disklabel(struct fdisk_context *cxt)
-{
-	struct sun_disklabel *sunlabel;
-	unsigned short *ush;
-	unsigned short csum = 0;
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	sunlabel = self_disklabel(cxt);
-	ush = (unsigned short *) sunlabel;
-
-	while(ush < (unsigned short *)(&sunlabel->csum))
-		csum ^= *ush++;
-	sunlabel->csum = csum;
-	if (lseek(cxt->dev_fd, 0, SEEK_SET) < 0)
-		return -errno;
-	if (write(cxt->dev_fd, sunlabel, SECTOR_SIZE) != SECTOR_SIZE)
-		return -errno;
-
-	return 0;
-}
-
-static struct fdisk_parttype *sun_get_parttype(
-		struct fdisk_context *cxt,
-		size_t n)
-{
-	struct sun_disklabel *sunlabel = self_disklabel(cxt);
-	struct fdisk_parttype *t;
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	if (n >= cxt->label->nparts_max)
-		return NULL;
-
-	t = fdisk_get_parttype_from_code(cxt, be16_to_cpu(sunlabel->vtoc.infos[n].id));
-	if (!t)
-		t = fdisk_new_unknown_parttype(be16_to_cpu(sunlabel->vtoc.infos[n].id), NULL);
-	return t;
-}
-
-static int sun_set_parttype(
-		struct fdisk_context *cxt,
-		size_t i,
-		struct fdisk_parttype *t)
-{
-	struct sun_disklabel *sunlabel;
-	struct sun_partition *part;
-	struct sun_info *info;
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	sunlabel = self_disklabel(cxt);
-
-	if (i >= cxt->label->nparts_max || !t || t->type > UINT16_MAX)
-		return -EINVAL;
-
-	if (i == 2 && t->type != SUN_TAG_WHOLEDISK)
-		fdisk_info(cxt, _("Consider leaving partition 3 as Whole disk (5),\n"
-		         "as SunOS/Solaris expects it and even Linux likes it.\n"));
-
-	part = &sunlabel->partitions[i];
-	info = &sunlabel->vtoc.infos[i];
-
-	if (t->type == SUN_TAG_LINUX_SWAP && !part->start_cylinder) {
-	    int yes, rc;
-	    rc = fdisk_ask_yesno(cxt,
-	      _("It is highly recommended that the partition at offset 0\n"
-	      "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
-	      "there may destroy your partition table and bootblock.\n"
-	      "Are you sure you want to tag the partition as Linux swap?"), &yes);
-	    if (rc)
-		    return rc;
-	    if (!yes)
-		    return 1;
-	}
-
-	switch (t->type) {
-	case SUN_TAG_SWAP:
-	case SUN_TAG_LINUX_SWAP:
-		/* swaps are not mountable by default */
-		info->flags |= cpu_to_be16(SUN_FLAG_UNMNT);
-		break;
-	default:
-		/* assume other types are mountable;
-		   user can change it anyway */
-		info->flags &= ~cpu_to_be16(SUN_FLAG_UNMNT);
-		break;
-	}
-	info->id = cpu_to_be16(t->type);
-	return 0;
-}
-
-
-static int sun_reset_alignment(struct fdisk_context *cxt __attribute__((__unused__)))
-{
-	return 0;
-}
-
-
-static int sun_get_partition_status(
-		struct fdisk_context *cxt,
-		size_t i,
-		int *status)
-{
-	struct sun_disklabel *sunlabel;
-
-	assert(cxt);
-	assert(cxt->label);
-	assert(fdisk_is_disklabel(cxt, SUN));
-
-	if (!status || i >= cxt->label->nparts_max)
-		return -EINVAL;
-
-	sunlabel = self_disklabel(cxt);
-	*status = FDISK_PARTSTAT_NONE;
-
-	if (sunlabel->partitions[i].num_sectors)
-		*status = FDISK_PARTSTAT_USED;
-
-	return 0;
-}
-
-
-const struct fdisk_label_operations sun_operations =
-{
-	.probe		= sun_probe_label,
-	.write		= sun_write_disklabel,
-	.verify		= sun_verify_disklabel,
-	.create		= sun_create_disklabel,
-	.list		= sun_list_disklabel,
-	.part_add	= sun_add_partition,
-	.part_delete	= sun_delete_partition,
-	.part_get_type	= sun_get_parttype,
-	.part_set_type	= sun_set_parttype,
-
-	.part_get_status = sun_get_partition_status,
-	.part_toggle_flag = sun_toggle_partition_flag,
-
-	.reset_alignment = sun_reset_alignment,
-};
-
-/*
- * allocates SUN label driver
- */
-struct fdisk_label *fdisk_new_sun_label(struct fdisk_context *cxt)
-{
-	struct fdisk_label *lb;
-	struct fdisk_sun_label *sun;
-
-	assert(cxt);
-
-	sun = calloc(1, sizeof(*sun));
-	if (!sun)
-		return NULL;
-
-	/* initialize generic part of the driver */
-	lb = (struct fdisk_label *) sun;
-	lb->name = "sun";
-	lb->id = FDISK_DISKLABEL_SUN;
-	lb->op = &sun_operations;
-	lb->parttypes = sun_parttypes;
-	lb->nparttypes = ARRAY_SIZE(sun_parttypes);
-
-	return lb;
-}
diff --git a/fdisks/fdisksunlabel.h b/fdisks/fdisksunlabel.h
deleted file mode 100644
index f973725d3..000000000
--- a/fdisks/fdisksunlabel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef FDISK_SUN_LABEL_H
-#define FDISK_SUN_LABEL_H
-
-#include "pt-sun.h"
-
-/* public SUN specific functions (TODO: move to libfdisk.h) */
-extern void fdisk_sun_set_alt_cyl(struct fdisk_context *cxt);
-extern void fdisk_sun_set_ncyl(struct fdisk_context *cxt, int cyl);
-extern void fdisk_sun_set_xcyl(struct fdisk_context *cxt);
-extern void fdisk_sun_set_ilfact(struct fdisk_context *cxt);
-extern void fdisk_sun_set_rspeed(struct fdisk_context *cxt);
-extern void fdisk_sun_set_pcylcount(struct fdisk_context *cxt);
-
-#endif /* FDISK_SUN_LABEL_H */