summaryrefslogtreecommitdiff
path: root/fdisks
diff options
context:
space:
mode:
Diffstat (limited to 'fdisks')
-rw-r--r--fdisks/fdisk.c19
-rw-r--r--fdisks/fdiskdoslabel.c50
-rw-r--r--fdisks/fdiskdoslabel.h3
-rw-r--r--fdisks/fdisksgilabel.c37
-rw-r--r--fdisks/fdisksgilabel.h4
-rw-r--r--fdisks/fdisksunlabel.c32
6 files changed, 105 insertions, 40 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 3c569d83..179b905b 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -1072,15 +1072,17 @@ static void command_prompt(struct fdisk_context *cxt)
switch (c) {
case 'a':
if (fdisk_is_disklabel(cxt, DOS))
- dos_toggle_active(cxt,
- get_partition(cxt, 1, cxt->label->nparts_max));
+ fdisk_partition_toggle_flag(cxt,
+ get_partition(cxt, 1, cxt->label->nparts_max),
+ DOS_FLAG_ACTIVE);
else if (fdisk_is_disklabel(cxt, SUN))
- toggle_sunflags(cxt,
+ fdisk_partition_toggle_flag(cxt,
get_partition(cxt, 1, cxt->label->nparts_max),
SUN_FLAG_UNMNT);
else if (fdisk_is_disklabel(cxt, SGI))
- sgi_set_bootpartition(cxt,
- get_partition(cxt, 1, cxt->label->nparts_max));
+ fdisk_partition_toggle_flag(cxt,
+ get_partition(cxt, 1, cxt->label->nparts_max),
+ SGI_FLAG_BOOT);
else
unknown_command(c);
break;
@@ -1101,12 +1103,13 @@ static void command_prompt(struct fdisk_context *cxt)
if (fdisk_is_disklabel(cxt, DOS))
toggle_dos_compatibility_flag(cxt);
else if (fdisk_is_disklabel(cxt, SUN))
- toggle_sunflags(cxt,
+ fdisk_partition_toggle_flag(cxt,
get_partition(cxt, 1, cxt->label->nparts_max),
SUN_FLAG_RONLY);
else if (fdisk_is_disklabel(cxt, SGI))
- sgi_set_swappartition(cxt,
- get_partition(cxt, 1, cxt->label->nparts_max));
+ fdisk_partition_toggle_flag(cxt,
+ get_partition(cxt, 1, cxt->label->nparts_max),
+ SGI_FLAG_SWAP);
else
unknown_command(c);
break;
diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index 1481ca2f..464a1847 100644
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -1402,21 +1402,6 @@ void dos_move_begin(struct fdisk_context *cxt, int i)
}
}
-void dos_toggle_active(struct fdisk_context *cxt, int i)
-{
- struct pte *pe = &ptes[i];
- struct partition *p = pe->part_table;
-
- if (IS_EXTENDED (p->sys_ind) && !p->boot_ind)
- fprintf(stderr,
- _("WARNING: Partition %d is an extended partition\n"),
- i + 1);
- p->boot_ind = (p->boot_ind ? 0 : ACTIVE_FLAG);
- pe->changed = 1;
- fdisk_label_set_changed(cxt->label, 1);
-}
-
-
static int dos_get_partition_status(
struct fdisk_context *cxt,
size_t i,
@@ -1442,6 +1427,40 @@ static int dos_get_partition_status(
return 0;
}
+static int dos_toggle_partition_flag(
+ struct fdisk_context *cxt,
+ size_t i,
+ unsigned long flag)
+{
+ struct pte *pe;
+ struct partition *p;
+
+ assert(cxt);
+ assert(cxt->label);
+ assert(fdisk_is_disklabel(cxt, DOS));
+
+ if (i >= cxt->label->nparts_max)
+ return -EINVAL;
+
+ pe = &ptes[i];
+ p = pe->part_table;
+
+ switch (flag) {
+ case DOS_FLAG_ACTIVE:
+ if (IS_EXTENDED(p->sys_ind) && !p->boot_ind)
+ fdisk_warnx(cxt, _("WARNING: Partition %d is an extended partition"), i + 1);
+
+ p->boot_ind = (p->boot_ind ? 0 : ACTIVE_FLAG);
+ pe->changed = 1;
+ fdisk_label_set_changed(cxt->label, 1);
+ break;
+ default:
+ return 1;
+ }
+
+ return 0;
+}
+
static const struct fdisk_label_operations dos_operations =
{
.probe = dos_probe_label,
@@ -1453,6 +1472,7 @@ static const struct fdisk_label_operations dos_operations =
.part_get_type = dos_get_parttype,
.part_set_type = dos_set_parttype,
+ .part_toggle_flag = dos_toggle_partition_flag,
.part_get_status = dos_get_partition_status,
.reset_alignment = dos_reset_alignment,
diff --git a/fdisks/fdiskdoslabel.h b/fdisks/fdiskdoslabel.h
index a997be82..1a114428 100644
--- a/fdisks/fdiskdoslabel.h
+++ b/fdisks/fdiskdoslabel.h
@@ -59,4 +59,7 @@ extern int mbr_is_valid_magic(unsigned char *b);
(fdisk_is_disklabel(_x, DOS) && \
fdisk_dos_is_compatible(fdisk_context_get_label(_x, NULL)))
+/* toggle flags */
+#define DOS_FLAG_ACTIVE 1
+
#endif
diff --git a/fdisks/fdisksgilabel.c b/fdisks/fdisksgilabel.c
index 58f7133b..9000b3e2 100644
--- a/fdisks/fdisksgilabel.c
+++ b/fdisks/fdisksgilabel.c
@@ -281,22 +281,11 @@ sgi_get_swappartition(struct fdisk_context *cxt)
return (short) SSWAP16(sgilabel->swap_part);
}
-void
-sgi_set_bootpartition(struct fdisk_context *cxt, int i)
-{
- sgilabel->boot_part = SSWAP16(((short)i));
-}
-
static unsigned int
sgi_get_lastblock(struct fdisk_context *cxt) {
return cxt->geom.heads * cxt->geom.sectors * cxt->geom.cylinders;
}
-void
-sgi_set_swappartition(struct fdisk_context *cxt, int i) {
- sgilabel->swap_part = SSWAP16(((short)i));
-}
-
static int
sgi_check_bootfile(struct fdisk_context *cxt, const char* aFile)
{
@@ -1022,6 +1011,29 @@ static int sgi_get_partition_status(
return 0;
}
+static int sgi_toggle_partition_flag(struct fdisk_context *cxt, size_t i, unsigned long flag)
+{
+ assert(cxt);
+ assert(cxt->label);
+ assert(fdisk_is_disklabel(cxt, SGI));
+
+ if (i >= cxt->label->nparts_max)
+ return -EINVAL;
+
+ switch (flag) {
+ case SGI_FLAG_BOOT:
+ sgilabel->boot_part = sgilabel->boot_part == SSWAP16(i) ? 0 : SSWAP16(i);
+ break;
+ case SGI_FLAG_SWAP:
+ sgilabel->swap_part = sgilabel->swap_part == SSWAP16(i) ? 0 : SSWAP16(i);
+ break;
+ default:
+ return 1;
+ }
+
+ return 0;
+}
+
static const struct fdisk_label_operations sgi_operations =
{
.probe = sgi_probe_label,
@@ -1033,7 +1045,8 @@ static const struct fdisk_label_operations sgi_operations =
.part_get_type = sgi_get_parttype,
.part_set_type = sgi_set_parttype,
- .part_get_status = sgi_get_partition_status
+ .part_get_status = sgi_get_partition_status,
+ .part_toggle_flag = sgi_toggle_partition_flag
};
/*
diff --git a/fdisks/fdisksgilabel.h b/fdisks/fdisksgilabel.h
index ce53ec15..b89012d0 100644
--- a/fdisks/fdisksgilabel.h
+++ b/fdisks/fdisksgilabel.h
@@ -105,6 +105,10 @@ typedef struct {
#define SSWAP16(x) (other_endian ? swab16(x) : (uint16_t)(x))
#define SSWAP32(x) (other_endian ? swab32(x) : (uint32_t)(x))
+/* toggle flags */
+#define SGI_FLAG_BOOT 1
+#define SGI_FLAG_SWAP 2
+
/* fdisk.c */
#define sgilabel ((sgi_partition *)cxt->firstsector)
#define sgiparam (sgilabel->devparam)
diff --git a/fdisks/fdisksunlabel.c b/fdisks/fdisksunlabel.c
index 5826465d..66f459bf 100644
--- a/fdisks/fdisksunlabel.c
+++ b/fdisks/fdisksunlabel.c
@@ -305,14 +305,35 @@ static int sun_create_disklabel(struct fdisk_context *cxt)
return 0;
}
-void toggle_sunflags(struct fdisk_context *cxt, size_t i, uint16_t mask)
+static int sun_toggle_partition_flag(struct fdisk_context *cxt, size_t i, unsigned long flag)
{
- struct sun_disklabel *sunlabel = self_disklabel(cxt);
- struct sun_info *p = &sunlabel->vtoc.infos[i];
+ struct sun_disklabel *sunlabel;
+ struct sun_info *p;
+
+ assert(cxt);
+ assert(cxt->label);
+ assert(fdisk_is_disklabel(cxt, SUN));
- p->flags ^= cpu_to_be16(mask);
+ if (!i >= cxt->label->nparts_max)
+ return -EINVAL;
- fdisk_label_set_changed(cxt->label, 1);
+ 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,
@@ -939,6 +960,7 @@ const struct fdisk_label_operations sun_operations =
.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,
};
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-23 18:37:00 +0000