X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Ffdisk.c;h=4467525c739d7398552e6ed4a4f3329edcd28ecb;hb=5b2cc0aaee6985431d9bab1b49ceea7e1fa1d7af;hp=85acaa4aa79014bd14260719a98f344c8b578023;hpb=9275814a9e6a3af390c932238c0b1130de8d0edd;p=oweals%2Fbusybox.git diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 85acaa4aa..4467525c7 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -4,83 +4,178 @@ * Copyright (C) 1992 A. V. Le Blanc (LeBlanc@mcc.ac.uk) * Copyright (C) 2001,2002 Vladimir Oleynik (initial bb port) * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - -/* Current changes have not compatibility with this version */ -#define UTIL_LINUX_VERSION "2.12" - - -#define _(x) x - -#define PROC_PARTITIONS "/proc/partitions" - -#include -#include -#include /* stat */ -#include -#include -#include -#include -#include -#include -#include -#include +//config:config FDISK +//config: bool "fdisk" +//config: default y +//config: select PLATFORM_LINUX +//config: help +//config: The fdisk utility is used to divide hard disks into one or more +//config: logical disks, which are generally called partitions. This utility +//config: can be used to list and edit the set of partitions or BSD style +//config: 'disk slices' that are defined on a hard drive. +//config: +//config:config FDISK_SUPPORT_LARGE_DISKS +//config: bool "Support over 4GB disks" +//config: default y +//config: depends on FDISK +//config: depends on !LFS # with LFS no special code is needed +//config: +//config:config FEATURE_FDISK_WRITABLE +//config: bool "Write support" +//config: default y +//config: depends on FDISK +//config: help +//config: Enabling this option allows you to create or change a partition table +//config: and write those changes out to disk. If you leave this option +//config: disabled, you will only be able to view the partition table. +//config: +//config:config FEATURE_AIX_LABEL +//config: bool "Support AIX disklabels" +//config: default n +//config: depends on FDISK && FEATURE_FDISK_WRITABLE +//config: help +//config: Enabling this option allows you to create or change AIX disklabels. +//config: Most people can safely leave this option disabled. +//config: +//config:config FEATURE_SGI_LABEL +//config: bool "Support SGI disklabels" +//config: default n +//config: depends on FDISK && FEATURE_FDISK_WRITABLE +//config: help +//config: Enabling this option allows you to create or change SGI disklabels. +//config: Most people can safely leave this option disabled. +//config: +//config:config FEATURE_SUN_LABEL +//config: bool "Support SUN disklabels" +//config: default n +//config: depends on FDISK && FEATURE_FDISK_WRITABLE +//config: help +//config: Enabling this option allows you to create or change SUN disklabels. +//config: Most people can safely leave this option disabled. +//config: +//config:config FEATURE_OSF_LABEL +//config: bool "Support BSD disklabels" +//config: default n +//config: depends on FDISK && FEATURE_FDISK_WRITABLE +//config: help +//config: Enabling this option allows you to create or change BSD disklabels +//config: and define and edit BSD disk slices. +//config: +//config:config FEATURE_GPT_LABEL +//config: bool "Support GPT disklabels" +//config: default n +//config: depends on FDISK && FEATURE_FDISK_WRITABLE +//config: help +//config: Enabling this option allows you to view GUID Partition Table +//config: disklabels. +//config: +//config:config FEATURE_FDISK_ADVANCED +//config: bool "Support expert mode" +//config: default y +//config: depends on FDISK && FEATURE_FDISK_WRITABLE +//config: help +//config: Enabling this option allows you to do terribly unsafe things like +//config: define arbitrary drive geometry, move the beginning of data in a +//config: partition, and similarly evil things. Unless you have a very good +//config: reason you would be wise to leave this disabled. + +//applet:IF_FDISK(APPLET(fdisk, BB_DIR_SBIN, BB_SUID_DROP)) + +//kbuild:lib-$(CONFIG_FDISK) += fdisk.o + +/* Looks like someone forgot to add this to config system */ +//usage:#ifndef ENABLE_FEATURE_FDISK_BLKSIZE +//usage:# define ENABLE_FEATURE_FDISK_BLKSIZE 0 +//usage:# define IF_FEATURE_FDISK_BLKSIZE(a) +//usage:#endif +//usage: +//usage:#define fdisk_trivial_usage +//usage: "[-ul" IF_FEATURE_FDISK_BLKSIZE("s") "] " +//usage: "[-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK" +//usage:#define fdisk_full_usage "\n\n" +//usage: "Change partition table\n" +//usage: "\n -u Start and End are in sectors (instead of cylinders)" +//usage: "\n -l Show partition table for each DISK, then exit" +//usage: IF_FEATURE_FDISK_BLKSIZE( +//usage: "\n -s Show partition sizes in kb for each DISK, then exit" +//usage: ) +//usage: "\n -b 2048 (for certain MO disks) use 2048-byte sectors" +//usage: "\n -C CYLINDERS Set number of cylinders/heads/sectors" +//usage: "\n -H HEADS Typically 255" +//usage: "\n -S SECTORS Typically 63" + +#ifndef _LARGEFILE64_SOURCE +/* For lseek64 */ +# define _LARGEFILE64_SOURCE +#endif #include /* assert */ -#include -#include -#include -#include -#include /* major */ - -#include /* for uint32_t, uint16_t, uint8_t, int16_t, etc */ - -/* Copied from linux/major.h */ -#define FLOPPY_MAJOR 2 - -#include - -#include "busybox.h" +#include +#if !defined(BLKSSZGET) +# define BLKSSZGET _IO(0x12, 104) +#endif +#if !defined(BLKGETSIZE64) +# define BLKGETSIZE64 _IOR(0x12,114,size_t) +#endif +#include "libbb.h" +#include "unicode.h" -#define DKTYPENAMES +#if BB_LITTLE_ENDIAN +# define inline_if_little_endian ALWAYS_INLINE +#else +# define inline_if_little_endian /* nothing */ +#endif -/* - fdisk.h -*/ -#define DEFAULT_SECTOR_SIZE 512 -#define MAX_SECTOR_SIZE 2048 -#define SECTOR_SIZE 512 /* still used in BSD code */ -#define MAXIMUM_PARTS 60 +/* Looks like someone forgot to add this to config system */ +#ifndef ENABLE_FEATURE_FDISK_BLKSIZE +# define ENABLE_FEATURE_FDISK_BLKSIZE 0 +# define IF_FEATURE_FDISK_BLKSIZE(a) +#endif -#define ACTIVE_FLAG 0x80 +#define DEFAULT_SECTOR_SIZE 512 +#define DEFAULT_SECTOR_SIZE_STR "512" +#define MAX_SECTOR_SIZE 2048 +#define SECTOR_SIZE 512 /* still used in osf/sgi/sun code */ +#define MAXIMUM_PARTS 60 -#define EXTENDED 0x05 -#define WIN98_EXTENDED 0x0f -#define LINUX_PARTITION 0x81 -#define LINUX_SWAP 0x82 -#define LINUX_NATIVE 0x83 -#define LINUX_EXTENDED 0x85 -#define LINUX_LVM 0x8e -#define LINUX_RAID 0xfd +#define ACTIVE_FLAG 0x80 -#define SUNOS_SWAP 3 -#define WHOLE_DISK 5 +#define EXTENDED 0x05 +#define WIN98_EXTENDED 0x0f +#define LINUX_PARTITION 0x81 +#define LINUX_SWAP 0x82 +#define LINUX_NATIVE 0x83 +#define LINUX_EXTENDED 0x85 +#define LINUX_LVM 0x8e +#define LINUX_RAID 0xfd -#define IS_EXTENDED(i) \ - ((i) == EXTENDED || (i) == WIN98_EXTENDED || (i) == LINUX_EXTENDED) -#define SIZE(a) (sizeof(a)/sizeof((a)[0])) +enum { + OPT_b = 1 << 0, + OPT_C = 1 << 1, + OPT_H = 1 << 2, + OPT_l = 1 << 3, + OPT_S = 1 << 4, + OPT_u = 1 << 5, + OPT_s = (1 << 6) * ENABLE_FEATURE_FDISK_BLKSIZE, +}; -#define cround(n) (display_in_cyl_units ? ((n)/units_per_sector)+1 : (n)) -#define scround(x) (((x)+units_per_sector-1)/units_per_sector) -#ifdef CONFIG_FEATURE_SUN_LABEL -#define SCSI_IOCTL_GET_IDLUN 0x5382 +typedef unsigned long long ullong; +/* Used for sector numbers. Partition formats we know + * do not support more than 2^32 sectors + */ +typedef uint32_t sector_t; +#if UINT_MAX == 4294967295 +# define SECT_FMT "" +#elif ULONG_MAX == 4294967295 +# define SECT_FMT "l" +#else +# error Cant detect sizeof(uint32_t) #endif - -/* including also fails */ struct hd_geometry { unsigned char heads; unsigned char sectors; @@ -88,149 +183,32 @@ struct hd_geometry { unsigned long start; }; -#define HDIO_GETGEO 0x0301 /* get device geometry */ - - -struct systypes { - const char *name; -}; - -static uint sector_size = DEFAULT_SECTOR_SIZE; -static uint user_set_sector_size; -static uint sector_offset = 1; - -/* - * Raw disk label. For DOS-type partition tables the MBR, - * with descriptions of the primary partitions. - */ -#if (MAX_SECTOR_SIZE) > (BUFSIZ+1) -static char MBRbuffer[MAX_SECTOR_SIZE]; -#else -# define MBRbuffer bb_common_bufsiz1 -#endif - -#ifdef CONFIG_FEATURE_OSF_LABEL -static int possibly_osf_label; -#endif - -static uint heads, sectors, cylinders; -static void update_units(void); - - -/* - * return partition name - uses static storage unless buf is supplied - */ -static const char * -partname(const char *dev, int pno, int lth) -{ - static char buffer[80]; - const char *p; - int w, wp; - int bufsiz; - char *bufp; - - bufp = buffer; - bufsiz = sizeof(buffer); - - w = strlen(dev); - p = ""; - - if (isdigit(dev[w-1])) - p = "p"; +#define HDIO_GETGEO 0x0301 /* get device geometry */ - /* devfs kludge - note: fdisk partition names are not supposed - to equal kernel names, so there is no reason to do this */ - if (strcmp(dev + w - 4, "disc") == 0) { - w -= 4; - p = "part"; - } +/* TODO: #if ENABLE_FEATURE_FDISK_WRITABLE */ +/* (currently fdisk_sun/sgi.c do not have proper WRITABLE #ifs) */ +static const char msg_building_new_label[] ALIGN1 = +"Building a new %s. Changes will remain in memory only,\n" +"until you decide to write them. After that the previous content\n" +"won't be recoverable.\n\n"; - wp = strlen(p); +static const char msg_part_already_defined[] ALIGN1 = +"Partition %u is already defined, delete it before re-adding\n"; +/* #endif */ - if (lth) { - snprintf(bufp, bufsiz, "%*.*s%s%-2u", - lth-wp-2, w, dev, p, pno); - } else { - snprintf(bufp, bufsiz, "%.*s%s%-2u", w, dev, p, pno); - } - return bufp; -} struct partition { unsigned char boot_ind; /* 0x80 - active */ unsigned char head; /* starting head */ unsigned char sector; /* starting sector */ unsigned char cyl; /* starting cylinder */ - unsigned char sys_ind; /* What partition type */ + unsigned char sys_ind; /* what partition type */ unsigned char end_head; /* end head */ unsigned char end_sector; /* end sector */ unsigned char end_cyl; /* end cylinder */ unsigned char start4[4]; /* starting sector counting from 0 */ unsigned char size4[4]; /* nr of sectors in partition */ -} ATTRIBUTE_PACKED; - -enum failure { - ioctl_error, unable_to_open, unable_to_read, unable_to_seek, - unable_to_write -}; - -enum label_type{ - label_dos, label_sun, label_sgi, label_aix, label_osf -}; - -enum action { fdisk, require, try_only, create_empty_dos, create_empty_sun }; - -static enum label_type current_label_type; - -static const char *disk_device; -static int fd; /* the disk */ -static int partitions = 4; /* maximum partition + 1 */ -static uint display_in_cyl_units = 1; -static uint units_per_sector = 1; -#ifdef CONFIG_FEATURE_FDISK_WRITABLE -static char *line_ptr; -static void change_units(void); -static void reread_partition_table(int leave); -static void delete_partition(int i); -static int get_partition(int warn, int max); -static void list_types(const struct systypes *sys); -static uint read_int(uint low, uint dflt, uint high, uint base, char *mesg); -#endif -static const char *partition_type(unsigned char type); -static void fdisk_fatal(enum failure why) ATTRIBUTE_NORETURN; -static void get_geometry(void); -static int get_boot(enum action what); - -#define PLURAL 0 -#define SINGULAR 1 - -#define hex_val(c) ({ \ - char _c = (c); \ - isdigit(_c) ? _c - '0' : \ - tolower(_c) + 10 - 'a'; \ - }) - - -#define LINE_LENGTH 800 -#define pt_offset(b, n) ((struct partition *)((b) + 0x1be + \ - (n) * sizeof(struct partition))) -#define sector(s) ((s) & 0x3f) -#define cylinder(s, c) ((c) | (((s) & 0xc0) << 2)) - -#define hsc2sector(h,s,c) (sector(s) - 1 + sectors * \ - ((h) + heads * cylinder(s,c))) -#define set_hsc(h,s,c,sector) { \ - s = sector % sectors + 1; \ - sector /= sectors; \ - h = sector % heads; \ - sector /= heads; \ - c = sector & 0xff; \ - s |= (sector >> 2) & 0xc0; \ - } - - -static int32_t get_start_sect(const struct partition *p); -static int32_t get_nr_sects(const struct partition *p); +} PACKED; /* * per partition table entry data @@ -240,3198 +218,677 @@ static int32_t get_nr_sects(const struct partition *p); * Each logical partition table entry has two pointers, one for the * partition and one link to the next one. */ -static struct pte { +struct pte { struct partition *part_table; /* points into sectorbuffer */ struct partition *ext_pointer; /* points into sectorbuffer */ -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - char changed; /* boolean */ -#endif - off_t offset; /* disk sector number */ - char *sectorbuffer; /* disk sector contents */ -} ptes[MAXIMUM_PARTS]; - - -#ifdef CONFIG_FEATURE_FDISK_WRITABLE -static void -set_all_unchanged(void) -{ - int i; - - for (i = 0; i < MAXIMUM_PARTS; i++) - ptes[i].changed = 0; -} - -static void -set_changed(int i) -{ - ptes[i].changed = 1; -} -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ - -#if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_OSF_LABEL) -static struct partition * -get_part_table(int i) -{ - return ptes[i].part_table; -} + sector_t offset_from_dev_start; /* disk sector number */ + char *sectorbuffer; /* disk sector contents */ +#if ENABLE_FEATURE_FDISK_WRITABLE + char changed; /* boolean */ #endif +}; -static const char * -str_units(int n) -{ /* n==1: use singular */ - if (n == 1) - return display_in_cyl_units ? _("cylinder") : _("sector"); - else - return display_in_cyl_units ? _("cylinders") : _("sectors"); -} - -static int -valid_part_table_flag(const char *mbuffer) { - const unsigned char *b = (const unsigned char *)mbuffer; - return (b[510] == 0x55 && b[511] == 0xaa); -} - -#ifdef CONFIG_FEATURE_FDISK_WRITABLE -static char line_buffer[LINE_LENGTH]; - -/* read line; return 0 or first char */ -static int -read_line(void) -{ - static int got_eof = 0; - - fflush (stdout); /* requested by niles@scyld.com */ - line_ptr = line_buffer; - if (!fgets(line_buffer, LINE_LENGTH, stdin)) { - if (feof(stdin)) - got_eof++; /* user typed ^D ? */ - if (got_eof >= 3) { - fprintf(stderr, _("\ngot EOF thrice - exiting..\n")); - exit(1); - } - return 0; - } - while (*line_ptr && !isgraph(*line_ptr)) - line_ptr++; - return *line_ptr; -} - -static char -read_char(const char *mesg) -{ - do { - fputs(mesg, stdout); - } while (!read_line()); - return *line_ptr; -} - -static char -read_chars(const char *mesg) -{ - fputs(mesg, stdout); - if (!read_line()) { - *line_ptr = '\n'; - line_ptr[1] = 0; - } - return *line_ptr; -} - -static int -read_hex(const struct systypes *sys) -{ - int hex; - - while (1) { - read_char(_("Hex code (type L to list codes): ")); - if (*line_ptr == 'l' || *line_ptr == 'L') - list_types(sys); - else if (isxdigit (*line_ptr)) { - hex = 0; - do - hex = hex << 4 | hex_val(*line_ptr++); - while (isxdigit(*line_ptr)); - return hex; - } - } -} -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ - -#ifdef CONFIG_FEATURE_AIX_LABEL -/* - * Copyright (C) Andreas Neuper, Sep 1998. - * This file may be redistributed under - * the terms of the GNU Public License. - */ - -typedef struct { - unsigned int magic; /* expect AIX_LABEL_MAGIC */ - unsigned int fillbytes1[124]; - unsigned int physical_volume_id; - unsigned int fillbytes2[124]; -} aix_partition; - -#define AIX_LABEL_MAGIC 0xc9c2d4c1 -#define AIX_LABEL_MAGIC_SWAPPED 0xc1d4c2c9 -#define AIX_INFO_MAGIC 0x00072959 -#define AIX_INFO_MAGIC_SWAPPED 0x59290700 - -#define aixlabel ((aix_partition *)MBRbuffer) - - -/* - Changes: - * 1999-03-20 Arnaldo Carvalho de Melo - * Internationalization - * - * 2003-03-20 Phillip Kesling - * Some fixes -*/ - -static int aix_other_endian; -static short aix_volumes = 1; - -/* - * only dealing with free blocks here - */ - -static void -aix_info(void) -{ - puts( - _("\n\tThere is a valid AIX label on this disk.\n" - "\tUnfortunately Linux cannot handle these\n" - "\tdisks at the moment. Nevertheless some\n" - "\tadvice:\n" - "\t1. fdisk will destroy its contents on write.\n" - "\t2. Be sure that this disk is NOT a still vital\n" - "\t part of a volume group. (Otherwise you may\n" - "\t erase the other disks as well, if unmirrored.)\n" - "\t3. Before deleting this physical volume be sure\n" - "\t to remove the disk logically from your AIX\n" - "\t machine. (Otherwise you become an AIXpert).") - ); -} - -static int -check_aix_label(void) -{ - if (aixlabel->magic != AIX_LABEL_MAGIC && - aixlabel->magic != AIX_LABEL_MAGIC_SWAPPED) { - current_label_type = 0; - aix_other_endian = 0; - return 0; - } - aix_other_endian = (aixlabel->magic == AIX_LABEL_MAGIC_SWAPPED); - update_units(); - current_label_type = label_aix; - partitions = 1016; - aix_volumes = 15; - aix_info(); - /*aix_nolabel();*/ /* %% */ - /*aix_label = 1;*/ /* %% */ - return 1; -} -#endif /* AIX_LABEL */ - -#ifdef CONFIG_FEATURE_OSF_LABEL -/* - * Copyright (c) 1987, 1988 Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgment: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ +#define unable_to_open "can't open '%s'" +#define unable_to_read "can't read from %s" +#define unable_to_seek "can't seek on %s" +enum label_type { + LABEL_DOS, LABEL_SUN, LABEL_SGI, LABEL_AIX, LABEL_OSF, LABEL_GPT +}; -#ifndef BSD_DISKMAGIC -#define BSD_DISKMAGIC ((uint32_t) 0x82564557) -#endif +#define LABEL_IS_DOS (LABEL_DOS == current_label_type) -#ifndef BSD_MAXPARTITIONS -#define BSD_MAXPARTITIONS 16 +#if ENABLE_FEATURE_SUN_LABEL +#define LABEL_IS_SUN (LABEL_SUN == current_label_type) +#define STATIC_SUN static +#else +#define LABEL_IS_SUN 0 +#define STATIC_SUN extern #endif -#define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" - -#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__m68k__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) -#define BSD_LABELSECTOR 1 -#define BSD_LABELOFFSET 0 -#elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) -#define BSD_LABELSECTOR 0 -#define BSD_LABELOFFSET 64 -#elif defined (__s390__) || defined (__s390x__) -#define BSD_LABELSECTOR 1 -#define BSD_LABELOFFSET 0 +#if ENABLE_FEATURE_SGI_LABEL +#define LABEL_IS_SGI (LABEL_SGI == current_label_type) +#define STATIC_SGI static #else -#error unknown architecture +#define LABEL_IS_SGI 0 +#define STATIC_SGI extern #endif -#define BSD_BBSIZE 8192 /* size of boot area, with label */ -#define BSD_SBSIZE 8192 /* max size of fs superblock */ - -struct xbsd_disklabel { - uint32_t d_magic; /* the magic number */ - int16_t d_type; /* drive type */ - int16_t d_subtype; /* controller/d_type specific */ - char d_typename[16]; /* type name, e.g. "eagle" */ - char d_packname[16]; /* pack identifier */ - /* disk geometry: */ - uint32_t d_secsize; /* # of bytes per sector */ - uint32_t d_nsectors; /* # of data sectors per track */ - uint32_t d_ntracks; /* # of tracks per cylinder */ - uint32_t d_ncylinders; /* # of data cylinders per unit */ - uint32_t d_secpercyl; /* # of data sectors per cylinder */ - uint32_t d_secperunit; /* # of data sectors per unit */ - /* - * Spares (bad sector replacements) below - * are not counted in d_nsectors or d_secpercyl. - * Spare sectors are assumed to be physical sectors - * which occupy space at the end of each track and/or cylinder. - */ - uint16_t d_sparespertrack; /* # of spare sectors per track */ - uint16_t d_sparespercyl; /* # of spare sectors per cylinder */ - /* - * Alternate cylinders include maintenance, replacement, - * configuration description areas, etc. - */ - uint32_t d_acylinders; /* # of alt. cylinders per unit */ - - /* hardware characteristics: */ - /* - * d_interleave, d_trackskew and d_cylskew describe perturbations - * in the media format used to compensate for a slow controller. - * Interleave is physical sector interleave, set up by the formatter - * or controller when formatting. When interleaving is in use, - * logically adjacent sectors are not physically contiguous, - * but instead are separated by some number of sectors. - * It is specified as the ratio of physical sectors traversed - * per logical sector. Thus an interleave of 1:1 implies contiguous - * layout, while 2:1 implies that logical sector 0 is separated - * by one sector from logical sector 1. - * d_trackskew is the offset of sector 0 on track N - * relative to sector 0 on track N-1 on the same cylinder. - * Finally, d_cylskew is the offset of sector 0 on cylinder N - * relative to sector 0 on cylinder N-1. - */ - uint16_t d_rpm; /* rotational speed */ - uint16_t d_interleave; /* hardware sector interleave */ - uint16_t d_trackskew; /* sector 0 skew, per track */ - uint16_t d_cylskew; /* sector 0 skew, per cylinder */ - uint32_t d_headswitch; /* head switch time, usec */ - uint32_t d_trkseek; /* track-to-track seek, usec */ - uint32_t d_flags; /* generic flags */ -#define NDDATA 5 - uint32_t d_drivedata[NDDATA]; /* drive-type specific information */ -#define NSPARE 5 - uint32_t d_spare[NSPARE]; /* reserved for future use */ - uint32_t d_magic2; /* the magic number (again) */ - uint16_t d_checksum; /* xor of data incl. partitions */ - /* filesystem and partition information: */ - uint16_t d_npartitions; /* number of partitions in following */ - uint32_t d_bbsize; /* size of boot area at sn0, bytes */ - uint32_t d_sbsize; /* max size of fs superblock, bytes */ - struct xbsd_partition { /* the partition table */ - uint32_t p_size; /* number of sectors in partition */ - uint32_t p_offset; /* starting sector */ - uint32_t p_fsize; /* filesystem basic fragment size */ - uint8_t p_fstype; /* filesystem type, see below */ - uint8_t p_frag; /* filesystem fragments per block */ - uint16_t p_cpg; /* filesystem cylinders per group */ - } d_partitions[BSD_MAXPARTITIONS]; /* actually may be more */ -}; - -/* d_type values: */ -#define BSD_DTYPE_SMD 1 /* SMD, XSMD; VAX hp/up */ -#define BSD_DTYPE_MSCP 2 /* MSCP */ -#define BSD_DTYPE_DEC 3 /* other DEC (rk, rl) */ -#define BSD_DTYPE_SCSI 4 /* SCSI */ -#define BSD_DTYPE_ESDI 5 /* ESDI interface */ -#define BSD_DTYPE_ST506 6 /* ST506 etc. */ -#define BSD_DTYPE_HPIB 7 /* CS/80 on HP-IB */ -#define BSD_DTYPE_HPFL 8 /* HP Fiber-link */ -#define BSD_DTYPE_FLOPPY 10 /* floppy */ - -/* d_subtype values: */ -#define BSD_DSTYPE_INDOSPART 0x8 /* is inside dos partition */ -#define BSD_DSTYPE_DOSPART(s) ((s) & 3) /* dos partition number */ -#define BSD_DSTYPE_GEOMETRY 0x10 /* drive params in label */ - -#ifdef DKTYPENAMES -static const char * const xbsd_dktypenames[] = { - "unknown", - "SMD", - "MSCP", - "old DEC", - "SCSI", - "ESDI", - "ST506", - "HP-IB", - "HP-FL", - "type 9", - "floppy", - 0 -}; -#define BSD_DKMAXTYPES (sizeof(xbsd_dktypenames) / sizeof(xbsd_dktypenames[0]) - 1) +#if ENABLE_FEATURE_AIX_LABEL +#define LABEL_IS_AIX (LABEL_AIX == current_label_type) +#define STATIC_AIX static +#else +#define LABEL_IS_AIX 0 +#define STATIC_AIX extern #endif -/* - * Filesystem type and version. - * Used to interpret other filesystem-specific - * per-partition information. - */ -#define BSD_FS_UNUSED 0 /* unused */ -#define BSD_FS_SWAP 1 /* swap */ -#define BSD_FS_V6 2 /* Sixth Edition */ -#define BSD_FS_V7 3 /* Seventh Edition */ -#define BSD_FS_SYSV 4 /* System V */ -#define BSD_FS_V71K 5 /* V7 with 1K blocks (4.1, 2.9) */ -#define BSD_FS_V8 6 /* Eighth Edition, 4K blocks */ -#define BSD_FS_BSDFFS 7 /* 4.2BSD fast file system */ -#define BSD_FS_BSDLFS 9 /* 4.4BSD log-structured file system */ -#define BSD_FS_OTHER 10 /* in use, but unknown/unsupported */ -#define BSD_FS_HPFS 11 /* OS/2 high-performance file system */ -#define BSD_FS_ISO9660 12 /* ISO-9660 filesystem (cdrom) */ -#define BSD_FS_ISOFS BSD_FS_ISO9660 -#define BSD_FS_BOOT 13 /* partition contains bootstrap */ -#define BSD_FS_ADOS 14 /* AmigaDOS fast file system */ -#define BSD_FS_HFS 15 /* Macintosh HFS */ -#define BSD_FS_ADVFS 16 /* Digital Unix AdvFS */ - -/* this is annoying, but it's also the way it is :-( */ -#ifdef __alpha__ -#define BSD_FS_EXT2 8 /* ext2 file system */ +#if ENABLE_FEATURE_OSF_LABEL +#define LABEL_IS_OSF (LABEL_OSF == current_label_type) +#define STATIC_OSF static #else -#define BSD_FS_MSDOS 8 /* MS-DOS file system */ +#define LABEL_IS_OSF 0 +#define STATIC_OSF extern #endif -#ifdef DKTYPENAMES -static const struct systypes xbsd_fstypes[] = { - { "\x00" "unused" }, /* BSD_FS_UNUSED */ - { "\x01" "swap" }, /* BSD_FS_SWAP */ - { "\x02" "Version 6" }, /* BSD_FS_V6 */ - { "\x03" "Version 7" }, /* BSD_FS_V7 */ - { "\x04" "System V" }, /* BSD_FS_SYSV */ - { "\x05" "4.1BSD" }, /* BSD_FS_V71K */ - { "\x06" "Eighth Edition" }, /* BSD_FS_V8 */ - { "\x07" "4.2BSD" }, /* BSD_FS_BSDFFS */ -#ifdef __alpha__ - { "\x08" "ext2" }, /* BSD_FS_EXT2 */ +#if ENABLE_FEATURE_GPT_LABEL +#define LABEL_IS_GPT (LABEL_GPT == current_label_type) +#define STATIC_GPT static #else - { "\x08" "MS-DOS" }, /* BSD_FS_MSDOS */ +#define LABEL_IS_GPT 0 +#define STATIC_GPT extern #endif - { "\x09" "4.4LFS" }, /* BSD_FS_BSDLFS */ - { "\x0a" "unknown" }, /* BSD_FS_OTHER */ - { "\x0b" "HPFS" }, /* BSD_FS_HPFS */ - { "\x0c" "ISO-9660" }, /* BSD_FS_ISO9660 */ - { "\x0d" "boot" }, /* BSD_FS_BOOT */ - { "\x0e" "ADOS" }, /* BSD_FS_ADOS */ - { "\x0f" "HFS" }, /* BSD_FS_HFS */ - { "\x10" "AdvFS" }, /* BSD_FS_ADVFS */ - { NULL } -}; -#define BSD_FSMAXTYPES (SIZE(xbsd_fstypes)-1) +enum action { OPEN_MAIN, TRY_ONLY, CREATE_EMPTY_DOS, CREATE_EMPTY_SUN }; + +static void update_units(void); +#if ENABLE_FEATURE_FDISK_WRITABLE +static void change_units(void); +static void reread_partition_table(int leave); +static void delete_partition(int i); +static unsigned get_partition(int warn, unsigned max); +static void list_types(const char *const *sys); +static sector_t read_int(sector_t low, sector_t dflt, sector_t high, sector_t base, const char *mesg); +#endif +static const char *partition_type(unsigned char type); +static void get_geometry(void); +static void read_pte(struct pte *pe, sector_t offset); +#if ENABLE_FEATURE_SUN_LABEL || ENABLE_FEATURE_FDISK_WRITABLE +static int get_boot(enum action what); +#else +static int get_boot(void); #endif -/* - * flags shared by various drives: - */ -#define BSD_D_REMOVABLE 0x01 /* removable media */ -#define BSD_D_ECC 0x02 /* supports ECC */ -#define BSD_D_BADSECT 0x04 /* supports bad sector forw. */ -#define BSD_D_RAMDISK 0x08 /* disk emulator */ -#define BSD_D_CHAIN 0x10 /* can do back-back transfers */ -#define BSD_D_DOSPART 0x20 /* within MSDOS partition */ +#define PLURAL 0 +#define SINGULAR 1 -#endif /* OSF_LABEL */ +static sector_t get_start_sect(const struct partition *p); +static sector_t get_nr_sects(const struct partition *p); -/* - * Copyright (C) Andreas Neuper, Sep 1998. - * This file may be modified and redistributed under - * the terms of the GNU Public License. - */ +/* DOS partition types */ -struct device_parameter { /* 48 bytes */ - unsigned char skew; - unsigned char gap1; - unsigned char gap2; - unsigned char sparecyl; - unsigned short pcylcount; - unsigned short head_vol0; - unsigned short ntrks; /* tracks in cyl 0 or vol 0 */ - unsigned char cmd_tag_queue_depth; - unsigned char unused0; - unsigned short unused1; - unsigned short nsect; /* sectors/tracks in cyl 0 or vol 0 */ - unsigned short bytes; - unsigned short ilfact; - unsigned int flags; /* controller flags */ - unsigned int datarate; - unsigned int retries_on_error; - unsigned int ms_per_word; - unsigned short xylogics_gap1; - unsigned short xylogics_syncdelay; - unsigned short xylogics_readdelay; - unsigned short xylogics_gap2; - unsigned short xylogics_readgate; - unsigned short xylogics_writecont; +static const char *const i386_sys_types[] = { + "\x00" "Empty", + "\x01" "FAT12", + "\x04" "FAT16 <32M", + "\x05" "Extended", /* DOS 3.3+ extended partition */ + "\x06" "FAT16", /* DOS 16-bit >=32M */ + "\x07" "HPFS/NTFS", /* OS/2 IFS, eg, HPFS or NTFS or QNX */ + "\x0a" "OS/2 Boot Manager",/* OS/2 Boot Manager */ + "\x0b" "Win95 FAT32", + "\x0c" "Win95 FAT32 (LBA)",/* LBA really is 'Extended Int 13h' */ + "\x0e" "Win95 FAT16 (LBA)", + "\x0f" "Win95 Ext'd (LBA)", + "\x11" "Hidden FAT12", + "\x12" "Compaq diagnostics", + "\x14" "Hidden FAT16 <32M", + "\x16" "Hidden FAT16", + "\x17" "Hidden HPFS/NTFS", + "\x1b" "Hidden Win95 FAT32", + "\x1c" "Hidden W95 FAT32 (LBA)", + "\x1e" "Hidden W95 FAT16 (LBA)", + "\x3c" "Part.Magic recovery", + "\x41" "PPC PReP Boot", + "\x42" "SFS", + "\x63" "GNU HURD or SysV", /* GNU HURD or Mach or Sys V/386 (such as ISC UNIX) */ + "\x80" "Old Minix", /* Minix 1.4a and earlier */ + "\x81" "Minix / old Linux",/* Minix 1.4b and later */ + "\x82" "Linux swap", /* also Solaris */ + "\x83" "Linux", + "\x84" "OS/2 hidden C: drive", + "\x85" "Linux extended", + "\x86" "NTFS volume set", + "\x87" "NTFS volume set", + "\x8e" "Linux LVM", + "\x9f" "BSD/OS", /* BSDI */ + "\xa0" "Thinkpad hibernation", + "\xa5" "FreeBSD", /* various BSD flavours */ + "\xa6" "OpenBSD", + "\xa8" "Darwin UFS", + "\xa9" "NetBSD", + "\xab" "Darwin boot", + "\xb7" "BSDI fs", + "\xb8" "BSDI swap", + "\xbe" "Solaris boot", + "\xeb" "BeOS fs", + "\xee" "EFI GPT", /* Intel EFI GUID Partition Table */ + "\xef" "EFI (FAT-12/16/32)", /* Intel EFI System Partition */ + "\xf0" "Linux/PA-RISC boot", /* Linux/PA-RISC boot loader */ + "\xf2" "DOS secondary", /* DOS 3.3+ secondary */ + "\xfd" "Linux raid autodetect", /* New (2.2.x) raid partition with + autodetect using persistent + superblock */ +#if 0 /* ENABLE_WEIRD_PARTITION_TYPES */ + "\x02" "XENIX root", + "\x03" "XENIX usr", + "\x08" "AIX", /* AIX boot (AIX -- PS/2 port) or SplitDrive */ + "\x09" "AIX bootable", /* AIX data or Coherent */ + "\x10" "OPUS", + "\x18" "AST SmartSleep", + "\x24" "NEC DOS", + "\x39" "Plan 9", + "\x40" "Venix 80286", + "\x4d" "QNX4.x", + "\x4e" "QNX4.x 2nd part", + "\x4f" "QNX4.x 3rd part", + "\x50" "OnTrack DM", + "\x51" "OnTrack DM6 Aux1", /* (or Novell) */ + "\x52" "CP/M", /* CP/M or Microport SysV/AT */ + "\x53" "OnTrack DM6 Aux3", + "\x54" "OnTrackDM6", + "\x55" "EZ-Drive", + "\x56" "Golden Bow", + "\x5c" "Priam Edisk", + "\x61" "SpeedStor", + "\x64" "Novell Netware 286", + "\x65" "Novell Netware 386", + "\x70" "DiskSecure Multi-Boot", + "\x75" "PC/IX", + "\x93" "Amoeba", + "\x94" "Amoeba BBT", /* (bad block table) */ + "\xa7" "NeXTSTEP", + "\xbb" "Boot Wizard hidden", + "\xc1" "DRDOS/sec (FAT-12)", + "\xc4" "DRDOS/sec (FAT-16 < 32M)", + "\xc6" "DRDOS/sec (FAT-16)", + "\xc7" "Syrinx", + "\xda" "Non-FS data", + "\xdb" "CP/M / CTOS / ...",/* CP/M or Concurrent CP/M or + Concurrent DOS or CTOS */ + "\xde" "Dell Utility", /* Dell PowerEdge Server utilities */ + "\xdf" "BootIt", /* BootIt EMBRM */ + "\xe1" "DOS access", /* DOS access or SpeedStor 12-bit FAT + extended partition */ + "\xe3" "DOS R/O", /* DOS R/O or SpeedStor */ + "\xe4" "SpeedStor", /* SpeedStor 16-bit FAT extended + partition < 1024 cyl. */ + "\xf1" "SpeedStor", + "\xf4" "SpeedStor", /* SpeedStor large partition */ + "\xfe" "LANstep", /* SpeedStor >1024 cyl. or LANstep */ + "\xff" "BBT", /* Xenix Bad Block Table */ +#endif + NULL }; - -#define SGI_VOLHDR 0x00 -/* 1 and 2 were used for drive types no longer supported by SGI */ -#define SGI_SWAP 0x03 -/* 4 and 5 were for filesystem types SGI haven't ever supported on MIPS CPUs */ -#define SGI_VOLUME 0x06 -#define SGI_EFS 0x07 -#define SGI_LVOL 0x08 -#define SGI_RLVOL 0x09 -#define SGI_XFS 0x0a -#define SGI_XFSLOG 0x0b -#define SGI_XLV 0x0c -#define SGI_XVM 0x0d -#define ENTIRE_DISK SGI_VOLUME -/* - * controller flags - */ -#define SECTOR_SLIP 0x01 -#define SECTOR_FWD 0x02 -#define TRACK_FWD 0x04 -#define TRACK_MULTIVOL 0x08 -#define IGNORE_ERRORS 0x10 -#define RESEEK 0x20 -#define ENABLE_CMDTAGQ 0x40 - -typedef struct { - unsigned int magic; /* expect SGI_LABEL_MAGIC */ - unsigned short boot_part; /* active boot partition */ - unsigned short swap_part; /* active swap partition */ - unsigned char boot_file[16]; /* name of the bootfile */ - struct device_parameter devparam; /* 1 * 48 bytes */ - struct volume_directory { /* 15 * 16 bytes */ - unsigned char vol_file_name[8]; /* a character array */ - unsigned int vol_file_start; /* number of logical block */ - unsigned int vol_file_size; /* number of bytes */ - } directory[15]; - struct sgi_partition { /* 16 * 12 bytes */ - unsigned int num_sectors; /* number of blocks */ - unsigned int start_sector; /* must be cylinder aligned */ - unsigned int id; - } partitions[16]; - unsigned int csum; - unsigned int fillbytes; -} sgi_partition; - -typedef struct { - unsigned int magic; /* looks like a magic number */ - unsigned int a2; - unsigned int a3; - unsigned int a4; - unsigned int b1; - unsigned short b2; - unsigned short b3; - unsigned int c[16]; - unsigned short d[3]; - unsigned char scsi_string[50]; - unsigned char serial[137]; - unsigned short check1816; - unsigned char installer[225]; -} sgiinfo; - -#define SGI_LABEL_MAGIC 0x0be5a941 -#define SGI_LABEL_MAGIC_SWAPPED 0x41a9e50b -#define SGI_INFO_MAGIC 0x00072959 -#define SGI_INFO_MAGIC_SWAPPED 0x59290700 -#define SGI_SSWAP16(x) (sgi_other_endian ? __swap16(x) \ - : (uint16_t)(x)) -#define SGI_SSWAP32(x) (sgi_other_endian ? __swap32(x) \ - : (uint32_t)(x)) - -#define sgilabel ((sgi_partition *)MBRbuffer) -#define sgiparam (sgilabel->devparam) - -typedef struct { - unsigned char info[128]; /* Informative text string */ - unsigned char spare0[14]; - struct sun_info { - unsigned char spare1; - unsigned char id; - unsigned char spare2; - unsigned char flags; - } infos[8]; - unsigned char spare1[246]; /* Boot information etc. */ - unsigned short rspeed; /* Disk rotational speed */ - unsigned short pcylcount; /* Physical cylinder count */ - unsigned short sparecyl; /* extra sects per cylinder */ - unsigned char spare2[4]; /* More magic... */ - unsigned short ilfact; /* Interleave factor */ - unsigned short ncyl; /* Data cylinder count */ - unsigned short nacyl; /* Alt. cylinder count */ - unsigned short ntrks; /* Tracks per cylinder */ - unsigned short nsect; /* Sectors per track */ - unsigned char spare3[4]; /* Even more magic... */ - struct sun_partition { - uint32_t start_cylinder; - uint32_t num_sectors; - } partitions[8]; - unsigned short magic; /* Magic number */ - unsigned short csum; /* Label xor'd checksum */ -} sun_partition; - - -#define SUN_LABEL_MAGIC 0xDABE -#define SUN_LABEL_MAGIC_SWAPPED 0xBEDA -#define sunlabel ((sun_partition *)MBRbuffer) -#define SUN_SSWAP16(x) (sun_other_endian ? __swap16(x) \ - : (uint16_t)(x)) -#define SUN_SSWAP32(x) (sun_other_endian ? __swap32(x) \ - : (uint32_t)(x)) - - -#ifdef CONFIG_FEATURE_OSF_LABEL -/* - Changes: - 19990319 - Arnaldo Carvalho de Melo - i18n/nls - - 20000101 - David Huggins-Daines - Better - support for OSF/1 disklabels on Alpha. - Also fixed unaligned accesses in alpha_bootblock_checksum() -*/ - -#define FREEBSD_PARTITION 0xa5 -#define NETBSD_PARTITION 0xa9 - -static void xbsd_delete_part(void); -static void xbsd_new_part(void); -static void xbsd_write_disklabel(void); -static int xbsd_create_disklabel(void); -static void xbsd_edit_disklabel(void); -static void xbsd_write_bootstrap(void); -static void xbsd_change_fstype(void); -static int xbsd_get_part_index(int max); -static int xbsd_check_new_partition(int *i); -static void xbsd_list_types(void); -static u_short xbsd_dkcksum(struct xbsd_disklabel *lp); -static int xbsd_initlabel(struct partition *p, struct xbsd_disklabel *d); -static int xbsd_readlabel(struct partition *p, struct xbsd_disklabel *d); -static int xbsd_writelabel(struct partition *p, struct xbsd_disklabel *d); - -#if defined (__alpha__) -static void alpha_bootblock_checksum(char *boot); -#endif - -#if !defined (__alpha__) -static int xbsd_translate_fstype(int linux_type); -static void xbsd_link_part(void); -static struct partition *xbsd_part; -static int xbsd_part_index; -#endif - -#if defined (__alpha__) -/* We access this through a uint64_t * when checksumming */ -static char disklabelbuffer[BSD_BBSIZE] ATTRIBUTE_ALIGNED(8); -#else -static char disklabelbuffer[BSD_BBSIZE]; -#endif - -static struct xbsd_disklabel xbsd_dlabel; - -#define bsd_cround(n) \ - (display_in_cyl_units ? ((n)/xbsd_dlabel.d_secpercyl) + 1 : (n)) - -/* - * Test whether the whole disk has BSD disk label magic. - * - * Note: often reformatting with DOS-type label leaves the BSD magic, - * so this does not mean that there is a BSD disk label. - */ -static int -check_osf_label(void) -{ - if (xbsd_readlabel(NULL, &xbsd_dlabel) == 0) - return 0; - return 1; -} - -static void xbsd_print_disklabel(int); - -static int -btrydev(const char * dev) -{ - if (xbsd_readlabel (NULL, &xbsd_dlabel) == 0) - return -1; - printf(_("\nBSD label for device: %s\n"), dev); - xbsd_print_disklabel (0); - return 0; -} - -static void -bmenu(void) -{ - puts (_("Command action")); - puts (_("\td\tdelete a BSD partition")); - puts (_("\te\tedit drive data")); - puts (_("\ti\tinstall bootstrap")); - puts (_("\tl\tlist known filesystem types")); - puts (_("\tm\tprint this menu")); - puts (_("\tn\tadd a new BSD partition")); - puts (_("\tp\tprint BSD partition table")); - puts (_("\tq\tquit without saving changes")); - puts (_("\tr\treturn to main menu")); - puts (_("\ts\tshow complete disklabel")); - puts (_("\tt\tchange a partition's filesystem id")); - puts (_("\tu\tchange units (cylinders/sectors)")); - puts (_("\tw\twrite disklabel to disk")); -#if !defined (__alpha__) - puts (_("\tx\tlink BSD partition to non-BSD partition")); -#endif -} - -#if !defined (__alpha__) -static int -hidden(int type) -{ - return type ^ 0x10; -} - -static int -is_bsd_partition_type(int type) -{ - return (type == FREEBSD_PARTITION || - type == hidden(FREEBSD_PARTITION) || - type == NETBSD_PARTITION || - type == hidden(NETBSD_PARTITION)); -} -#endif - -static void -bselect(void) -{ -#if !defined (__alpha__) - int t, ss; - struct partition *p; - - for (t = 0; t < 4; t++) { - p = get_part_table(t); - if (p && is_bsd_partition_type(p->sys_ind)) { - xbsd_part = p; - xbsd_part_index = t; - ss = get_start_sect(xbsd_part); - if (ss == 0) { - fprintf(stderr, _("Partition %s has invalid starting sector 0.\n"), - partname(disk_device, t+1, 0)); - return; - } - printf(_("Reading disklabel of %s at sector %d.\n"), - partname(disk_device, t+1, 0), ss + BSD_LABELSECTOR); - if (xbsd_readlabel(xbsd_part, &xbsd_dlabel) == 0) - if (xbsd_create_disklabel() == 0) - return; - break; - } - } - - if (t == 4) { - printf(_("There is no *BSD partition on %s.\n"), disk_device); - return; - } - -#elif defined (__alpha__) - - if (xbsd_readlabel(NULL, &xbsd_dlabel) == 0) - if (xbsd_create_disklabel() == 0) - exit (EXIT_SUCCESS); - -#endif - - while (1) { - putchar('\n'); - switch (tolower(read_char(_("BSD disklabel command (m for help): ")))) { - case 'd': - xbsd_delete_part(); - break; - case 'e': - xbsd_edit_disklabel(); - break; - case 'i': - xbsd_write_bootstrap(); - break; - case 'l': - xbsd_list_types(); - break; - case 'n': - xbsd_new_part(); - break; - case 'p': - xbsd_print_disklabel(0); - break; - case 'q': - close(fd); - exit(EXIT_SUCCESS); - case 'r': - return; - case 's': - xbsd_print_disklabel(1); - break; - case 't': - xbsd_change_fstype(); - break; - case 'u': - change_units(); - break; - case 'w': - xbsd_write_disklabel(); - break; -#if !defined (__alpha__) - case 'x': - xbsd_link_part(); - break; -#endif - default: - bmenu(); - break; - } - } -} - -static void -xbsd_delete_part(void) -{ - int i; - - i = xbsd_get_part_index(xbsd_dlabel.d_npartitions); - xbsd_dlabel.d_partitions[i].p_size = 0; - xbsd_dlabel.d_partitions[i].p_offset = 0; - xbsd_dlabel.d_partitions[i].p_fstype = BSD_FS_UNUSED; - if (xbsd_dlabel.d_npartitions == i + 1) - while (xbsd_dlabel.d_partitions[xbsd_dlabel.d_npartitions-1].p_size == 0) - xbsd_dlabel.d_npartitions--; -} - -static void -xbsd_new_part(void) -{ - off_t begin, end; - char mesg[256]; - int i; - - if (!xbsd_check_new_partition(&i)) - return; - -#if !defined (__alpha__) && !defined (__powerpc__) && !defined (__hppa__) - begin = get_start_sect(xbsd_part); - end = begin + get_nr_sects(xbsd_part) - 1; -#else - begin = 0; - end = xbsd_dlabel.d_secperunit - 1; -#endif - - snprintf(mesg, sizeof(mesg), _("First %s"), str_units(SINGULAR)); - begin = read_int(bsd_cround(begin), bsd_cround(begin), bsd_cround(end), - 0, mesg); - - if (display_in_cyl_units) - begin = (begin - 1) * xbsd_dlabel.d_secpercyl; - - snprintf(mesg, sizeof(mesg), _("Last %s or +size or +sizeM or +sizeK"), - str_units(SINGULAR)); - end = read_int(bsd_cround (begin), bsd_cround (end), bsd_cround (end), - bsd_cround (begin), mesg); - - if (display_in_cyl_units) - end = end * xbsd_dlabel.d_secpercyl - 1; - - xbsd_dlabel.d_partitions[i].p_size = end - begin + 1; - xbsd_dlabel.d_partitions[i].p_offset = begin; - xbsd_dlabel.d_partitions[i].p_fstype = BSD_FS_UNUSED; -} - -static void -xbsd_print_disklabel(int show_all) -{ - struct xbsd_disklabel *lp = &xbsd_dlabel; - struct xbsd_partition *pp; - int i, j; - - if (show_all) { -#if defined (__alpha__) - printf("# %s:\n", disk_device); -#else - printf("# %s:\n", partname(disk_device, xbsd_part_index+1, 0)); -#endif - if ((unsigned) lp->d_type < BSD_DKMAXTYPES) - printf(_("type: %s\n"), xbsd_dktypenames[lp->d_type]); - else - printf(_("type: %d\n"), lp->d_type); - printf(_("disk: %.*s\n"), (int) sizeof(lp->d_typename), lp->d_typename); - printf(_("label: %.*s\n"), (int) sizeof(lp->d_packname), lp->d_packname); - printf(_("flags:")); - if (lp->d_flags & BSD_D_REMOVABLE) - printf(_(" removable")); - if (lp->d_flags & BSD_D_ECC) - printf(_(" ecc")); - if (lp->d_flags & BSD_D_BADSECT) - printf(_(" badsect")); - printf("\n"); - /* On various machines the fields of *lp are short/int/long */ - /* In order to avoid problems, we cast them all to long. */ - printf(_("bytes/sector: %ld\n"), (long) lp->d_secsize); - printf(_("sectors/track: %ld\n"), (long) lp->d_nsectors); - printf(_("tracks/cylinder: %ld\n"), (long) lp->d_ntracks); - printf(_("sectors/cylinder: %ld\n"), (long) lp->d_secpercyl); - printf(_("cylinders: %ld\n"), (long) lp->d_ncylinders); - printf(_("rpm: %d\n"), lp->d_rpm); - printf(_("interleave: %d\n"), lp->d_interleave); - printf(_("trackskew: %d\n"), lp->d_trackskew); - printf(_("cylinderskew: %d\n"), lp->d_cylskew); - printf(_("headswitch: %ld\t\t# milliseconds\n"), - (long) lp->d_headswitch); - printf(_("track-to-track seek: %ld\t# milliseconds\n"), - (long) lp->d_trkseek); - printf(_("drivedata: ")); - for (i = NDDATA - 1; i >= 0; i--) - if (lp->d_drivedata[i]) - break; - if (i < 0) - i = 0; - for (j = 0; j <= i; j++) - printf("%ld ", (long) lp->d_drivedata[j]); - } - printf(_("\n%d partitions:\n"), lp->d_npartitions); - printf(_("# start end size fstype [fsize bsize cpg]\n")); - pp = lp->d_partitions; - for (i = 0; i < lp->d_npartitions; i++, pp++) { - if (pp->p_size) { - if (display_in_cyl_units && lp->d_secpercyl) { - printf(" %c: %8ld%c %8ld%c %8ld%c ", - 'a' + i, - (long) pp->p_offset / lp->d_secpercyl + 1, - (pp->p_offset % lp->d_secpercyl) ? '*' : ' ', - (long) (pp->p_offset + pp->p_size + lp->d_secpercyl - 1) / lp->d_secpercyl, - ((pp->p_offset + pp->p_size) % lp->d_secpercyl) ? '*' : ' ', - (long) pp->p_size / lp->d_secpercyl, - (pp->p_size % lp->d_secpercyl) ? '*' : ' ' - ); - } else { - printf(" %c: %8ld %8ld %8ld ", - 'a' + i, - (long) pp->p_offset, - (long) pp->p_offset + pp->p_size - 1, - (long) pp->p_size - ); - } - - if ((unsigned) pp->p_fstype < BSD_FSMAXTYPES) - printf("%8.8s", xbsd_fstypes[pp->p_fstype].name); - else - printf("%8x", pp->p_fstype); - - switch (pp->p_fstype) { - case BSD_FS_UNUSED: - printf(" %5ld %5ld %5.5s ", - (long) pp->p_fsize, (long) pp->p_fsize * pp->p_frag, ""); - break; - case BSD_FS_BSDFFS: - printf(" %5ld %5ld %5d ", - (long) pp->p_fsize, (long) pp->p_fsize * pp->p_frag, pp->p_cpg); - break; - default: - printf("%22.22s", ""); - break; - } - printf("\n"); - } - } -} - -static void -xbsd_write_disklabel(void) -{ -#if defined (__alpha__) - printf(_("Writing disklabel to %s.\n"), disk_device); - xbsd_writelabel(NULL, &xbsd_dlabel); -#else - printf(_("Writing disklabel to %s.\n"), - partname(disk_device, xbsd_part_index + 1, 0)); - xbsd_writelabel(xbsd_part, &xbsd_dlabel); -#endif - reread_partition_table(0); /* no exit yet */ -} - -static int -xbsd_create_disklabel(void) -{ - char c; - -#if defined (__alpha__) - fprintf(stderr, _("%s contains no disklabel.\n"), disk_device); -#else - fprintf(stderr, _("%s contains no disklabel.\n"), - partname(disk_device, xbsd_part_index + 1, 0)); -#endif - - while (1) { - c = read_char(_("Do you want to create a disklabel? (y/n) ")); - if (c == 'y' || c == 'Y') { - if (xbsd_initlabel( -#if defined (__alpha__) || defined (__powerpc__) || defined (__hppa__) || \ - defined (__s390__) || defined (__s390x__) - NULL, &xbsd_dlabel -#else - xbsd_part, &xbsd_dlabel/* not used, xbsd_part_index*/ -#endif - ) == 1) { - xbsd_print_disklabel (1); - return 1; - } else - return 0; - } else if (c == 'n') - return 0; - } -} - -static int -edit_int(int def, char *mesg) -{ - do { - fputs(mesg, stdout); - printf(" (%d): ", def); - if (!read_line()) - return def; - } - while (!isdigit(*line_ptr)); /* FIXME: ?!! */ - return atoi(line_ptr); -} - -static void -xbsd_edit_disklabel(void) -{ - struct xbsd_disklabel *d; - - d = &xbsd_dlabel; - -#if defined (__alpha__) || defined (__ia64__) - d->d_secsize = (u_long) edit_int((u_long) d->d_secsize ,_("bytes/sector")); - d->d_nsectors = (u_long) edit_int((u_long) d->d_nsectors ,_("sectors/track")); - d->d_ntracks = (u_long) edit_int((u_long) d->d_ntracks ,_("tracks/cylinder")); - d->d_ncylinders = (u_long) edit_int((u_long) d->d_ncylinders ,_("cylinders")); -#endif - - /* d->d_secpercyl can be != d->d_nsectors * d->d_ntracks */ - while (1) { - d->d_secpercyl = (u_long) edit_int((u_long) d->d_nsectors * d->d_ntracks, - _("sectors/cylinder")); - if (d->d_secpercyl <= d->d_nsectors * d->d_ntracks) - break; - - printf(_("Must be <= sectors/track * tracks/cylinder (default).\n")); - } - d->d_rpm = (u_short) edit_int((u_short) d->d_rpm ,_("rpm")); - d->d_interleave = (u_short) edit_int((u_short) d->d_interleave,_("interleave")); - d->d_trackskew = (u_short) edit_int((u_short) d->d_trackskew ,_("trackskew")); - d->d_cylskew = (u_short) edit_int((u_short) d->d_cylskew ,_("cylinderskew")); - d->d_headswitch = (u_long) edit_int((u_long) d->d_headswitch ,_("headswitch")); - d->d_trkseek = (u_long) edit_int((u_long) d->d_trkseek ,_("track-to-track seek")); - - d->d_secperunit = d->d_secpercyl * d->d_ncylinders; -} - -static int -xbsd_get_bootstrap (char *path, void *ptr, int size) -{ - int fdb; - - if ((fdb = open (path, O_RDONLY)) < 0) { - perror(path); - return 0; - } - if (read(fdb, ptr, size) < 0) { - perror(path); - close(fdb); - return 0; - } - printf(" ... %s\n", path); - close(fdb); - return 1; -} - -static void -sync_disks(void) -{ - printf(_("\nSyncing disks.\n")); - sync(); - sleep(4); /* What? */ -} - -static void -xbsd_write_bootstrap(void) -{ - char *bootdir = BSD_LINUX_BOOTDIR; - char path[MAXPATHLEN]; - char *dkbasename; - struct xbsd_disklabel dl; - char *d, *p, *e; - int sector; - - if (xbsd_dlabel.d_type == BSD_DTYPE_SCSI) - dkbasename = "sd"; - else - dkbasename = "wd"; - - printf(_("Bootstrap: %sboot -> boot%s (%s): "), - dkbasename, dkbasename, dkbasename); - if (read_line()) { - line_ptr[strlen(line_ptr)-1] = '\0'; - dkbasename = line_ptr; - } - snprintf(path, sizeof(path), "%s/%sboot", bootdir, dkbasename); - if (!xbsd_get_bootstrap(path, disklabelbuffer, (int) xbsd_dlabel.d_secsize)) - return; - -/* We need a backup of the disklabel (xbsd_dlabel might have changed). */ - d = &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE]; - memmove(&dl, d, sizeof(struct xbsd_disklabel)); - -/* The disklabel will be overwritten by 0's from bootxx anyway */ - memset(d, 0, sizeof(struct xbsd_disklabel)); - - snprintf(path, sizeof(path), "%s/boot%s", bootdir, dkbasename); - if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize], - (int) xbsd_dlabel.d_bbsize - xbsd_dlabel.d_secsize)) - return; - - e = d + sizeof(struct xbsd_disklabel); - for (p = d; p < e; p++) - if (*p) { - fprintf(stderr, _("Bootstrap overlaps with disk label!\n")); - exit(EXIT_FAILURE); - } - - memmove(d, &dl, sizeof(struct xbsd_disklabel)); - -#if defined (__powerpc__) || defined (__hppa__) - sector = 0; -#elif defined (__alpha__) - sector = 0; - alpha_bootblock_checksum(disklabelbuffer); -#else - sector = get_start_sect(xbsd_part); -#endif - - if (lseek(fd, sector * SECTOR_SIZE, SEEK_SET) == -1) - fdisk_fatal(unable_to_seek); - if (BSD_BBSIZE != write(fd, disklabelbuffer, BSD_BBSIZE)) - fdisk_fatal(unable_to_write); - -#if defined (__alpha__) - printf(_("Bootstrap installed on %s.\n"), disk_device); -#else - printf(_("Bootstrap installed on %s.\n"), - partname (disk_device, xbsd_part_index+1, 0)); -#endif - - sync_disks(); -} - -static void -xbsd_change_fstype(void) -{ - int i; - - i = xbsd_get_part_index(xbsd_dlabel.d_npartitions); - xbsd_dlabel.d_partitions[i].p_fstype = read_hex(xbsd_fstypes); -} - -static int -xbsd_get_part_index(int max) -{ - char prompt[256]; - char l; - - snprintf(prompt, sizeof(prompt), _("Partition (a-%c): "), 'a' + max - 1); - do - l = tolower(read_char(prompt)); - while (l < 'a' || l > 'a' + max - 1); - return l - 'a'; -} - -static int -xbsd_check_new_partition(int *i) -{ - /* room for more? various BSD flavours have different maxima */ - if (xbsd_dlabel.d_npartitions == BSD_MAXPARTITIONS) { - int t; - - for (t = 0; t < BSD_MAXPARTITIONS; t++) - if (xbsd_dlabel.d_partitions[t].p_size == 0) - break; - - if (t == BSD_MAXPARTITIONS) { - fprintf(stderr, _("The maximum number of partitions " - "has been created\n")); - return 0; - } - } - - *i = xbsd_get_part_index (BSD_MAXPARTITIONS); - - if (*i >= xbsd_dlabel.d_npartitions) - xbsd_dlabel.d_npartitions = (*i) + 1; - - if (xbsd_dlabel.d_partitions[*i].p_size != 0) { - fprintf(stderr, _("This partition already exists.\n")); - return 0; - } - - return 1; -} - -static void -xbsd_list_types(void) -{ - list_types(xbsd_fstypes); -} - -static u_short -xbsd_dkcksum(struct xbsd_disklabel *lp) -{ - u_short *start, *end; - u_short sum = 0; - - start = (u_short *) lp; - end = (u_short *) &lp->d_partitions[lp->d_npartitions]; - while (start < end) - sum ^= *start++; - return sum; -} - -static int -xbsd_initlabel(struct partition *p, struct xbsd_disklabel *d) -{ - struct xbsd_partition *pp; - - get_geometry(); - memset(d, 0, sizeof(struct xbsd_disklabel)); - - d->d_magic = BSD_DISKMAGIC; - - if (strncmp(disk_device, "/dev/sd", 7) == 0) - d->d_type = BSD_DTYPE_SCSI; - else - d->d_type = BSD_DTYPE_ST506; - -#if !defined (__alpha__) - d->d_flags = BSD_D_DOSPART; -#else - d->d_flags = 0; -#endif - d->d_secsize = SECTOR_SIZE; /* bytes/sector */ - d->d_nsectors = sectors; /* sectors/track */ - d->d_ntracks = heads; /* tracks/cylinder (heads) */ - d->d_ncylinders = cylinders; - d->d_secpercyl = sectors * heads;/* sectors/cylinder */ - if (d->d_secpercyl == 0) - d->d_secpercyl = 1; /* avoid segfaults */ - d->d_secperunit = d->d_secpercyl * d->d_ncylinders; - - d->d_rpm = 3600; - d->d_interleave = 1; - d->d_trackskew = 0; - d->d_cylskew = 0; - d->d_headswitch = 0; - d->d_trkseek = 0; - - d->d_magic2 = BSD_DISKMAGIC; - d->d_bbsize = BSD_BBSIZE; - d->d_sbsize = BSD_SBSIZE; - -#if !defined (__alpha__) - d->d_npartitions = 4; - pp = &d->d_partitions[2]; /* Partition C should be - the NetBSD partition */ - pp->p_offset = get_start_sect(p); - pp->p_size = get_nr_sects(p); - pp->p_fstype = BSD_FS_UNUSED; - pp = &d->d_partitions[3]; /* Partition D should be - the whole disk */ - pp->p_offset = 0; - pp->p_size = d->d_secperunit; - pp->p_fstype = BSD_FS_UNUSED; -#elif defined (__alpha__) - d->d_npartitions = 3; - pp = &d->d_partitions[2]; /* Partition C should be - the whole disk */ - pp->p_offset = 0; - pp->p_size = d->d_secperunit; - pp->p_fstype = BSD_FS_UNUSED; -#endif - - return 1; -} - -/* - * Read a xbsd_disklabel from sector 0 or from the starting sector of p. - * If it has the right magic, return 1. - */ -static int -xbsd_readlabel (struct partition *p, struct xbsd_disklabel *d) -{ - int t, sector; - - /* p is used only to get the starting sector */ -#if !defined (__alpha__) - sector = (p ? get_start_sect(p) : 0); -#elif defined (__alpha__) - sector = 0; -#endif - - if (lseek(fd, sector * SECTOR_SIZE, SEEK_SET) == -1) - fdisk_fatal(unable_to_seek); - if (BSD_BBSIZE != read(fd, disklabelbuffer, BSD_BBSIZE)) - fdisk_fatal(unable_to_read); - - memmove(d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET], - sizeof(struct xbsd_disklabel)); - - if (d->d_magic != BSD_DISKMAGIC || d->d_magic2 != BSD_DISKMAGIC) - return 0; - - for (t = d->d_npartitions; t < BSD_MAXPARTITIONS; t++) { - d->d_partitions[t].p_size = 0; - d->d_partitions[t].p_offset = 0; - d->d_partitions[t].p_fstype = BSD_FS_UNUSED; - } - - if (d->d_npartitions > BSD_MAXPARTITIONS) - fprintf(stderr, _("Warning: too many partitions " - "(%d, maximum is %d).\n"), - d->d_npartitions, BSD_MAXPARTITIONS); - return 1; -} - -static int -xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d) -{ - unsigned int sector; - -#if !defined (__alpha__) && !defined (__powerpc__) && !defined (__hppa__) - sector = get_start_sect(p) + BSD_LABELSECTOR; -#else - sector = BSD_LABELSECTOR; -#endif - - d->d_checksum = 0; - d->d_checksum = xbsd_dkcksum (d); - - /* This is necessary if we want to write the bootstrap later, - otherwise we'd write the old disklabel with the bootstrap. - */ - memmove(&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET], - d, sizeof(struct xbsd_disklabel)); - -#if defined (__alpha__) && BSD_LABELSECTOR == 0 - alpha_bootblock_checksum (disklabelbuffer); - if (lseek(fd, 0, SEEK_SET) == -1) - fdisk_fatal(unable_to_seek); - if (BSD_BBSIZE != write(fd, disklabelbuffer, BSD_BBSIZE)) - fdisk_fatal(unable_to_write); -#else - if (lseek(fd, sector * SECTOR_SIZE + BSD_LABELOFFSET, SEEK_SET) == -1) - fdisk_fatal(unable_to_seek); - if (sizeof(struct xbsd_disklabel) != write(fd, d, sizeof(struct xbsd_disklabel))) - fdisk_fatal(unable_to_write); -#endif - sync_disks(); - return 1; -} - - -#if !defined (__alpha__) -static int -xbsd_translate_fstype(int linux_type) -{ - switch (linux_type) { - case 0x01: /* DOS 12-bit FAT */ - case 0x04: /* DOS 16-bit <32M */ - case 0x06: /* DOS 16-bit >=32M */ - case 0xe1: /* DOS access */ - case 0xe3: /* DOS R/O */ - case 0xf2: /* DOS secondary */ - return BSD_FS_MSDOS; - case 0x07: /* OS/2 HPFS */ - return BSD_FS_HPFS; - default: - return BSD_FS_OTHER; - } -} - -static void -xbsd_link_part(void) -{ - int k, i; - struct partition *p; - - k = get_partition(1, partitions); - - if (!xbsd_check_new_partition(&i)) - return; - - p = get_part_table(k); - - xbsd_dlabel.d_partitions[i].p_size = get_nr_sects(p); - xbsd_dlabel.d_partitions[i].p_offset = get_start_sect(p); - xbsd_dlabel.d_partitions[i].p_fstype = xbsd_translate_fstype(p->sys_ind); -} -#endif - -#if defined (__alpha__) - -#if !defined(__GLIBC__) -typedef unsigned long long uint64_t; -#endif - -static void -alpha_bootblock_checksum(char *boot) -{ - uint64_t *dp, sum; - int i; - - dp = (uint64_t *)boot; - sum = 0; - for (i = 0; i < 63; i++) - sum += dp[i]; - dp[63] = sum; -} -#endif /* __alpha__ */ - -#endif /* OSF_LABEL */ - -#if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_SUN_LABEL) -static unsigned short -__swap16(unsigned short x) -{ - return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); -} - -static uint32_t -__swap32(uint32_t x) -{ - return (((x & 0xFF) << 24) | - ((x & 0xFF00) << 8) | - ((x & 0xFF0000) >> 8) | - ((x & 0xFF000000) >> 24)); -} -#endif - -#ifdef CONFIG_FEATURE_SGI_LABEL -/* - * - * fdisksgilabel.c - * - * Copyright (C) Andreas Neuper, Sep 1998. - * This file may be modified and redistributed under - * the terms of the GNU Public License. - * - * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo - * Internationalization - */ - - -static int sgi_other_endian; -static int debug; -static short sgi_volumes = 1; - -/* - * only dealing with free blocks here - */ - -typedef struct { - unsigned int first; - unsigned int last; -} freeblocks; -static freeblocks freelist[17]; /* 16 partitions can produce 17 vacant slots */ - -static void -setfreelist(int i, unsigned int f, unsigned int l) -{ - freelist[i].first = f; - freelist[i].last = l; -} - -static void -add2freelist(unsigned int f, unsigned int l) -{ - int i; - for (i = 0; i < 17 ; i++) - if (freelist[i].last == 0) - break; - setfreelist(i, f, l); -} - -static void -clearfreelist(void) -{ - int i; - - for (i = 0; i < 17 ; i++) - setfreelist(i, 0, 0); -} - -static unsigned int -isinfreelist(unsigned int b) -{ - int i; - - for (i = 0; i < 17 ; i++) - if (freelist[i].first <= b && freelist[i].last >= b) - return freelist[i].last; - return 0; -} - /* return last vacant block of this stride (never 0). */ - /* the '>=' is not quite correct, but simplifies the code */ -/* - * end of free blocks section - */ - -static const struct systypes sgi_sys_types[] = { -/* SGI_VOLHDR */ { "\x00" "SGI volhdr" }, -/* 0x01 */ { "\x01" "SGI trkrepl" }, -/* 0x02 */ { "\x02" "SGI secrepl" }, -/* SGI_SWAP */ { "\x03" "SGI raw" }, -/* 0x04 */ { "\x04" "SGI bsd" }, -/* 0x05 */ { "\x05" "SGI sysv" }, -/* ENTIRE_DISK */ { "\x06" "SGI volume" }, -/* SGI_EFS */ { "\x07" "SGI efs" }, -/* 0x08 */ { "\x08" "SGI lvol" }, -/* 0x09 */ { "\x09" "SGI rlvol" }, -/* SGI_XFS */ { "\x0a" "SGI xfs" }, -/* SGI_XFSLOG */ { "\x0b" "SGI xfslog" }, -/* SGI_XLV */ { "\x0c" "SGI xlv" }, -/* SGI_XVM */ { "\x0d" "SGI xvm" }, -/* LINUX_SWAP */ { "\x82" "Linux swap" }, -/* LINUX_NATIVE */ { "\x83" "Linux native" }, -/* LINUX_LVM */ { "\x8d" "Linux LVM" }, -/* LINUX_RAID */ { "\xfd" "Linux RAID" }, - { NULL } -}; - - -static int -sgi_get_nsect(void) -{ - return SGI_SSWAP16(sgilabel->devparam.nsect); -} - -static int -sgi_get_ntrks(void) -{ - return SGI_SSWAP16(sgilabel->devparam.ntrks); -} - -static unsigned int -two_s_complement_32bit_sum(unsigned int* base, int size /* in bytes */) -{ - int i = 0; - unsigned int sum = 0; - - size /= sizeof(unsigned int); - for (i = 0; i < size; i++) - sum -= SGI_SSWAP32(base[i]); - return sum; -} - -static int -check_sgi_label(void) -{ - if (sizeof(sgilabel) > 512) { - fprintf(stderr, - _("According to MIPS Computer Systems, Inc the " - "Label must not contain more than 512 bytes\n")); - exit(1); - } - - if (sgilabel->magic != SGI_LABEL_MAGIC - && sgilabel->magic != SGI_LABEL_MAGIC_SWAPPED) { - current_label_type = label_dos; - return 0; - } - - sgi_other_endian = (sgilabel->magic == SGI_LABEL_MAGIC_SWAPPED); - /* - * test for correct checksum - */ - if (two_s_complement_32bit_sum((unsigned int*)sgilabel, - sizeof(*sgilabel))) { - fprintf(stderr, - _("Detected sgi disklabel with wrong checksum.\n")); - } - update_units(); - current_label_type = label_sgi; - partitions = 16; - sgi_volumes = 15; - return 1; -} - -static unsigned int -sgi_get_start_sector(int i) -{ - return SGI_SSWAP32(sgilabel->partitions[i].start_sector); -} - -static unsigned int -sgi_get_num_sectors(int i) -{ - return SGI_SSWAP32(sgilabel->partitions[i].num_sectors); -} - -static int -sgi_get_sysid(int i) -{ - return SGI_SSWAP32(sgilabel->partitions[i].id); -} - -static int -sgi_get_bootpartition(void) -{ - return SGI_SSWAP16(sgilabel->boot_part); -} - -static int -sgi_get_swappartition(void) -{ - return SGI_SSWAP16(sgilabel->swap_part); -} - -static void -sgi_list_table(int xtra) -{ - int i, w, wd; - int kpi = 0; /* kernel partition ID */ - - if(xtra) { - printf(_("\nDisk %s (SGI disk label): %d heads, %d sectors\n" - "%d cylinders, %d physical cylinders\n" - "%d extra sects/cyl, interleave %d:1\n" - "%s\n" - "Units = %s of %d * 512 bytes\n\n"), - disk_device, heads, sectors, cylinders, - SGI_SSWAP16(sgiparam.pcylcount), - SGI_SSWAP16(sgiparam.sparecyl), - SGI_SSWAP16(sgiparam.ilfact), - (char *)sgilabel, - str_units(PLURAL), units_per_sector); - } else { - printf( _("\nDisk %s (SGI disk label): " - "%d heads, %d sectors, %d cylinders\n" - "Units = %s of %d * 512 bytes\n\n"), - disk_device, heads, sectors, cylinders, - str_units(PLURAL), units_per_sector ); - } - - w = strlen(disk_device); - wd = strlen(_("Device")); - if (w < wd) - w = wd; - - printf(_("----- partitions -----\n" - "Pt# %*s Info Start End Sectors Id System\n"), - w + 2, _("Device")); - for (i = 0 ; i < partitions; i++) { - if( sgi_get_num_sectors(i) || debug ) { - uint32_t start = sgi_get_start_sector(i); - uint32_t len = sgi_get_num_sectors(i); - kpi++; /* only count nonempty partitions */ - printf( - "%2d: %s %4s %9ld %9ld %9ld %2x %s\n", -/* fdisk part number */ i+1, -/* device */ partname(disk_device, kpi, w+3), -/* flags */ (sgi_get_swappartition() == i) ? "swap" : -/* flags */ (sgi_get_bootpartition() == i) ? "boot" : " ", -/* start */ (long) scround(start), -/* end */ (long) scround(start+len)-1, -/* no odd flag on end */(long) len, -/* type id */ sgi_get_sysid(i), -/* type name */ partition_type(sgi_get_sysid(i))); - } - } - printf(_("----- Bootinfo -----\nBootfile: %s\n" - "----- Directory Entries -----\n"), - sgilabel->boot_file); - for (i = 0 ; i < sgi_volumes; i++) { - if (sgilabel->directory[i].vol_file_size) { - uint32_t start = SGI_SSWAP32(sgilabel->directory[i].vol_file_start); - uint32_t len = SGI_SSWAP32(sgilabel->directory[i].vol_file_size); - unsigned char *name = sgilabel->directory[i].vol_file_name; - - printf(_("%2d: %-10s sector%5u size%8u\n"), - i, (char*)name, (unsigned int) start, (unsigned int) len); - } - } -} - -static void -sgi_set_bootpartition(int i) -{ - sgilabel->boot_part = SGI_SSWAP16(((short)i)); -} - -static unsigned int -sgi_get_lastblock(void) -{ - return heads * sectors * cylinders; -} - -static void -sgi_set_swappartition(int i) -{ - sgilabel->swap_part = SGI_SSWAP16(((short)i)); -} - -static int -sgi_check_bootfile(const char* aFile) -{ - if (strlen(aFile) < 3) /* "/a\n" is minimum */ { - printf(_("\nInvalid Bootfile!\n" - "\tThe bootfile must be an absolute non-zero pathname,\n" - "\te.g. \"/unix\" or \"/unix.save\".\n")); - return 0; - } else { - if (strlen(aFile) > 16) { - printf(_("\n\tName of Bootfile too long: " - "16 bytes maximum.\n")); - return 0; - } else { - if (aFile[0] != '/') { - printf(_("\n\tBootfile must have a " - "fully qualified pathname.\n")); - return 0; - } - } - } - if (strncmp(aFile, (char*)sgilabel->boot_file, 16)) { - printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t" - "SGI's default is \"/unix\" and for backup \"/unix.save\".\n")); - /* filename is correct and did change */ - return 1; - } - return 0; /* filename did not change */ -} - -static const char * -sgi_get_bootfile(void) -{ - return (char*)sgilabel->boot_file; -} - -static void -sgi_set_bootfile(const char* aFile) -{ - int i = 0; - - if (sgi_check_bootfile(aFile)) { - while (i < 16) { - if ((aFile[i] != '\n') /* in principle caught again by next line */ - && (strlen(aFile) > i)) - sgilabel->boot_file[i] = aFile[i]; - else - sgilabel->boot_file[i] = 0; - i++; - } - printf(_("\n\tBootfile is changed to \"%s\".\n"), sgilabel->boot_file); - } -} - -static void -create_sgiinfo(void) -{ - /* I keep SGI's habit to write the sgilabel to the second block */ - sgilabel->directory[0].vol_file_start = SGI_SSWAP32(2); - sgilabel->directory[0].vol_file_size = SGI_SSWAP32(sizeof(sgiinfo)); - strcpy((char*)sgilabel->directory[0].vol_file_name, "sgilabel"); -} - -static sgiinfo *fill_sgiinfo(void); - -static void -sgi_write_table(void) -{ - sgilabel->csum = 0; - sgilabel->csum = SGI_SSWAP32(two_s_complement_32bit_sum( - (unsigned int*)sgilabel, sizeof(*sgilabel))); - assert(two_s_complement_32bit_sum( - (unsigned int*)sgilabel, sizeof(*sgilabel)) == 0); - - if (lseek(fd, 0, SEEK_SET) < 0) - fdisk_fatal(unable_to_seek); - if (write(fd, sgilabel, SECTOR_SIZE) != SECTOR_SIZE) - fdisk_fatal(unable_to_write); - if (!strncmp((char*)sgilabel->directory[0].vol_file_name, "sgilabel", 8)) { - /* - * keep this habit of first writing the "sgilabel". - * I never tested whether it works without (AN 981002). - */ - sgiinfo *info = fill_sgiinfo(); - int infostartblock = SGI_SSWAP32(sgilabel->directory[0].vol_file_start); - if (lseek(fd, infostartblock*SECTOR_SIZE, SEEK_SET) < 0) - fdisk_fatal(unable_to_seek); - if (write(fd, info, SECTOR_SIZE) != SECTOR_SIZE) - fdisk_fatal(unable_to_write); - free(info); - } -} - -static int -compare_start(int *x, int *y) -{ - /* - * sort according to start sectors - * and prefers largest partition: - * entry zero is entire disk entry - */ - unsigned int i = *x; - unsigned int j = *y; - unsigned int a = sgi_get_start_sector(i); - unsigned int b = sgi_get_start_sector(j); - unsigned int c = sgi_get_num_sectors(i); - unsigned int d = sgi_get_num_sectors(j); - - if (a == b) - return (d > c) ? 1 : (d == c) ? 0 : -1; - return (a > b) ? 1 : -1; -} - - -static int -verify_sgi(int verbose) -{ - int Index[16]; /* list of valid partitions */ - int sortcount = 0; /* number of used partitions, i.e. non-zero lengths */ - int entire = 0, i = 0; - unsigned int start = 0; - long long gap = 0; /* count unused blocks */ - unsigned int lastblock = sgi_get_lastblock(); - - clearfreelist(); - for (i = 0; i < 16; i++) { - if (sgi_get_num_sectors(i) != 0) { - Index[sortcount++] = i; - if (sgi_get_sysid(i) == ENTIRE_DISK) { - if (entire++ == 1) { - if (verbose) - printf(_("More than one entire disk entry present.\n")); - } - } - } - } - if (sortcount == 0) { - if (verbose) - printf(_("No partitions defined\n")); - return (lastblock > 0) ? 1 : (lastblock == 0) ? 0 : -1; - } - qsort(Index, sortcount, sizeof(Index[0]), (void*)compare_start); - if (sgi_get_sysid(Index[0]) == ENTIRE_DISK) { - if ((Index[0] != 10) && verbose) - printf(_("IRIX likes when Partition 11 covers the entire disk.\n")); - if ((sgi_get_start_sector(Index[0]) != 0) && verbose) - printf(_("The entire disk partition should start " - "at block 0,\n" - "not at diskblock %d.\n"), - sgi_get_start_sector(Index[0])); - if (debug) /* I do not understand how some disks fulfil it */ - if ((sgi_get_num_sectors(Index[0]) != lastblock) && verbose) - printf(_("The entire disk partition is only %d diskblock large,\n" - "but the disk is %d diskblocks long.\n"), - sgi_get_num_sectors(Index[0]), lastblock); - lastblock = sgi_get_num_sectors(Index[0]); - } else { - if (verbose) - printf(_("One Partition (#11) should cover the entire disk.\n")); - if (debug > 2) - printf("sysid=%d\tpartition=%d\n", - sgi_get_sysid(Index[0]), Index[0]+1); - } - for (i = 1, start = 0; i < sortcount; i++) { - int cylsize = sgi_get_nsect() * sgi_get_ntrks(); - - if ((sgi_get_start_sector(Index[i]) % cylsize) != 0) { - if (debug) /* I do not understand how some disks fulfil it */ - if (verbose) - printf(_("Partition %d does not start on cylinder boundary.\n"), - Index[i]+1); - } - if (sgi_get_num_sectors(Index[i]) % cylsize != 0) { - if (debug) /* I do not understand how some disks fulfil it */ - if (verbose) - printf(_("Partition %d does not end on cylinder boundary.\n"), - Index[i]+1); - } - /* We cannot handle several "entire disk" entries. */ - if (sgi_get_sysid(Index[i]) == ENTIRE_DISK) continue; - if (start > sgi_get_start_sector(Index[i])) { - if (verbose) - printf(_("The Partition %d and %d overlap by %d sectors.\n"), - Index[i-1]+1, Index[i]+1, - start - sgi_get_start_sector(Index[i])); - if (gap > 0) gap = -gap; - if (gap == 0) gap = -1; - } - if (start < sgi_get_start_sector(Index[i])) { - if (verbose) - printf(_("Unused gap of %8u sectors - sectors %8u-%u\n"), - sgi_get_start_sector(Index[i]) - start, - start, sgi_get_start_sector(Index[i])-1); - gap += sgi_get_start_sector(Index[i]) - start; - add2freelist(start, sgi_get_start_sector(Index[i])); - } - start = sgi_get_start_sector(Index[i]) - + sgi_get_num_sectors(Index[i]); - if (debug > 1) { - if (verbose) - printf("%2d:%12d\t%12d\t%12d\n", Index[i], - sgi_get_start_sector(Index[i]), - sgi_get_num_sectors(Index[i]), - sgi_get_sysid(Index[i])); - } - } - if (start < lastblock) { - if (verbose) - printf(_("Unused gap of %8u sectors - sectors %8u-%u\n"), - lastblock - start, start, lastblock-1); - gap += lastblock - start; - add2freelist(start, lastblock); - } - /* - * Done with arithmetics - * Go for details now - */ - if (verbose) { - if (!sgi_get_num_sectors(sgi_get_bootpartition())) { - printf(_("\nThe boot partition does not exist.\n")); - } - if (!sgi_get_num_sectors(sgi_get_swappartition())) { - printf(_("\nThe swap partition does not exist.\n")); - } else { - if ((sgi_get_sysid(sgi_get_swappartition()) != SGI_SWAP) - && (sgi_get_sysid(sgi_get_swappartition()) != LINUX_SWAP)) - printf(_("\nThe swap partition has no swap type.\n")); - } - if (sgi_check_bootfile("/unix")) - printf(_("\tYou have chosen an unusual boot file name.\n")); - } - return (gap > 0) ? 1 : (gap == 0) ? 0 : -1; -} - -static int -sgi_gaps(void) -{ - /* - * returned value is: - * = 0 : disk is properly filled to the rim - * < 0 : there is an overlap - * > 0 : there is still some vacant space - */ - return verify_sgi(0); -} - -static void -sgi_change_sysid(int i, int sys) -{ - if( sgi_get_num_sectors(i) == 0 ) { /* caught already before, ... */ - printf(_("Sorry You may change the Tag of non-empty partitions.\n")); - return; - } - if (((sys != ENTIRE_DISK ) && (sys != SGI_VOLHDR)) - && (sgi_get_start_sector(i) < 1) ) { - read_chars( - _("It is highly recommended that the partition at offset 0\n" - "is of type \"SGI volhdr\", the IRIX system will rely on it to\n" - "retrieve from its directory standalone tools like sash and fx.\n" - "Only the \"SGI volume\" entire disk section may violate this.\n" - "Type YES if you are sure about tagging this partition differently.\n")); - if (strcmp(line_ptr, _("YES\n"))) - return; - } - sgilabel->partitions[i].id = SGI_SSWAP32(sys); -} - -/* returns partition index of first entry marked as entire disk */ -static int -sgi_entire(void) -{ - int i; - - for (i = 0; i < 16; i++) - if (sgi_get_sysid(i) == SGI_VOLUME) - return i; - return -1; -} - -static void -sgi_set_partition(int i, unsigned int start, unsigned int length, int sys) -{ - sgilabel->partitions[i].id = SGI_SSWAP32(sys); - sgilabel->partitions[i].num_sectors = SGI_SSWAP32(length); - sgilabel->partitions[i].start_sector = SGI_SSWAP32(start); - set_changed(i); - if (sgi_gaps() < 0) /* rebuild freelist */ - printf(_("Do You know, You got a partition overlap on the disk?\n")); -} - -static void -sgi_set_entire(void) -{ - int n; - - for (n = 10; n < partitions; n++) { - if(!sgi_get_num_sectors(n) ) { - sgi_set_partition(n, 0, sgi_get_lastblock(), SGI_VOLUME); - break; - } - } -} - -static void -sgi_set_volhdr(void) -{ - int n; - - for (n = 8; n < partitions; n++) { - if (!sgi_get_num_sectors(n)) { - /* - * 5 cylinders is an arbitrary value I like - * IRIX 5.3 stored files in the volume header - * (like sash, symmon, fx, ide) with ca. 3200 - * sectors. - */ - if (heads * sectors * 5 < sgi_get_lastblock()) - sgi_set_partition(n, 0, heads * sectors * 5, SGI_VOLHDR); - break; - } - } -} - -static void -sgi_delete_partition(int i) -{ - sgi_set_partition(i, 0, 0, 0); -} - -static void -sgi_add_partition(int n, int sys) -{ - char mesg[256]; - unsigned int first = 0, last = 0; - - if (n == 10) { - sys = SGI_VOLUME; - } else if (n == 8) { - sys = 0; - } - if(sgi_get_num_sectors(n)) { - printf(_("Partition %d is already defined. Delete " - "it before re-adding it.\n"), n + 1); - return; - } - if ((sgi_entire() == -1) && (sys != SGI_VOLUME)) { - printf(_("Attempting to generate entire disk entry automatically.\n")); - sgi_set_entire(); - sgi_set_volhdr(); - } - if ((sgi_gaps() == 0) && (sys != SGI_VOLUME)) { - printf(_("The entire disk is already covered with partitions.\n")); - return; - } - if (sgi_gaps() < 0) { - printf(_("You got a partition overlap on the disk. Fix it first!\n")); - return; - } - snprintf(mesg, sizeof(mesg), _("First %s"), str_units(SINGULAR)); - while (1) { - if(sys == SGI_VOLUME) { - last = sgi_get_lastblock(); - first = read_int(0, 0, last-1, 0, mesg); - if (first != 0) { - printf(_("It is highly recommended that eleventh partition\n" - "covers the entire disk and is of type `SGI volume'\n")); - } - } else { - first = freelist[0].first; - last = freelist[0].last; - first = read_int(scround(first), scround(first), scround(last)-1, - 0, mesg); - } - if (display_in_cyl_units) - first *= units_per_sector; - else - first = first; /* align to cylinder if you know how ... */ - if(!last ) - last = isinfreelist(first); - if(last == 0) { - printf(_("You will get a partition overlap on the disk. " - "Fix it first!\n")); - } else - break; - } - snprintf(mesg, sizeof(mesg), _(" Last %s"), str_units(SINGULAR)); - last = read_int(scround(first), scround(last)-1, scround(last)-1, - scround(first), mesg)+1; - if (display_in_cyl_units) - last *= units_per_sector; - else - last = last; /* align to cylinder if You know how ... */ - if ( (sys == SGI_VOLUME) && (first != 0 || last != sgi_get_lastblock() ) ) - printf(_("It is highly recommended that eleventh partition\n" - "covers the entire disk and is of type `SGI volume'\n")); - sgi_set_partition(n, first, last-first, sys); -} - -#ifdef CONFIG_FEATURE_FDISK_ADVANCED -static void -create_sgilabel(void) -{ - struct hd_geometry geometry; - struct { - unsigned int start; - unsigned int nsect; - int sysid; - } old[4]; - int i = 0; - long longsectors; /* the number of sectors on the device */ - int res; /* the result from the ioctl */ - int sec_fac; /* the sector factor */ - - sec_fac = sector_size / 512; /* determine the sector factor */ - - fprintf( stderr, - _("Building a new SGI disklabel. Changes will remain in memory only,\n" - "until you decide to write them. After that, of course, the previous\n" - "content will be unrecoverably lost.\n\n")); - - sgi_other_endian = (BB_LITTLE_ENDIAN); - res = ioctl(fd, BLKGETSIZE, &longsectors); - if (!ioctl(fd, HDIO_GETGEO, &geometry)) { - heads = geometry.heads; - sectors = geometry.sectors; - if (res == 0) { - /* the get device size ioctl was successful */ - cylinders = longsectors / (heads * sectors); - cylinders /= sec_fac; - } else { - /* otherwise print error and use truncated version */ - cylinders = geometry.cylinders; - fprintf(stderr, - _("Warning: BLKGETSIZE ioctl failed on %s. " - "Using geometry cylinder value of %d.\n" - "This value may be truncated for devices" - " > 33.8 GB.\n"), disk_device, cylinders); - } - } - for (i = 0; i < 4; i++) { - old[i].sysid = 0; - if (valid_part_table_flag(MBRbuffer)) { - if(get_part_table(i)->sys_ind) { - old[i].sysid = get_part_table(i)->sys_ind; - old[i].start = get_start_sect(get_part_table(i)); - old[i].nsect = get_nr_sects(get_part_table(i)); - printf(_("Trying to keep parameters of partition %d.\n"), i); - if (debug) - printf(_("ID=%02x\tSTART=%d\tLENGTH=%d\n"), - old[i].sysid, old[i].start, old[i].nsect); - } - } - } - - memset(MBRbuffer, 0, sizeof(MBRbuffer)); - sgilabel->magic = SGI_SSWAP32(SGI_LABEL_MAGIC); - sgilabel->boot_part = SGI_SSWAP16(0); - sgilabel->swap_part = SGI_SSWAP16(1); - - /* sizeof(sgilabel->boot_file) = 16 > 6 */ - memset(sgilabel->boot_file, 0, 16); - strcpy((char*)sgilabel->boot_file, "/unix"); - - sgilabel->devparam.skew = (0); - sgilabel->devparam.gap1 = (0); - sgilabel->devparam.gap2 = (0); - sgilabel->devparam.sparecyl = (0); - sgilabel->devparam.pcylcount = SGI_SSWAP16(geometry.cylinders); - sgilabel->devparam.head_vol0 = SGI_SSWAP16(0); - sgilabel->devparam.ntrks = SGI_SSWAP16(geometry.heads); - /* tracks/cylinder (heads) */ - sgilabel->devparam.cmd_tag_queue_depth = (0); - sgilabel->devparam.unused0 = (0); - sgilabel->devparam.unused1 = SGI_SSWAP16(0); - sgilabel->devparam.nsect = SGI_SSWAP16(geometry.sectors); - /* sectors/track */ - sgilabel->devparam.bytes = SGI_SSWAP16(512); - sgilabel->devparam.ilfact = SGI_SSWAP16(1); - sgilabel->devparam.flags = SGI_SSWAP32(TRACK_FWD| - IGNORE_ERRORS|RESEEK); - sgilabel->devparam.datarate = SGI_SSWAP32(0); - sgilabel->devparam.retries_on_error = SGI_SSWAP32(1); - sgilabel->devparam.ms_per_word = SGI_SSWAP32(0); - sgilabel->devparam.xylogics_gap1 = SGI_SSWAP16(0); - sgilabel->devparam.xylogics_syncdelay = SGI_SSWAP16(0); - sgilabel->devparam.xylogics_readdelay = SGI_SSWAP16(0); - sgilabel->devparam.xylogics_gap2 = SGI_SSWAP16(0); - sgilabel->devparam.xylogics_readgate = SGI_SSWAP16(0); - sgilabel->devparam.xylogics_writecont = SGI_SSWAP16(0); - memset( &(sgilabel->directory), 0, sizeof(struct volume_directory)*15 ); - memset( &(sgilabel->partitions), 0, sizeof(struct sgi_partition)*16 ); - current_label_type = label_sgi; - partitions = 16; - sgi_volumes = 15; - sgi_set_entire(); - sgi_set_volhdr(); - for (i = 0; i < 4; i++) { - if(old[i].sysid) { - sgi_set_partition(i, old[i].start, old[i].nsect, old[i].sysid); - } - } -} - -static void -sgi_set_xcyl(void) -{ - /* do nothing in the beginning */ -} -#endif /* CONFIG_FEATURE_FDISK_ADVANCED */ - -/* _____________________________________________________________ - */ - -static sgiinfo * -fill_sgiinfo(void) -{ - sgiinfo *info = calloc(1, sizeof(sgiinfo)); - - info->magic = SGI_SSWAP32(SGI_INFO_MAGIC); - info->b1 = SGI_SSWAP32(-1); - info->b2 = SGI_SSWAP16(-1); - info->b3 = SGI_SSWAP16(1); - /* You may want to replace this string !!!!!!! */ - strcpy( (char*)info->scsi_string, "IBM OEM 0662S12 3 30" ); - strcpy( (char*)info->serial, "0000" ); - info->check1816 = SGI_SSWAP16(18*256 +16 ); - strcpy( (char*)info->installer, "Sfx version 5.3, Oct 18, 1994" ); - return info; -} -#endif /* SGI_LABEL */ - - -#ifdef CONFIG_FEATURE_SUN_LABEL -/* - * 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 - * Internationalization - */ - - -static int sun_other_endian; -static int scsi_disk; -static int floppy; - -#ifndef IDE0_MAJOR -#define IDE0_MAJOR 3 -#endif -#ifndef IDE1_MAJOR -#define IDE1_MAJOR 22 -#endif - -static void -guess_device_type(void) -{ - struct stat bootstat; - - if (fstat(fd, &bootstat) < 0) { - scsi_disk = 0; - floppy = 0; - } else if (S_ISBLK(bootstat.st_mode) - && (major(bootstat.st_rdev) == IDE0_MAJOR || - major(bootstat.st_rdev) == IDE1_MAJOR)) { - scsi_disk = 0; - floppy = 0; - } else if (S_ISBLK(bootstat.st_mode) - && major(bootstat.st_rdev) == FLOPPY_MAJOR) { - scsi_disk = 0; - floppy = 1; - } else { - scsi_disk = 1; - floppy = 0; - } -} - -static const struct systypes sun_sys_types[] = { - { "\x00" "Empty" }, /* 0 */ - { "\x01" "Boot" }, /* 1 */ - { "\x02" "SunOS root" }, /* 2 */ - { "\x03" "SunOS swap" }, /* SUNOS_SWAP */ - { "\x04" "SunOS usr" }, /* 4 */ - { "\x05" "Whole disk" }, /* WHOLE_DISK */ - { "\x06" "SunOS stand" }, /* 6 */ - { "\x07" "SunOS var" }, /* 7 */ - { "\x08" "SunOS home" }, /* 8 */ - { "\x82" "Linux swap" }, /* LINUX_SWAP */ - { "\x83" "Linux native" }, /* LINUX_NATIVE */ - { "\x8e" "Linux LVM" }, /* 0x8e */ -/* New (2.2.x) raid partition with autodetect using persistent superblock */ - { "\xfd" "Linux raid autodetect" }, /* 0xfd */ - { NULL } -}; - - -static void -set_sun_partition(int i, uint start, uint stop, int sysid) -{ - sunlabel->infos[i].id = sysid; - sunlabel->partitions[i].start_cylinder = - SUN_SSWAP32(start / (heads * sectors)); - sunlabel->partitions[i].num_sectors = - SUN_SSWAP32(stop - start); - set_changed(i); -} - -static int -check_sun_label(void) -{ - unsigned short *ush; - int csum; - - if (sunlabel->magic != SUN_LABEL_MAGIC - && sunlabel->magic != SUN_LABEL_MAGIC_SWAPPED) { - current_label_type = label_dos; - sun_other_endian = 0; - return 0; - } - sun_other_endian = (sunlabel->magic == SUN_LABEL_MAGIC_SWAPPED); - ush = ((unsigned short *) (sunlabel + 1)) - 1; - for (csum = 0; ush >= (unsigned short *)sunlabel;) csum ^= *ush--; - if (csum) { - fprintf(stderr,_("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)\n")); - } else { - heads = SUN_SSWAP16(sunlabel->ntrks); - cylinders = SUN_SSWAP16(sunlabel->ncyl); - sectors = SUN_SSWAP16(sunlabel->nsect); - } - update_units(); - current_label_type = label_sun; - partitions = 8; - return 1; -} - -static const struct sun_predefined_drives { - const char *vendor; - const char *model; - unsigned short sparecyl; - unsigned short ncyl; - unsigned short nacyl; - unsigned short pcylcount; - unsigned short ntrks; - unsigned short nsect; - unsigned short rspeed; -} sun_drives[] = { - { "Quantum","ProDrive 80S",1,832,2,834,6,34,3662}, - { "Quantum","ProDrive 105S",1,974,2,1019,6,35,3662}, - { "CDC","Wren IV 94171-344",3,1545,2,1549,9,46,3600}, - { "IBM","DPES-31080",0,4901,2,4903,4,108,5400}, - { "IBM","DORS-32160",0,1015,2,1017,67,62,5400}, - { "IBM","DNES-318350",0,11199,2,11474,10,320,7200}, - { "SEAGATE","ST34371",0,3880,2,3882,16,135,7228}, - { "","SUN0104",1,974,2,1019,6,35,3662}, - { "","SUN0207",4,1254,2,1272,9,36,3600}, - { "","SUN0327",3,1545,2,1549,9,46,3600}, - { "","SUN0340",0,1538,2,1544,6,72,4200}, - { "","SUN0424",2,1151,2,2500,9,80,4400}, - { "","SUN0535",0,1866,2,2500,7,80,5400}, - { "","SUN0669",5,1614,2,1632,15,54,3600}, - { "","SUN1.0G",5,1703,2,1931,15,80,3597}, - { "","SUN1.05",0,2036,2,2038,14,72,5400}, - { "","SUN1.3G",6,1965,2,3500,17,80,5400}, - { "","SUN2.1G",0,2733,2,3500,19,80,5400}, - { "IOMEGA","Jaz",0,1019,2,1021,64,32,5394}, -}; - -static const struct sun_predefined_drives * -sun_autoconfigure_scsi(void) -{ - const struct sun_predefined_drives *p = NULL; - -#ifdef SCSI_IOCTL_GET_IDLUN - unsigned int id[2]; - char buffer[2048]; - char buffer2[2048]; - FILE *pfd; - char *vendor; - char *model; - char *q; - int i; - - if (!ioctl(fd, SCSI_IOCTL_GET_IDLUN, &id)) { - sprintf(buffer, - "Host: scsi%d Channel: %02d Id: %02d Lun: %02d\n", - /* This is very wrong (works only if you have one HBA), - but I haven't found a way how to get hostno - from the current kernel */ - 0, - (id[0]>>16) & 0xff, - id[0] & 0xff, - (id[0]>>8) & 0xff - ); - pfd = fopen("/proc/scsi/scsi","r"); - if (pfd) { - while (fgets(buffer2, 2048, pfd)) { - if (!strcmp(buffer, buffer2)) { - if (fgets(buffer2,2048,pfd)) { - q = strstr(buffer2,"Vendor: "); - if (q) { - q += 8; - vendor = q; - q = strstr(q," "); - *q++ = 0; /* truncate vendor name */ - q = strstr(q,"Model: "); - if (q) { - *q = 0; - q += 7; - model = q; - q = strstr(q," Rev: "); - if (q) { - *q = 0; - for (i = 0; i < SIZE(sun_drives); i++) { - if (*sun_drives[i].vendor && strcasecmp(sun_drives[i].vendor, vendor)) - continue; - if (!strstr(model, sun_drives[i].model)) - continue; - printf(_("Autoconfigure found a %s%s%s\n"),sun_drives[i].vendor,(*sun_drives[i].vendor) ? " " : "",sun_drives[i].model); - p = sun_drives + i; - break; - } - } - } - } - } - break; - } - } - fclose(pfd); - } - } -#endif - return p; -} - -static void -create_sunlabel(void) -{ - struct hd_geometry geometry; - unsigned int ndiv; - int i; - unsigned char c; - const struct sun_predefined_drives *p = NULL; - - fprintf(stderr, - _("Building a new sun disklabel. Changes will remain in memory only,\n" - "until you decide to write them. After that, of course, the previous\n" - "content won't be recoverable.\n\n")); - sun_other_endian = BB_LITTLE_ENDIAN; - memset(MBRbuffer, 0, sizeof(MBRbuffer)); - sunlabel->magic = SUN_SSWAP16(SUN_LABEL_MAGIC); - if (!floppy) { - puts(_("Drive type\n" - " ? auto configure\n" - " 0 custom (with hardware detected defaults)")); - for (i = 0; i < SIZE(sun_drives); i++) { - printf(" %c %s%s%s\n", - i + 'a', sun_drives[i].vendor, - (*sun_drives[i].vendor) ? " " : "", - sun_drives[i].model); - } - while (1) { - c = read_char(_("Select type (? for auto, 0 for custom): ")); - if (c >= 'a' && c < 'a' + SIZE(sun_drives)) { - p = sun_drives + c - 'a'; - break; - } else if (c >= 'A' && c < 'A' + SIZE(sun_drives)) { - p = sun_drives + c - 'A'; - break; - } else if (c == '0') { - break; - } else if (c == '?' && scsi_disk) { - p = sun_autoconfigure_scsi(); - if (!p) - printf(_("Autoconfigure failed.\n")); - else - break; - } - } - } - if (!p || floppy) { - if (!ioctl(fd, HDIO_GETGEO, &geometry)) { - heads = geometry.heads; - sectors = geometry.sectors; - cylinders = geometry.cylinders; - } else { - heads = 0; - sectors = 0; - cylinders = 0; - } - if (floppy) { - sunlabel->nacyl = 0; - sunlabel->pcylcount = SUN_SSWAP16(cylinders); - sunlabel->rspeed = SUN_SSWAP16(300); - sunlabel->ilfact = SUN_SSWAP16(1); - sunlabel->sparecyl = 0; - } else { - heads = read_int(1,heads,1024,0,_("Heads")); - sectors = read_int(1,sectors,1024,0,_("Sectors/track")); - if (cylinders) - cylinders = read_int(1,cylinders-2,65535,0,_("Cylinders")); - else - cylinders = read_int(1,0,65535,0,_("Cylinders")); - sunlabel->nacyl = SUN_SSWAP16(read_int(0,2,65535,0, _("Alternate cylinders"))); - sunlabel->pcylcount = SUN_SSWAP16(read_int(0,cylinders+SUN_SSWAP16(sunlabel->nacyl), 65535,0, _("Physical cylinders"))); - sunlabel->rspeed = SUN_SSWAP16(read_int(1,5400,100000,0, _("Rotation speed (rpm)"))); - sunlabel->ilfact = SUN_SSWAP16(read_int(1,1,32,0, _("Interleave factor"))); - sunlabel->sparecyl = SUN_SSWAP16(read_int(0,0,sectors,0, _("Extra sectors per cylinder"))); - } - } else { - sunlabel->sparecyl = SUN_SSWAP16(p->sparecyl); - sunlabel->ncyl = SUN_SSWAP16(p->ncyl); - sunlabel->nacyl = SUN_SSWAP16(p->nacyl); - sunlabel->pcylcount = SUN_SSWAP16(p->pcylcount); - sunlabel->ntrks = SUN_SSWAP16(p->ntrks); - sunlabel->nsect = SUN_SSWAP16(p->nsect); - sunlabel->rspeed = SUN_SSWAP16(p->rspeed); - sunlabel->ilfact = SUN_SSWAP16(1); - cylinders = p->ncyl; - heads = p->ntrks; - sectors = p->nsect; - puts(_("You may change all the disk params from the x menu")); - } - - snprintf((char *)(sunlabel->info), sizeof(sunlabel->info), - "%s%s%s cyl %d alt %d hd %d sec %d", - p ? p->vendor : "", (p && *p->vendor) ? " " : "", - p ? p->model : (floppy ? _("3,5\" floppy") : _("Linux custom")), - cylinders, SUN_SSWAP16(sunlabel->nacyl), heads, sectors); - - sunlabel->ntrks = SUN_SSWAP16(heads); - sunlabel->nsect = SUN_SSWAP16(sectors); - sunlabel->ncyl = SUN_SSWAP16(cylinders); - if (floppy) - set_sun_partition(0, 0, cylinders * heads * sectors, LINUX_NATIVE); - else { - if (cylinders * heads * sectors >= 150 * 2048) { - ndiv = cylinders - (50 * 2048 / (heads * sectors)); /* 50M swap */ - } else - ndiv = cylinders * 2 / 3; - set_sun_partition(0, 0, ndiv * heads * sectors, LINUX_NATIVE); - set_sun_partition(1, ndiv * heads * sectors, cylinders * heads * sectors, LINUX_SWAP); - sunlabel->infos[1].flags |= 0x01; /* Not mountable */ - } - set_sun_partition(2, 0, cylinders * heads * sectors, WHOLE_DISK); - { - unsigned short *ush = (unsigned short *)sunlabel; - unsigned short csum = 0; - while (ush < (unsigned short *)(&sunlabel->csum)) - csum ^= *ush++; - sunlabel->csum = csum; - } - - set_all_unchanged(); - set_changed(0); - get_boot(create_empty_sun); -} - -static void -toggle_sunflags(int i, unsigned char mask) -{ - if (sunlabel->infos[i].flags & mask) - sunlabel->infos[i].flags &= ~mask; - else - sunlabel->infos[i].flags |= mask; - set_changed(i); -} - -static void -fetch_sun(uint *starts, uint *lens, uint *start, uint *stop) -{ - int i, continuous = 1; - - *start = 0; - *stop = cylinders * heads * sectors; - for (i = 0; i < partitions; i++) { - if (sunlabel->partitions[i].num_sectors - && sunlabel->infos[i].id - && sunlabel->infos[i].id != WHOLE_DISK) { - starts[i] = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors; - lens[i] = SUN_SSWAP32(sunlabel->partitions[i].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 uint *verify_sun_starts; - -static int -verify_sun_cmp(int *a, int *b) -{ - if (*a == -1) return 1; - if (*b == -1) return -1; - if (verify_sun_starts[*a] > verify_sun_starts[*b]) return 1; - return -1; -} - -static void -verify_sun(void) -{ - uint starts[8], lens[8], start, stop; - int i,j,k,starto,endo; - int array[8]; - - verify_sun_starts = starts; - fetch_sun(starts,lens,&start,&stop); - for (k = 0; k < 7; k++) { - for (i = 0; i < 8; i++) { - if (k && (lens[i] % (heads * sectors))) { - printf(_("Partition %d doesn't end on cylinder boundary\n"), 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]; - printf(_("Partition %d overlaps with others in " - "sectors %d-%d\n"), i+1, starto, endo); - } - } - } - } - } - } - for (i = 0; i < 8; i++) { - if (lens[i]) - array[i] = i; - else - array[i] = -1; - } - qsort(array,SIZE(array),sizeof(array[0]), - (int (*)(const void *,const void *)) verify_sun_cmp); - if (array[0] == -1) { - printf(_("No partitions defined\n")); - return; + +enum { + dev_fd = 3 /* the disk */ +}; + +/* Globals */ +struct globals { + char *line_ptr; + + const char *disk_device; + int g_partitions; // = 4; /* maximum partition + 1 */ + unsigned units_per_sector; // = 1; + unsigned sector_size; // = DEFAULT_SECTOR_SIZE; + unsigned user_set_sector_size; + unsigned sector_offset; // = 1; + unsigned g_heads, g_sectors, g_cylinders; + smallint /* enum label_type */ current_label_type; + smallint display_in_cyl_units; // = 1; +#if ENABLE_FEATURE_OSF_LABEL + smallint possibly_osf_label; +#endif + + smallint listing; /* no aborts for fdisk -l */ + smallint dos_compatible_flag; // = 1; +#if ENABLE_FEATURE_FDISK_WRITABLE + //int dos_changed; + smallint nowarn; /* no warnings for fdisk -l/-s */ +#endif + int ext_index; /* the prime extended partition */ + unsigned user_cylinders, user_heads, user_sectors; + unsigned pt_heads, pt_sectors; + unsigned kern_heads, kern_sectors; + sector_t extended_offset; /* offset of link pointers */ + sector_t total_number_of_sectors; + + jmp_buf listingbuf; + char line_buffer[80]; + /* Raw disk label. For DOS-type partition tables the MBR, + * with descriptions of the primary partitions. */ + char MBRbuffer[MAX_SECTOR_SIZE]; + /* Partition tables */ + struct pte ptes[MAXIMUM_PARTS]; +}; +#define G (*ptr_to_globals) +#define line_ptr (G.line_ptr ) +#define disk_device (G.disk_device ) +#define g_partitions (G.g_partitions ) +#define units_per_sector (G.units_per_sector ) +#define sector_size (G.sector_size ) +#define user_set_sector_size (G.user_set_sector_size) +#define sector_offset (G.sector_offset ) +#define g_heads (G.g_heads ) +#define g_sectors (G.g_sectors ) +#define g_cylinders (G.g_cylinders ) +#define current_label_type (G.current_label_type ) +#define display_in_cyl_units (G.display_in_cyl_units) +#define possibly_osf_label (G.possibly_osf_label ) +#define listing (G.listing ) +#define dos_compatible_flag (G.dos_compatible_flag ) +#define nowarn (G.nowarn ) +#define ext_index (G.ext_index ) +#define user_cylinders (G.user_cylinders ) +#define user_heads (G.user_heads ) +#define user_sectors (G.user_sectors ) +#define pt_heads (G.pt_heads ) +#define pt_sectors (G.pt_sectors ) +#define kern_heads (G.kern_heads ) +#define kern_sectors (G.kern_sectors ) +#define extended_offset (G.extended_offset ) +#define total_number_of_sectors (G.total_number_of_sectors) +#define listingbuf (G.listingbuf ) +#define line_buffer (G.line_buffer ) +#define MBRbuffer (G.MBRbuffer ) +#define ptes (G.ptes ) +#define INIT_G() do { \ + SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ + sector_size = DEFAULT_SECTOR_SIZE; \ + sector_offset = 1; \ + g_partitions = 4; \ + display_in_cyl_units = 1; \ + units_per_sector = 1; \ + dos_compatible_flag = 1; \ +} while (0) + + +/* TODO: move to libbb? */ +/* TODO: return unsigned long long, FEATURE_FDISK_BLKSIZE _can_ handle + * disks > 2^32 sectors + */ +static sector_t bb_BLKGETSIZE_sectors(int fd) +{ + uint64_t v64; + unsigned long longsectors; + + if (ioctl(fd, BLKGETSIZE64, &v64) == 0) { + /* Got bytes, convert to 512 byte sectors */ + v64 >>= 9; + if (v64 != (sector_t)v64) { + ret_trunc: + /* Not only DOS, but all other partition tables + * we support can't record more than 32 bit + * sector counts or offsets + */ + bb_error_msg("device has more than 2^32 sectors, can't use all of them"); + v64 = (uint32_t)-1L; + } + return v64; + } + /* Needs temp of type long */ + if (ioctl(fd, BLKGETSIZE, &longsectors)) { + /* Perhaps this is a disk image */ + off_t sz = lseek(fd, 0, SEEK_END); + longsectors = 0; + if (sz > 0) + longsectors = (uoff_t)sz / sector_size; + lseek(fd, 0, SEEK_SET); } - stop = cylinders * heads * sectors; - if (starts[array[0]]) - printf(_("Unused gap - sectors 0-%d\n"),starts[array[0]]); - for (i = 0; i < 7 && array[i+1] != -1; i++) { - printf(_("Unused gap - sectors %d-%d\n"),starts[array[i]]+lens[array[i]],starts[array[i+1]]); + if (sizeof(long) > sizeof(sector_t) + && longsectors != (sector_t)longsectors + ) { + goto ret_trunc; } - start = starts[array[i]] + lens[array[i]]; - if (start < stop) - printf(_("Unused gap - sectors %d-%d\n"),start,stop); + return longsectors; } -static void -add_sun_partition(int n, int sys) -{ - uint start, stop, stop2; - uint starts[8], lens[8]; - int whole_disk = 0; - char mesg[256]; - int i, first, last; +#define IS_EXTENDED(i) \ + ((i) == EXTENDED || (i) == WIN98_EXTENDED || (i) == LINUX_EXTENDED) - if (sunlabel->partitions[n].num_sectors && sunlabel->infos[n].id) { - printf(_("Partition %d is already defined. Delete " - "it before re-adding it.\n"), n + 1); - return; - } +#define cround(n) (display_in_cyl_units ? ((n)/units_per_sector)+1 : (n)) - fetch_sun(starts,lens,&start,&stop); - if (stop <= start) { - if (n == 2) - whole_disk = 1; - else { - printf(_("Other partitions already cover the whole disk.\nDelete " - "some/shrink them before retry.\n")); - return; - } - } - snprintf(mesg, sizeof(mesg), _("First %s"), str_units(SINGULAR)); - while (1) { - if (whole_disk) - first = read_int(0, 0, 0, 0, mesg); - else - first = read_int(scround(start), scround(stop)+1, - scround(stop), 0, mesg); - if (display_in_cyl_units) - first *= units_per_sector; - else - /* Starting sector has to be properly aligned */ - first = (first + heads * sectors - 1) / (heads * sectors); - if (n == 2 && first != 0) - printf("\ -It is highly recommended that the third partition covers the whole disk\n\ -and is of type `Whole disk'\n"); - /* 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 < partitions; i++) - if (lens[i] && starts[i] <= first && starts[i] + lens[i] > first) - break; - if (i < partitions && !whole_disk) { - if (n == 2 && !first) { - whole_disk = 1; - break; - } - printf(_("Sector %d is already allocated\n"), first); - } else - break; - } - stop = cylinders * heads * sectors; - stop2 = stop; - for (i = 0; i < partitions; i++) { - if (starts[i] > first && starts[i] < stop) - stop = starts[i]; - } - snprintf(mesg, sizeof(mesg), - _("Last %s or +size or +sizeM or +sizeK"), - str_units(SINGULAR)); - if (whole_disk) - last = read_int(scround(stop2), scround(stop2), scround(stop2), - 0, mesg); - else if (n == 2 && !first) - last = read_int(scround(first), scround(stop2), scround(stop2), - scround(first), mesg); - else - last = read_int(scround(first), scround(stop), scround(stop), - scround(first), mesg); - if (display_in_cyl_units) - last *= units_per_sector; - if (n == 2 && !first) { - if (last >= stop2) { - whole_disk = 1; - last = stop2; - } else if (last > stop) { - printf(_("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\n"), - scround(last), str_units(SINGULAR), - scround(stop), str_units(SINGULAR)); - last = stop; - } - } else if (!whole_disk && last > stop) - last = stop; +#define scround(x) (((x)+units_per_sector-1)/units_per_sector) - if (whole_disk) - sys = WHOLE_DISK; - set_sun_partition(n, first, last, sys); -} +#define pt_offset(b, n) \ + ((struct partition *)((b) + 0x1be + (n) * sizeof(struct partition))) -static void -sun_delete_partition(int i) -{ - unsigned int nsec; - - if (i == 2 - && sunlabel->infos[i].id == WHOLE_DISK - && !sunlabel->partitions[i].start_cylinder - && (nsec = SUN_SSWAP32(sunlabel->partitions[i].num_sectors)) == heads * sectors * cylinders) - printf(_("If you want to maintain SunOS/Solaris compatibility, " - "consider leaving this\n" - "partition as Whole disk (5), starting at 0, with %u " - "sectors\n"), nsec); - sunlabel->infos[i].id = 0; - sunlabel->partitions[i].num_sectors = 0; -} +#define sector(s) ((s) & 0x3f) + +#define cylinder(s, c) ((c) | (((s) & 0xc0) << 2)) static void -sun_change_sysid(int i, int sys) +close_dev_fd(void) { - if (sys == LINUX_SWAP && !sunlabel->partitions[i].start_cylinder) { - read_chars( - _("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" - "Type YES if you're very sure you would like that partition\n" - "tagged with 82 (Linux swap): ")); - if (strcmp (line_ptr, _("YES\n"))) - return; - } - switch (sys) { - case SUNOS_SWAP: - case LINUX_SWAP: - /* swaps are not mountable by default */ - sunlabel->infos[i].flags |= 0x01; - break; - default: - /* assume other types are mountable; - user can change it anyway */ - sunlabel->infos[i].flags &= ~0x01; - break; - } - sunlabel->infos[i].id = sys; + /* Not really closing, but making sure it is open, and to harmless place */ + xmove_fd(xopen(bb_dev_null, O_RDONLY), dev_fd); } -static void -sun_list_table(int xtra) +/* Return partition name */ +static const char * +partname(const char *dev, int pno, int lth) { - int i, w; + const char *p; + int w, wp; + int bufsiz; + char *bufp; - w = strlen(disk_device); - if (xtra) - printf( - _("\nDisk %s (Sun disk label): %d heads, %d sectors, %d rpm\n" - "%d cylinders, %d alternate cylinders, %d physical cylinders\n" - "%d extra sects/cyl, interleave %d:1\n" - "%s\n" - "Units = %s of %d * 512 bytes\n\n"), - disk_device, heads, sectors, SUN_SSWAP16(sunlabel->rspeed), - cylinders, SUN_SSWAP16(sunlabel->nacyl), - SUN_SSWAP16(sunlabel->pcylcount), - SUN_SSWAP16(sunlabel->sparecyl), - SUN_SSWAP16(sunlabel->ilfact), - (char *)sunlabel, - str_units(PLURAL), units_per_sector); - else - printf( - _("\nDisk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n" - "Units = %s of %d * 512 bytes\n\n"), - disk_device, heads, sectors, cylinders, - str_units(PLURAL), units_per_sector); - - printf(_("%*s Flag Start End Blocks Id System\n"), - w + 1, _("Device")); - for (i = 0 ; i < partitions; i++) { - if (sunlabel->partitions[i].num_sectors) { - uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors; - uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors); - printf("%s %c%c %9ld %9ld %9ld%c %2x %s\n", - partname(disk_device, i+1, w), /* device */ - (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ', /* flags */ - (sunlabel->infos[i].flags & 0x10) ? 'r' : ' ', - (long) scround(start), /* start */ - (long) scround(start+len), /* end */ - (long) len / 2, len & 1 ? '+' : ' ', /* odd flag on end */ - sunlabel->infos[i].id, /* type id */ - partition_type(sunlabel->infos[i].id)); /* type name */ - } + bufp = auto_string(xzalloc(80)); + bufsiz = 80; + + w = strlen(dev); + p = ""; + + if (isdigit(dev[w-1])) + p = "p"; + + /* devfs kludge - note: fdisk partition names are not supposed + to equal kernel names, so there is no reason to do this */ + if (strcmp(dev + w - 4, "disc") == 0) { + w -= 4; + p = "part"; } -} -#ifdef CONFIG_FEATURE_FDISK_ADVANCED + wp = strlen(p); -static void -sun_set_alt_cyl(void) -{ - sunlabel->nacyl = - SUN_SSWAP16(read_int(0,SUN_SSWAP16(sunlabel->nacyl), 65535, 0, - _("Number of alternate cylinders"))); + if (lth) { + snprintf(bufp, bufsiz, "%*.*s%s%-2u", + lth-wp-2, w, dev, p, pno); + } else { + snprintf(bufp, bufsiz, "%.*s%s%-2u", w, dev, p, pno); + } + return bufp; } -static void -sun_set_ncyl(int cyl) +static ALWAYS_INLINE struct partition * +get_part_table(int i) { - sunlabel->ncyl = SUN_SSWAP16(cyl); + return ptes[i].part_table; } -static void -sun_set_xcyl(void) -{ - sunlabel->sparecyl = - SUN_SSWAP16(read_int(0, SUN_SSWAP16(sunlabel->sparecyl), sectors, 0, - _("Extra sectors per cylinder"))); +static const char * +str_units(int n) +{ /* n==1: use singular */ + if (n == 1) + return display_in_cyl_units ? "cylinder" : "sector"; + return display_in_cyl_units ? "cylinders" : "sectors"; } -static void -sun_set_ilfact(void) +static int +valid_part_table_flag(const char *mbuffer) { - sunlabel->ilfact = - SUN_SSWAP16(read_int(1, SUN_SSWAP16(sunlabel->ilfact), 32, 0, - _("Interleave factor"))); + return (mbuffer[510] == 0x55 && (uint8_t)mbuffer[511] == 0xaa); } -static void -sun_set_rspeed(void) +static void fdisk_fatal(const char *why) { - sunlabel->rspeed = - SUN_SSWAP16(read_int(1, SUN_SSWAP16(sunlabel->rspeed), 100000, 0, - _("Rotation speed (rpm)"))); + if (listing) { + close_dev_fd(); + longjmp(listingbuf, 1); + } + bb_error_msg_and_die(why, disk_device); } static void -sun_set_pcylcount(void) +seek_sector(sector_t secno) { - sunlabel->pcylcount = - SUN_SSWAP16(read_int(0, SUN_SSWAP16(sunlabel->pcylcount), 65535, 0, - _("Number of physical cylinders"))); +#if ENABLE_FDISK_SUPPORT_LARGE_DISKS + off64_t off = (off64_t)secno * sector_size; + if (lseek64(dev_fd, off, SEEK_SET) == (off64_t) -1) + fdisk_fatal(unable_to_seek); +#else + uint64_t off = (uint64_t)secno * sector_size; + if (off > MAXINT(off_t) + || lseek(dev_fd, (off_t)off, SEEK_SET) == (off_t) -1 + ) { + fdisk_fatal(unable_to_seek); + } +#endif } -#endif /* CONFIG_FEATURE_FDISK_ADVANCED */ -static void -sun_write_table(void) +#if ENABLE_FEATURE_FDISK_WRITABLE +/* Read line; return 0 or first printable char */ +static int +read_line(const char *prompt) { - unsigned short *ush = (unsigned short *)sunlabel; - unsigned short csum = 0; + int sz; - while (ush < (unsigned short *)(&sunlabel->csum)) - csum ^= *ush++; - sunlabel->csum = csum; - if (lseek(fd, 0, SEEK_SET) < 0) - fdisk_fatal(unable_to_seek); - if (write(fd, sunlabel, SECTOR_SIZE) != SECTOR_SIZE) - fdisk_fatal(unable_to_write); -} -#endif /* SUN_LABEL */ + sz = read_line_input(NULL, prompt, line_buffer, sizeof(line_buffer), /*timeout*/ -1); + if (sz <= 0) + exit(EXIT_SUCCESS); /* Ctrl-D or Ctrl-C */ -/* DOS partition types */ + if (line_buffer[sz-1] == '\n') + line_buffer[--sz] = '\0'; -static const struct systypes i386_sys_types[] = { - { "\x00" "Empty" }, - { "\x01" "FAT12" }, - { "\x04" "FAT16 <32M" }, - { "\x05" "Extended" }, /* DOS 3.3+ extended partition */ - { "\x06" "FAT16" }, /* DOS 16-bit >=32M */ - { "\x07" "HPFS/NTFS" }, /* OS/2 IFS, eg, HPFS or NTFS or QNX */ - { "\x0a" "OS/2 Boot Manager" },/* OS/2 Boot Manager */ - { "\x0b" "Win95 FAT32" }, - { "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is `Extended Int 13h' */ - { "\x0e" "Win95 FAT16 (LBA)" }, - { "\x0f" "Win95 Ext'd (LBA)" }, - { "\x11" "Hidden FAT12" }, - { "\x12" "Compaq diagnostics" }, - { "\x14" "Hidden FAT16 <32M" }, - { "\x16" "Hidden FAT16" }, - { "\x17" "Hidden HPFS/NTFS" }, - { "\x1b" "Hidden Win95 FAT32" }, - { "\x1c" "Hidden Win95 FAT32 (LBA)" }, - { "\x1e" "Hidden Win95 FAT16 (LBA)" }, - { "\x3c" "PartitionMagic recovery" }, - { "\x41" "PPC PReP Boot" }, - { "\x42" "SFS" }, - { "\x63" "GNU HURD or SysV" }, /* GNU HURD or Mach or Sys V/386 (such as ISC UNIX) */ - { "\x80" "Old Minix" }, /* Minix 1.4a and earlier */ - { "\x81" "Minix / old Linux" },/* Minix 1.4b and later */ - { "\x82" "Linux swap" }, /* also Solaris */ - { "\x83" "Linux" }, - { "\x84" "OS/2 hidden C: drive" }, - { "\x85" "Linux extended" }, - { "\x86" "NTFS volume set" }, - { "\x87" "NTFS volume set" }, - { "\x8e" "Linux LVM" }, - { "\x9f" "BSD/OS" }, /* BSDI */ - { "\xa0" "IBM Thinkpad hibernation" }, - { "\xa5" "FreeBSD" }, /* various BSD flavours */ - { "\xa6" "OpenBSD" }, - { "\xa8" "Darwin UFS" }, - { "\xa9" "NetBSD" }, - { "\xab" "Darwin boot" }, - { "\xb7" "BSDI fs" }, - { "\xb8" "BSDI swap" }, - { "\xbe" "Solaris boot" }, - { "\xeb" "BeOS fs" }, - { "\xee" "EFI GPT" }, /* Intel EFI GUID Partition Table */ - { "\xef" "EFI (FAT-12/16/32)" },/* Intel EFI System Partition */ - { "\xf0" "Linux/PA-RISC boot" },/* Linux/PA-RISC boot loader */ - { "\xf2" "DOS secondary" }, /* DOS 3.3+ secondary */ - { "\xfd" "Linux raid autodetect" },/* New (2.2.x) raid partition with - autodetect using persistent - superblock */ -#ifdef CONFIG_WEIRD_PARTITION_TYPES - { "\x02" "XENIX root" }, - { "\x03" "XENIX usr" }, - { "\x08" "AIX" }, /* AIX boot (AIX -- PS/2 port) or SplitDrive */ - { "\x09" "AIX bootable" }, /* AIX data or Coherent */ - { "\x10" "OPUS" }, - { "\x18" "AST SmartSleep" }, - { "\x24" "NEC DOS" }, - { "\x39" "Plan 9" }, - { "\x40" "Venix 80286" }, - { "\x4d" "QNX4.x" }, - { "\x4e" "QNX4.x 2nd part" }, - { "\x4f" "QNX4.x 3rd part" }, - { "\x50" "OnTrack DM" }, - { "\x51" "OnTrack DM6 Aux1" }, /* (or Novell) */ - { "\x52" "CP/M" }, /* CP/M or Microport SysV/AT */ - { "\x53" "OnTrack DM6 Aux3" }, - { "\x54" "OnTrackDM6" }, - { "\x55" "EZ-Drive" }, - { "\x56" "Golden Bow" }, - { "\x5c" "Priam Edisk" }, - { "\x61" "SpeedStor" }, - { "\x64" "Novell Netware 286" }, - { "\x65" "Novell Netware 386" }, - { "\x70" "DiskSecure Multi-Boot" }, - { "\x75" "PC/IX" }, - { "\x93" "Amoeba" }, - { "\x94" "Amoeba BBT" }, /* (bad block table) */ - { "\xa7" "NeXTSTEP" }, - { "\xbb" "Boot Wizard hidden" }, - { "\xc1" "DRDOS/sec (FAT-12)" }, - { "\xc4" "DRDOS/sec (FAT-16 < 32M)" }, - { "\xc6" "DRDOS/sec (FAT-16)" }, - { "\xc7" "Syrinx" }, - { "\xda" "Non-FS data" }, - { "\xdb" "CP/M / CTOS / ..." },/* CP/M or Concurrent CP/M or - Concurrent DOS or CTOS */ - { "\xde" "Dell Utility" }, /* Dell PowerEdge Server utilities */ - { "\xdf" "BootIt" }, /* BootIt EMBRM */ - { "\xe1" "DOS access" }, /* DOS access or SpeedStor 12-bit FAT - extended partition */ - { "\xe3" "DOS R/O" }, /* DOS R/O or SpeedStor */ - { "\xe4" "SpeedStor" }, /* SpeedStor 16-bit FAT extended - partition < 1024 cyl. */ - { "\xf1" "SpeedStor" }, - { "\xf4" "SpeedStor" }, /* SpeedStor large partition */ - { "\xfe" "LANstep" }, /* SpeedStor >1024 cyl. or LANstep */ - { "\xff" "BBT" }, /* Xenix Bad Block Table */ -#endif - { 0 } -}; + line_ptr = line_buffer; + while (*line_ptr != '\0' && (unsigned char)*line_ptr <= ' ') + line_ptr++; + return *line_ptr; +} +static void +set_all_unchanged(void) +{ + int i; + for (i = 0; i < MAXIMUM_PARTS; i++) + ptes[i].changed = 0; +} -/* A valid partition table sector ends in 0x55 0xaa */ -static unsigned int -part_table_flag(const char *b) +static ALWAYS_INLINE void +set_changed(int i) { - return ((uint) b[510]) + (((uint) b[511]) << 8); + ptes[i].changed = 1; } - -#ifdef CONFIG_FEATURE_FDISK_WRITABLE -static void +static ALWAYS_INLINE void write_part_table_flag(char *b) { b[510] = 0x55; b[511] = 0xaa; } -/* start_sect and nr_sects are stored little endian on all machines */ -/* moreover, they are not aligned correctly */ -static void -store4_little_endian(unsigned char *cp, unsigned int val) -{ - cp[0] = (val & 0xff); - cp[1] = ((val >> 8) & 0xff); - cp[2] = ((val >> 16) & 0xff); - cp[3] = ((val >> 24) & 0xff); -} -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ - -static unsigned int -read4_little_endian(const unsigned char *cp) +static char +read_nonempty(const char *mesg) { - return (uint)(cp[0]) + ((uint)(cp[1]) << 8) - + ((uint)(cp[2]) << 16) + ((uint)(cp[3]) << 24); + while (!read_line(mesg)) + continue; + return *line_ptr; } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE -static void -set_start_sect(struct partition *p, unsigned int start_sect) +static char +read_maybe_empty(const char *mesg) { - store4_little_endian(p->start4, start_sect); + if (!read_line(mesg)) { + line_ptr = line_buffer; + line_ptr[0] = '\n'; + line_ptr[1] = '\0'; + } + return line_ptr[0]; } -#endif -static int32_t -get_start_sect(const struct partition *p) +static int +read_hex(const char *const *sys) { - return read4_little_endian(p->start4); + unsigned long v; + while (1) { + read_nonempty("Hex code (type L to list codes): "); + if ((line_ptr[0] | 0x20) == 'l') { + list_types(sys); + continue; + } + v = bb_strtoul(line_ptr, NULL, 16); + if (v <= 0xff) + return v; + } } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE static void -set_nr_sects(struct partition *p, int32_t nr_sects) -{ - store4_little_endian(p->size4, nr_sects); -} -#endif - -static int32_t -get_nr_sects(const struct partition *p) +write_sector(sector_t secno, const void *buf) { - return read4_little_endian(p->size4); + seek_sector(secno); + xwrite(dev_fd, buf, sector_size); } +#endif /* FEATURE_FDISK_WRITABLE */ -/* normally O_RDWR, -l option gives O_RDONLY */ -static int type_open = O_RDWR; - - -static int ext_index; /* the prime extended partition */ -static int listing; /* no aborts for fdisk -l */ -static int dos_compatible_flag = ~0; -#ifdef CONFIG_FEATURE_FDISK_WRITABLE -static int dos_changed; -static int nowarn; /* no warnings for fdisk -l/-s */ -#endif - - - -static uint user_cylinders, user_heads, user_sectors; -static uint pt_heads, pt_sectors; -static uint kern_heads, kern_sectors; -static off_t extended_offset; /* offset of link pointers */ +#include "fdisk_aix.c" -static unsigned long long total_number_of_sectors; +struct sun_partition { + unsigned char info[128]; /* Informative text string */ + unsigned char spare0[14]; + struct sun_info { + unsigned char spare1; + unsigned char id; + unsigned char spare2; + unsigned char flags; + } infos[8]; + unsigned char spare1[246]; /* Boot information etc. */ + unsigned short rspeed; /* Disk rotational speed */ + unsigned short pcylcount; /* Physical cylinder count */ + unsigned short sparecyl; /* extra sects per cylinder */ + unsigned char spare2[4]; /* More magic... */ + unsigned short ilfact; /* Interleave factor */ + unsigned short ncyl; /* Data cylinder count */ + unsigned short nacyl; /* Alt. cylinder count */ + unsigned short ntrks; /* Tracks per cylinder */ + unsigned short nsect; /* Sectors per track */ + unsigned char spare3[4]; /* Even more magic... */ + struct sun_partinfo { + uint32_t start_cylinder; + uint32_t num_sectors; + } partitions[8]; + unsigned short magic; /* Magic number */ + unsigned short csum; /* Label xor'd checksum */ +} FIX_ALIASING; +typedef struct sun_partition sun_partition; +#define sunlabel ((sun_partition *)MBRbuffer) +STATIC_OSF void bsd_select(void); +STATIC_OSF void xbsd_print_disklabel(int); +#include "fdisk_osf.c" +STATIC_GPT void gpt_list_table(int xtra); +#include "fdisk_gpt.c" -static jmp_buf listingbuf; +#if ENABLE_FEATURE_SGI_LABEL || ENABLE_FEATURE_SUN_LABEL +static uint16_t +fdisk_swap16(uint16_t x) +{ + return (x << 8) | (x >> 8); +} -static void fdisk_fatal(enum failure why) +static uint32_t +fdisk_swap32(uint32_t x) +{ + return (x << 24) | + ((x & 0xFF00) << 8) | + ((x & 0xFF0000) >> 8) | + (x >> 24); +} +#endif + +STATIC_SGI const char *const sgi_sys_types[]; +STATIC_SGI unsigned sgi_get_num_sectors(int i); +STATIC_SGI int sgi_get_sysid(int i); +STATIC_SGI void sgi_delete_partition(int i); +STATIC_SGI void sgi_change_sysid(int i, int sys); +STATIC_SGI void sgi_list_table(int xtra); +#if ENABLE_FEATURE_FDISK_ADVANCED +STATIC_SGI void sgi_set_xcyl(void); +#endif +STATIC_SGI int verify_sgi(int verbose); +STATIC_SGI void sgi_add_partition(int n, int sys); +STATIC_SGI void sgi_set_swappartition(int i); +STATIC_SGI const char *sgi_get_bootfile(void); +STATIC_SGI void sgi_set_bootfile(const char* aFile); +STATIC_SGI void create_sgiinfo(void); +STATIC_SGI void sgi_write_table(void); +STATIC_SGI void sgi_set_bootpartition(int i); +#include "fdisk_sgi.c" + +STATIC_SUN const char *const sun_sys_types[]; +STATIC_SUN void sun_delete_partition(int i); +STATIC_SUN void sun_change_sysid(int i, int sys); +STATIC_SUN void sun_list_table(int xtra); +STATIC_SUN void add_sun_partition(int n, int sys); +#if ENABLE_FEATURE_FDISK_ADVANCED +STATIC_SUN void sun_set_alt_cyl(void); +STATIC_SUN void sun_set_ncyl(int cyl); +STATIC_SUN void sun_set_xcyl(void); +STATIC_SUN void sun_set_ilfact(void); +STATIC_SUN void sun_set_rspeed(void); +STATIC_SUN void sun_set_pcylcount(void); +#endif +STATIC_SUN void toggle_sunflags(int i, unsigned char mask); +STATIC_SUN void verify_sun(void); +STATIC_SUN void sun_write_table(void); +#include "fdisk_sun.c" + + +static inline_if_little_endian unsigned +read4_little_endian(const unsigned char *cp) { - const char *message; + uint32_t v; + move_from_unaligned32(v, cp); + return SWAP_LE32(v); +} - if (listing) { - close(fd); - longjmp(listingbuf, 1); - } +static sector_t +get_start_sect(const struct partition *p) +{ + return read4_little_endian(p->start4); +} - switch (why) { - case unable_to_open: - message = "Unable to open %s\n"; - break; - case unable_to_read: - message = "Unable to read %s\n"; - break; - case unable_to_seek: - message = "Unable to seek on %s\n"; - break; - case unable_to_write: - message = "Unable to write %s\n"; - break; - case ioctl_error: - message = "BLKGETSIZE ioctl failed on %s\n"; - break; - default: - message = "Fatal error\n"; - } +static sector_t +get_nr_sects(const struct partition *p) +{ + return read4_little_endian(p->size4); +} - fputc('\n', stderr); - fprintf(stderr, message, disk_device); - exit(1); +#if ENABLE_FEATURE_FDISK_WRITABLE +/* start_sect and nr_sects are stored little endian on all machines */ +/* moreover, they are not aligned correctly */ +static inline_if_little_endian void +store4_little_endian(unsigned char *cp, unsigned val) +{ + uint32_t v = SWAP_LE32(val); + move_to_unaligned32(cp, v); } static void -seek_sector(off_t secno) +set_start_sect(struct partition *p, unsigned start_sect) { - off_t offset = secno * sector_size; - if (lseek(fd, offset, SEEK_SET) == (off_t) -1) - fdisk_fatal(unable_to_seek); + store4_little_endian(p->start4, start_sect); } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE static void -write_sector(off_t secno, char *buf) +set_nr_sects(struct partition *p, unsigned nr_sects) { - seek_sector(secno); - if (write(fd, buf, sector_size) != sector_size) - fdisk_fatal(unable_to_write); + store4_little_endian(p->size4, nr_sects); } #endif /* Allocate a buffer and read a partition table sector */ static void -read_pte(struct pte *pe, off_t offset) +read_pte(struct pte *pe, sector_t offset) { - pe->offset = offset; - pe->sectorbuffer = (char *) xmalloc(sector_size); + pe->offset_from_dev_start = offset; + pe->sectorbuffer = xzalloc(sector_size); seek_sector(offset); - if (read(fd, pe->sectorbuffer, sector_size) != sector_size) + /* xread would make us abort - bad for fdisk -l */ + if (full_read(dev_fd, pe->sectorbuffer, sector_size) != sector_size) fdisk_fatal(unable_to_read); -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE pe->changed = 0; #endif pe->part_table = pe->ext_pointer = NULL; } -static unsigned int -get_partition_start(const struct pte *pe) +static sector_t +get_partition_start_from_dev_start(const struct pte *pe) { - return pe->offset + get_start_sect(pe->part_table); + return pe->offset_from_dev_start + get_start_sect(pe->part_table); } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE /* * Avoid warning about DOS partitions when no DOS partition was changed. * Here a heuristic "is probably dos partition". * We might also do the opposite and warn in all cases except * for "is probably nondos partition". */ +#ifdef UNUSED static int is_dos_partition(int t) { @@ -3441,324 +898,297 @@ is_dos_partition(int t) t == 0x1b || t == 0x1c || t == 0x1e || t == 0x24 || t == 0xc1 || t == 0xc4 || t == 0xc6); } +#endif static void menu(void) { -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) { - puts(_("Command action")); - puts(_("\ta\ttoggle a read only flag")); /* sun */ - puts(_("\tb\tedit bsd disklabel")); - puts(_("\tc\ttoggle the mountable flag")); /* sun */ - puts(_("\td\tdelete a partition")); - puts(_("\tl\tlist known partition types")); - puts(_("\tm\tprint this menu")); - puts(_("\tn\tadd a new partition")); - puts(_("\to\tcreate a new empty DOS partition table")); - puts(_("\tp\tprint the partition table")); - puts(_("\tq\tquit without saving changes")); - puts(_("\ts\tcreate a new empty Sun disklabel")); /* sun */ - puts(_("\tt\tchange a partition's system id")); - puts(_("\tu\tchange display/entry units")); - puts(_("\tv\tverify the partition table")); - puts(_("\tw\twrite table to disk and exit")); -#ifdef CONFIG_FEATURE_FDISK_ADVANCED - puts(_("\tx\textra functionality (experts only)")); -#endif - } else -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { - puts(_("Command action")); - puts(_("\ta\tselect bootable partition")); /* sgi flavour */ - puts(_("\tb\tedit bootfile entry")); /* sgi */ - puts(_("\tc\tselect sgi swap partition")); /* sgi flavour */ - puts(_("\td\tdelete a partition")); - puts(_("\tl\tlist known partition types")); - puts(_("\tm\tprint this menu")); - puts(_("\tn\tadd a new partition")); - puts(_("\to\tcreate a new empty DOS partition table")); - puts(_("\tp\tprint the partition table")); - puts(_("\tq\tquit without saving changes")); - puts(_("\ts\tcreate a new empty Sun disklabel")); /* sun */ - puts(_("\tt\tchange a partition's system id")); - puts(_("\tu\tchange display/entry units")); - puts(_("\tv\tverify the partition table")); - puts(_("\tw\twrite table to disk and exit")); - } else -#endif -#ifdef CONFIG_FEATURE_AIX_LABEL - if (label_aix == current_label_type) { - puts(_("Command action")); - puts(_("\tm\tprint this menu")); - puts(_("\to\tcreate a new empty DOS partition table")); - puts(_("\tq\tquit without saving changes")); - puts(_("\ts\tcreate a new empty Sun disklabel")); /* sun */ - } else -#endif - { - puts(_("Command action")); - puts(_("\ta\ttoggle a bootable flag")); - puts(_("\tb\tedit bsd disklabel")); - puts(_("\tc\ttoggle the dos compatibility flag")); - puts(_("\td\tdelete a partition")); - puts(_("\tl\tlist known partition types")); - puts(_("\tm\tprint this menu")); - puts(_("\tn\tadd a new partition")); - puts(_("\to\tcreate a new empty DOS partition table")); - puts(_("\tp\tprint the partition table")); - puts(_("\tq\tquit without saving changes")); - puts(_("\ts\tcreate a new empty Sun disklabel")); /* sun */ - puts(_("\tt\tchange a partition's system id")); - puts(_("\tu\tchange display/entry units")); - puts(_("\tv\tverify the partition table")); - puts(_("\tw\twrite table to disk and exit")); -#ifdef CONFIG_FEATURE_FDISK_ADVANCED - puts(_("\tx\textra functionality (experts only)")); + puts("Command Action"); + if (LABEL_IS_SUN) { + puts("a\ttoggle a read only flag"); /* sun */ + puts("b\tedit bsd disklabel"); + puts("c\ttoggle the mountable flag"); /* sun */ + puts("d\tdelete a partition"); + puts("l\tlist known partition types"); + puts("n\tadd a new partition"); + puts("o\tcreate a new empty DOS partition table"); + puts("p\tprint the partition table"); + puts("q\tquit without saving changes"); + puts("s\tcreate a new empty Sun disklabel"); /* sun */ + puts("t\tchange a partition's system id"); + puts("u\tchange display/entry units"); + puts("v\tverify the partition table"); + puts("w\twrite table to disk and exit"); +#if ENABLE_FEATURE_FDISK_ADVANCED + puts("x\textra functionality (experts only)"); +#endif + } else if (LABEL_IS_SGI) { + puts("a\tselect bootable partition"); /* sgi flavour */ + puts("b\tedit bootfile entry"); /* sgi */ + puts("c\tselect sgi swap partition"); /* sgi flavour */ + puts("d\tdelete a partition"); + puts("l\tlist known partition types"); + puts("n\tadd a new partition"); + puts("o\tcreate a new empty DOS partition table"); + puts("p\tprint the partition table"); + puts("q\tquit without saving changes"); + puts("s\tcreate a new empty Sun disklabel"); /* sun */ + puts("t\tchange a partition's system id"); + puts("u\tchange display/entry units"); + puts("v\tverify the partition table"); + puts("w\twrite table to disk and exit"); + } else if (LABEL_IS_AIX) { + puts("o\tcreate a new empty DOS partition table"); + puts("q\tquit without saving changes"); + puts("s\tcreate a new empty Sun disklabel"); /* sun */ + } else if (LABEL_IS_GPT) { + puts("o\tcreate a new empty DOS partition table"); + puts("p\tprint the partition table"); + puts("q\tquit without saving changes"); + puts("s\tcreate a new empty Sun disklabel"); /* sun */ + } else { + puts("a\ttoggle a bootable flag"); + puts("b\tedit bsd disklabel"); + puts("c\ttoggle the dos compatibility flag"); + puts("d\tdelete a partition"); + puts("l\tlist known partition types"); + puts("n\tadd a new partition"); + puts("o\tcreate a new empty DOS partition table"); + puts("p\tprint the partition table"); + puts("q\tquit without saving changes"); + puts("s\tcreate a new empty Sun disklabel"); /* sun */ + puts("t\tchange a partition's system id"); + puts("u\tchange display/entry units"); + puts("v\tverify the partition table"); + puts("w\twrite table to disk and exit"); +#if ENABLE_FEATURE_FDISK_ADVANCED + puts("x\textra functionality (experts only)"); #endif } } -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ +#endif /* FEATURE_FDISK_WRITABLE */ -#ifdef CONFIG_FEATURE_FDISK_ADVANCED +#if ENABLE_FEATURE_FDISK_ADVANCED static void xmenu(void) { -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) { - puts(_("Command action")); - puts(_("\ta\tchange number of alternate cylinders")); /*sun*/ - puts(_("\tc\tchange number of cylinders")); - puts(_("\td\tprint the raw data in the partition table")); - puts(_("\te\tchange number of extra sectors per cylinder"));/*sun*/ - puts(_("\th\tchange number of heads")); - puts(_("\ti\tchange interleave factor")); /*sun*/ - puts(_("\to\tchange rotation speed (rpm)")); /*sun*/ - puts(_("\tm\tprint this menu")); - puts(_("\tp\tprint the partition table")); - puts(_("\tq\tquit without saving changes")); - puts(_("\tr\treturn to main menu")); - puts(_("\ts\tchange number of sectors/track")); - puts(_("\tv\tverify the partition table")); - puts(_("\tw\twrite table to disk and exit")); - puts(_("\ty\tchange number of physical cylinders")); /*sun*/ - } else -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { - puts(_("Command action")); - puts(_("\tb\tmove beginning of data in a partition")); /* !sun */ - puts(_("\tc\tchange number of cylinders")); - puts(_("\td\tprint the raw data in the partition table")); - puts(_("\te\tlist extended partitions")); /* !sun */ - puts(_("\tg\tcreate an IRIX (SGI) partition table"));/* sgi */ - puts(_("\th\tchange number of heads")); - puts(_("\tm\tprint this menu")); - puts(_("\tp\tprint the partition table")); - puts(_("\tq\tquit without saving changes")); - puts(_("\tr\treturn to main menu")); - puts(_("\ts\tchange number of sectors/track")); - puts(_("\tv\tverify the partition table")); - puts(_("\tw\twrite table to disk and exit")); - } else -#endif -#ifdef CONFIG_FEATURE_AIX_LABEL - if (label_aix == current_label_type) { - puts(_("Command action")); - puts(_("\tb\tmove beginning of data in a partition")); /* !sun */ - puts(_("\tc\tchange number of cylinders")); - puts(_("\td\tprint the raw data in the partition table")); - puts(_("\te\tlist extended partitions")); /* !sun */ - puts(_("\tg\tcreate an IRIX (SGI) partition table"));/* sgi */ - puts(_("\th\tchange number of heads")); - puts(_("\tm\tprint this menu")); - puts(_("\tp\tprint the partition table")); - puts(_("\tq\tquit without saving changes")); - puts(_("\tr\treturn to main menu")); - puts(_("\ts\tchange number of sectors/track")); - puts(_("\tv\tverify the partition table")); - puts(_("\tw\twrite table to disk and exit")); - } else -#endif - { - puts(_("Command action")); - puts(_("\tb\tmove beginning of data in a partition")); /* !sun */ - puts(_("\tc\tchange number of cylinders")); - puts(_("\td\tprint the raw data in the partition table")); - puts(_("\te\tlist extended partitions")); /* !sun */ - puts(_("\tf\tfix partition order")); /* !sun, !aix, !sgi */ -#ifdef CONFIG_FEATURE_SGI_LABEL - puts(_("\tg\tcreate an IRIX (SGI) partition table"));/* sgi */ -#endif - puts(_("\th\tchange number of heads")); - puts(_("\tm\tprint this menu")); - puts(_("\tp\tprint the partition table")); - puts(_("\tq\tquit without saving changes")); - puts(_("\tr\treturn to main menu")); - puts(_("\ts\tchange number of sectors/track")); - puts(_("\tv\tverify the partition table")); - puts(_("\tw\twrite table to disk and exit")); + puts("Command Action"); + if (LABEL_IS_SUN) { + puts("a\tchange number of alternate cylinders"); /*sun*/ + puts("c\tchange number of cylinders"); + puts("d\tprint the raw data in the partition table"); + puts("e\tchange number of extra sectors per cylinder");/*sun*/ + puts("h\tchange number of heads"); + puts("i\tchange interleave factor"); /*sun*/ + puts("o\tchange rotation speed (rpm)"); /*sun*/ + puts("p\tprint the partition table"); + puts("q\tquit without saving changes"); + puts("r\treturn to main menu"); + puts("s\tchange number of sectors/track"); + puts("v\tverify the partition table"); + puts("w\twrite table to disk and exit"); + puts("y\tchange number of physical cylinders"); /*sun*/ + } else if (LABEL_IS_SGI) { + puts("b\tmove beginning of data in a partition"); /* !sun */ + puts("c\tchange number of cylinders"); + puts("d\tprint the raw data in the partition table"); + puts("e\tlist extended partitions"); /* !sun */ + puts("g\tcreate an IRIX (SGI) partition table");/* sgi */ + puts("h\tchange number of heads"); + puts("p\tprint the partition table"); + puts("q\tquit without saving changes"); + puts("r\treturn to main menu"); + puts("s\tchange number of sectors/track"); + puts("v\tverify the partition table"); + puts("w\twrite table to disk and exit"); + } else if (LABEL_IS_AIX) { + puts("b\tmove beginning of data in a partition"); /* !sun */ + puts("c\tchange number of cylinders"); + puts("d\tprint the raw data in the partition table"); + puts("e\tlist extended partitions"); /* !sun */ + puts("g\tcreate an IRIX (SGI) partition table");/* sgi */ + puts("h\tchange number of heads"); + puts("p\tprint the partition table"); + puts("q\tquit without saving changes"); + puts("r\treturn to main menu"); + puts("s\tchange number of sectors/track"); + puts("v\tverify the partition table"); + puts("w\twrite table to disk and exit"); + } else { + puts("b\tmove beginning of data in a partition"); /* !sun */ + puts("c\tchange number of cylinders"); + puts("d\tprint the raw data in the partition table"); + puts("e\tlist extended partitions"); /* !sun */ + puts("f\tfix partition order"); /* !sun, !aix, !sgi */ +#if ENABLE_FEATURE_SGI_LABEL + puts("g\tcreate an IRIX (SGI) partition table");/* sgi */ +#endif + puts("h\tchange number of heads"); + puts("p\tprint the partition table"); + puts("q\tquit without saving changes"); + puts("r\treturn to main menu"); + puts("s\tchange number of sectors/track"); + puts("v\tverify the partition table"); + puts("w\twrite table to disk and exit"); } } #endif /* ADVANCED mode */ -#ifdef CONFIG_FEATURE_FDISK_WRITABLE -static const struct systypes * +#if ENABLE_FEATURE_FDISK_WRITABLE +static const char *const * get_sys_types(void) { return ( -#ifdef CONFIG_FEATURE_SUN_LABEL - label_sun == current_label_type ? sun_sys_types : -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - label_sgi == current_label_type ? sgi_sys_types : -#endif + LABEL_IS_SUN ? sun_sys_types : + LABEL_IS_SGI ? sgi_sys_types : i386_sys_types); } #else #define get_sys_types() i386_sys_types -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ +#endif -static const char *partition_type(unsigned char type) +static const char * +partition_type(unsigned char type) { int i; - const struct systypes *types = get_sys_types(); + const char *const *types = get_sys_types(); + + for (i = 0; types[i]; i++) + if ((unsigned char)types[i][0] == type) + return types[i] + 1; - for (i = 0; types[i].name; i++) - if ((unsigned char )types[i].name[0] == type) - return types[i].name + 1; + return "Unknown"; +} - return _("Unknown"); +static int +is_cleared_partition(const struct partition *p) +{ + /* We consider partition "cleared" only if it has only zeros */ + const char *cp = (const char *)p; + int cnt = sizeof(*p); + char bits = 0; + while (--cnt >= 0) + bits |= *cp++; + return (bits == 0); } +static void +clear_partition(struct partition *p) +{ + if (p) + memset(p, 0, sizeof(*p)); +} -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE static int get_sysid(int i) { - return ( -#ifdef CONFIG_FEATURE_SUN_LABEL - label_sun == current_label_type ? sunlabel->infos[i].id : -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - label_sgi == current_label_type ? sgi_get_sysid(i) : -#endif - ptes[i].part_table->sys_ind); + return LABEL_IS_SUN ? sunlabel->infos[i].id : + (LABEL_IS_SGI ? sgi_get_sysid(i) : + ptes[i].part_table->sys_ind); } -void list_types(const struct systypes *sys) +static void +list_types(const char *const *sys) { - uint last[4], done = 0, next = 0, size; + enum { COLS = 3 }; + + unsigned last[COLS]; + unsigned done, next, size; int i; - for (i = 0; sys[i].name; i++); - size = i; + for (size = 0; sys[size]; size++) + continue; - for (i = 3; i >= 0; i--) - last[3 - i] = done += (size + i - done) / (i + 1); - i = done = 0; + done = 0; + for (i = COLS-1; i >= 0; i--) { + done += (size + i - done) / (i + 1); + last[COLS-1 - i] = done; + } + i = done = next = 0; do { - printf("%c%2x %-15.15s", i ? ' ' : '\n', - (unsigned char)sys[next].name[0], - partition_type((unsigned char)sys[next].name[0])); + printf("%c%2x %-22.22s", i ? ' ' : '\n', + (unsigned char)sys[next][0], + sys[next] + 1); next = last[i++] + done; - if (i > 3 || next >= last[i]) { + if (i >= COLS || next >= last[i]) { i = 0; next = ++done; } } while (done < last[0]); - putchar('\n'); + bb_putchar('\n'); } -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ -static int -is_cleared_partition(const struct partition *p) -{ - return !(!p || p->boot_ind || p->head || p->sector || p->cyl || - p->sys_ind || p->end_head || p->end_sector || p->end_cyl || - get_start_sect(p) || get_nr_sects(p)); -} +#define set_hsc(h, s, c, sector) do \ +{ \ + s = sector % g_sectors + 1; \ + sector /= g_sectors; \ + h = sector % g_heads; \ + sector /= g_heads; \ + c = sector & 0xff; \ + s |= (sector >> 2) & 0xc0; \ +} while (0) -static void -clear_partition(struct partition *p) +static void set_hsc_start_end(struct partition *p, sector_t start, sector_t stop) { - if (!p) - return; - memset(p, 0, sizeof(struct partition)); + if (dos_compatible_flag && (start / (g_sectors * g_heads) > 1023)) + start = g_heads * g_sectors * 1024 - 1; + set_hsc(p->head, p->sector, p->cyl, start); + + if (dos_compatible_flag && (stop / (g_sectors * g_heads) > 1023)) + stop = g_heads * g_sectors * 1024 - 1; + set_hsc(p->end_head, p->end_sector, p->end_cyl, stop); } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE static void -set_partition(int i, int doext, off_t start, off_t stop, int sysid) +set_partition(int i, int doext, sector_t start, sector_t stop, int sysid) { struct partition *p; - off_t offset; + sector_t offset; if (doext) { p = ptes[i].ext_pointer; offset = extended_offset; } else { p = ptes[i].part_table; - offset = ptes[i].offset; + offset = ptes[i].offset_from_dev_start; } p->boot_ind = 0; p->sys_ind = sysid; set_start_sect(p, start - offset); set_nr_sects(p, stop - start + 1); - if (dos_compatible_flag && (start/(sectors*heads) > 1023)) - start = heads*sectors*1024 - 1; - set_hsc(p->head, p->sector, p->cyl, start); - if (dos_compatible_flag && (stop/(sectors*heads) > 1023)) - stop = heads*sectors*1024 - 1; - set_hsc(p->end_head, p->end_sector, p->end_cyl, stop); + set_hsc_start_end(p, start, stop); ptes[i].changed = 1; } #endif -static int -test_c(const char **m, const char *mesg) -{ - int val = 0; - if (!*m) - fprintf(stderr, _("You must set")); - else { - fprintf(stderr, " %s", *m); - val = 1; - } - *m = mesg; - return val; -} - static int warn_geometry(void) { - const char *m = NULL; - int prev = 0; - - if (!heads) - prev = test_c(&m, _("heads")); - if (!sectors) - prev = test_c(&m, _("sectors")); - if (!cylinders) - prev = test_c(&m, _("cylinders")); - if (!m) + if (g_heads && g_sectors && g_cylinders) return 0; - fprintf(stderr, "%s%s.\n" -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - "You can do this from the extra functions menu.\n" + printf("Unknown value(s) for:"); + if (!g_heads) + printf(" heads"); + if (!g_sectors) + printf(" sectors"); + if (!g_cylinders) + printf(" cylinders"); +#if ENABLE_FEATURE_FDISK_WRITABLE + puts(" (settable in the extra functions menu)"); +#else + bb_putchar('\n'); #endif - , prev ? _(" and ") : " ", m); - return 1; } -static void update_units(void) +static void +update_units(void) { - int cyl_units = heads * sectors; + int cyl_units = g_heads * g_sectors; if (display_in_cyl_units && cyl_units) units_per_sector = cyl_units; @@ -3766,19 +1196,19 @@ static void update_units(void) units_per_sector = 1; /* in sectors */ } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE static void warn_cylinders(void) { - if (label_dos == current_label_type && cylinders > 1024 && !nowarn) - fprintf(stderr, _("\n" -"The number of cylinders for this disk is set to %d.\n" + if (LABEL_IS_DOS && g_cylinders > 1024 && !nowarn) + printf("\n" +"The number of cylinders for this disk is set to %u.\n" "There is nothing wrong with that, but this is larger than 1024,\n" "and could in certain setups cause problems with:\n" "1) software that runs at boot time (e.g., old versions of LILO)\n" "2) booting and partitioning software from other OSs\n" -" (e.g., DOS FDISK, OS/2 FDISK)\n"), - cylinders); +" (e.g., DOS FDISK, OS/2 FDISK)\n", + g_cylinders); } #endif @@ -3795,23 +1225,21 @@ read_extended(int ext) p = pex->part_table; if (!get_start_sect(p)) { - fprintf(stderr, - _("Bad offset in primary extended partition\n")); + puts("Bad offset in primary extended partition"); return; } while (IS_EXTENDED(p->sys_ind)) { - struct pte *pe = &ptes[partitions]; + struct pte *pe = &ptes[g_partitions]; - if (partitions >= MAXIMUM_PARTS) { + if (g_partitions >= MAXIMUM_PARTS) { /* This is not a Linux restriction, but this program uses arrays of size MAXIMUM_PARTS. - Do not try to `improve' this test. */ - struct pte *pre = &ptes[partitions-1]; -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - fprintf(stderr, - _("Warning: deleting partitions after %d\n"), - partitions); + Do not try to 'improve' this test. */ + struct pte *pre = &ptes[g_partitions - 1]; +#if ENABLE_FEATURE_FDISK_WRITABLE + printf("Warning: deleting partitions after %u\n", + g_partitions); pre->changed = 1; #endif clear_partition(pre->ext_pointer); @@ -3827,18 +1255,16 @@ read_extended(int ext) for (i = 0; i < 4; i++, p++) if (get_nr_sects(p)) { if (IS_EXTENDED(p->sys_ind)) { if (pe->ext_pointer) - fprintf(stderr, - _("Warning: extra link " - "pointer in partition table" - " %d\n"), partitions + 1); + printf("Warning: extra link " + "pointer in partition table" + " %u\n", g_partitions + 1); else pe->ext_pointer = p; } else if (p->sys_ind) { if (pe->part_table) - fprintf(stderr, - _("Warning: ignoring extra " + printf("Warning: ignoring extra " "data in partition table" - " %d\n"), partitions + 1); + " %u\n", g_partitions + 1); else pe->part_table = p; } @@ -3859,18 +1285,19 @@ read_extended(int ext) } p = pe->ext_pointer; - partitions++; + g_partitions++; } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE /* remove empty links */ remove: - for (i = 4; i < partitions; i++) { + for (i = 4; i < g_partitions; i++) { struct pte *pe = &ptes[i]; - if (!get_nr_sects(pe->part_table) && - (partitions > 5 || ptes[4].part_table->sys_ind)) { - printf("omitting empty partition (%d)\n", i+1); + if (!get_nr_sects(pe->part_table) + && (g_partitions > 5 || ptes[4].part_table->sys_ind) + ) { + printf("Omitting empty partition (%u)\n", i+1); delete_partition(i); goto remove; /* numbering changed */ } @@ -3878,44 +1305,38 @@ read_extended(int ext) #endif } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE static void create_doslabel(void) { - int i; - - fprintf(stderr, - _("Building a new DOS disklabel. Changes will remain in memory only,\n" - "until you decide to write them. After that, of course, the previous\n" - "content won't be recoverable.\n\n")); - - current_label_type = label_dos; + printf(msg_building_new_label, "DOS disklabel"); -#ifdef CONFIG_FEATURE_OSF_LABEL + current_label_type = LABEL_DOS; +#if ENABLE_FEATURE_OSF_LABEL possibly_osf_label = 0; #endif - partitions = 4; + g_partitions = 4; - for (i = 510-64; i < 510; i++) - MBRbuffer[i] = 0; + memset(&MBRbuffer[510 - 4*16], 0, 4*16); write_part_table_flag(MBRbuffer); extended_offset = 0; set_all_unchanged(); set_changed(0); - get_boot(create_empty_dos); + get_boot(CREATE_EMPTY_DOS); } -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ +#endif static void get_sectorsize(void) { if (!user_set_sector_size) { int arg; - if (ioctl(fd, BLKSSZGET, &arg) == 0) + if (ioctl(dev_fd, BLKSSZGET, &arg) == 0) sector_size = arg; if (sector_size != DEFAULT_SECTOR_SIZE) - printf(_("Note: sector size is %d (not %d)\n"), - sector_size, DEFAULT_SECTOR_SIZE); + printf("Note: sector size is %u " + "(not " DEFAULT_SECTOR_SIZE_STR ")\n", + sector_size); } } @@ -3924,7 +1345,7 @@ get_kernel_geometry(void) { struct hd_geometry geometry; - if (!ioctl(fd, HDIO_GETGEO, &geometry)) { + if (!ioctl(dev_fd, HDIO_GETGEO, &geometry)) { kern_heads = geometry.heads; kern_sectors = geometry.sectors; /* never use geometry.cylinders - it is truncated */ @@ -3968,207 +1389,199 @@ static void get_geometry(void) { int sec_fac; - unsigned long long bytes; /* really u64 */ get_sectorsize(); sec_fac = sector_size / 512; -#ifdef CONFIG_FEATURE_SUN_LABEL +#if ENABLE_FEATURE_SUN_LABEL guess_device_type(); #endif - heads = cylinders = sectors = 0; + g_heads = g_cylinders = g_sectors = 0; kern_heads = kern_sectors = 0; pt_heads = pt_sectors = 0; get_kernel_geometry(); get_partition_table_geometry(); - heads = user_heads ? user_heads : + g_heads = user_heads ? user_heads : pt_heads ? pt_heads : kern_heads ? kern_heads : 255; - sectors = user_sectors ? user_sectors : + g_sectors = user_sectors ? user_sectors : pt_sectors ? pt_sectors : kern_sectors ? kern_sectors : 63; - if (ioctl(fd, BLKGETSIZE64, &bytes) == 0) { - /* got bytes */ - } else { - unsigned long longsectors; - - if (ioctl(fd, BLKGETSIZE, &longsectors)) - longsectors = 0; - bytes = ((unsigned long long) longsectors) << 9; - } - - total_number_of_sectors = (bytes >> 9); + total_number_of_sectors = bb_BLKGETSIZE_sectors(dev_fd); sector_offset = 1; if (dos_compatible_flag) - sector_offset = sectors; + sector_offset = g_sectors; - cylinders = total_number_of_sectors / (heads * sectors * sec_fac); - if (!cylinders) - cylinders = user_cylinders; + g_cylinders = total_number_of_sectors / (g_heads * g_sectors * sec_fac); + if (!g_cylinders) + g_cylinders = user_cylinders; } /* - * Read MBR. Returns: + * Opens disk_device and optionally reads MBR. + * If what == OPEN_MAIN: + * Open device, read MBR. Abort program on short read. Create empty + * disklabel if the on-disk structure is invalid (WRITABLE mode). + * If what == TRY_ONLY: + * Open device, read MBR. Return an error if anything is out of place. + * Do not create an empty disklabel. This is used for the "list" + * operations: "fdisk -l /dev/sda" and "fdisk -l" (all devices). + * If what == CREATE_EMPTY_*: + * This means that get_boot() was called recursively from create_*label(). + * Do not re-open the device; just set up the ptes array and print + * geometry warnings. + * + * Returns: * -1: no 0xaa55 flag present (possibly entire disk BSD) * 0: found or created label * 1: I/O error */ -static int -get_boot(enum action what) +#if ENABLE_FEATURE_SUN_LABEL || ENABLE_FEATURE_FDISK_WRITABLE +static int get_boot(enum action what) +#else +static int get_boot(void) +#define get_boot(what) get_boot() +#endif { - int i; - - partitions = 4; + int i, fd; + g_partitions = 4; for (i = 0; i < 4; i++) { struct pte *pe = &ptes[i]; - pe->part_table = pt_offset(MBRbuffer, i); pe->ext_pointer = NULL; - pe->offset = 0; + pe->offset_from_dev_start = 0; pe->sectorbuffer = MBRbuffer; -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - pe->changed = (what == create_empty_dos); +#if ENABLE_FEATURE_FDISK_WRITABLE + pe->changed = (what == CREATE_EMPTY_DOS); #endif } -#ifdef CONFIG_FEATURE_SUN_LABEL - if (what == create_empty_sun && check_sun_label()) - return 0; -#endif - - memset(MBRbuffer, 0, 512); +#if ENABLE_FEATURE_FDISK_WRITABLE +// ALERT! highly idiotic design! +// We end up here when we call get_boot() recursively +// via get_boot() [table is bad] -> create_doslabel() -> get_boot(CREATE_EMPTY_DOS). +// or get_boot() [table is bad] -> create_sunlabel() -> get_boot(CREATE_EMPTY_SUN). +// (just factor out re-init of ptes[0,1,2,3] in a separate fn instead?) +// So skip opening device _again_... + if (what == CREATE_EMPTY_DOS IF_FEATURE_SUN_LABEL(|| what == CREATE_EMPTY_SUN)) + goto created_table; -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - if (what == create_empty_dos) - goto got_dos_table; /* skip reading disk */ + fd = open(disk_device, (option_mask32 & OPT_l) ? O_RDONLY : O_RDWR); - if ((fd = open(disk_device, type_open)) < 0) { - if ((fd = open(disk_device, O_RDONLY)) < 0) { - if (what == try_only) + if (fd < 0) { + fd = open(disk_device, O_RDONLY); + if (fd < 0) { + if (what == TRY_ONLY) return 1; fdisk_fatal(unable_to_open); - } else - printf(_("You will not be able to write " - "the partition table.\n")); + } + printf("'%s' is opened for read only\n", disk_device); } - - if (512 != read(fd, MBRbuffer, 512)) { - if (what == try_only) + xmove_fd(fd, dev_fd); + if (512 != full_read(dev_fd, MBRbuffer, 512)) { + if (what == TRY_ONLY) { + close_dev_fd(); return 1; + } fdisk_fatal(unable_to_read); } #else - if ((fd = open(disk_device, O_RDONLY)) < 0) + fd = open(disk_device, O_RDONLY); + if (fd < 0) return 1; - if (512 != read(fd, MBRbuffer, 512)) + if (512 != full_read(fd, MBRbuffer, 512)) { + close(fd); return 1; + } + xmove_fd(fd, dev_fd); #endif get_geometry(); - update_units(); -#ifdef CONFIG_FEATURE_SUN_LABEL +#if ENABLE_FEATURE_SUN_LABEL if (check_sun_label()) return 0; #endif - -#ifdef CONFIG_FEATURE_SGI_LABEL +#if ENABLE_FEATURE_SGI_LABEL if (check_sgi_label()) return 0; #endif - -#ifdef CONFIG_FEATURE_AIX_LABEL +#if ENABLE_FEATURE_AIX_LABEL if (check_aix_label()) return 0; #endif - -#ifdef CONFIG_FEATURE_OSF_LABEL +#if ENABLE_FEATURE_GPT_LABEL + if (check_gpt_label()) + return 0; +#endif +#if ENABLE_FEATURE_OSF_LABEL if (check_osf_label()) { possibly_osf_label = 1; if (!valid_part_table_flag(MBRbuffer)) { - current_label_type = label_osf; + current_label_type = LABEL_OSF; return 0; } - printf(_("This disk has both DOS and BSD magic.\n" - "Give the 'b' command to go to BSD mode.\n")); + puts("This disk has both DOS and BSD magic.\n" + "Give the 'b' command to go to BSD mode."); } #endif -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - got_dos_table: -#endif - - if (!valid_part_table_flag(MBRbuffer)) { -#ifndef CONFIG_FEATURE_FDISK_WRITABLE +#if !ENABLE_FEATURE_FDISK_WRITABLE + if (!valid_part_table_flag(MBRbuffer)) return -1; #else - switch (what) { - case fdisk: - fprintf(stderr, - _("Device contains neither a valid DOS " - "partition table, nor Sun, SGI or OSF " - "disklabel\n")); + if (!valid_part_table_flag(MBRbuffer)) { + if (what == OPEN_MAIN) { + puts("Device contains neither a valid DOS " + "partition table, nor Sun, SGI, OSF or GPT " + "disklabel"); #ifdef __sparc__ -#ifdef CONFIG_FEATURE_SUN_LABEL - create_sunlabel(); -#endif + IF_FEATURE_SUN_LABEL(create_sunlabel();) #else create_doslabel(); #endif return 0; - case try_only: - return -1; - case create_empty_dos: -#ifdef CONFIG_FEATURE_SUN_LABEL - case create_empty_sun: -#endif - break; - default: - fprintf(stderr, _("Internal error\n")); - exit(1); } -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ + /* TRY_ONLY: */ + return -1; } + created_table: +#endif /* FEATURE_FDISK_WRITABLE */ -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - warn_cylinders(); -#endif + + IF_FEATURE_FDISK_WRITABLE(warn_cylinders();) warn_geometry(); for (i = 0; i < 4; i++) { - struct pte *pe = &ptes[i]; - - if (IS_EXTENDED(pe->part_table->sys_ind)) { - if (partitions != 4) - fprintf(stderr, _("Ignoring extra extended " - "partition %d\n"), i + 1); + if (IS_EXTENDED(ptes[i].part_table->sys_ind)) { + if (g_partitions != 4) + printf("Ignoring extra extended " + "partition %u\n", i + 1); else read_extended(i); } } - for (i = 3; i < partitions; i++) { + for (i = 3; i < g_partitions; i++) { struct pte *pe = &ptes[i]; - if (!valid_part_table_flag(pe->sectorbuffer)) { - fprintf(stderr, - _("Warning: invalid flag 0x%04x of partition " - "table %d will be corrected by w(rite)\n"), - part_table_flag(pe->sectorbuffer), i + 1); -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - pe->changed = 1; -#endif + printf("Warning: invalid flag 0x%02x,0x%02x of partition " + "table %u will be corrected by w(rite)\n", + pe->sectorbuffer[510], + pe->sectorbuffer[511], + i + 1); + IF_FEATURE_FDISK_WRITABLE(pe->changed = 1;) } } return 0; } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE /* * Print the message MESG, then read an integer between LOW and HIGH (inclusive). * If the user hits Enter, DFLT is returned. @@ -4176,42 +1589,36 @@ get_boot(enum action what) * * There is no default if DFLT is not between LOW and HIGH. */ -static uint -read_int(uint low, uint dflt, uint high, uint base, char *mesg) +static sector_t +read_int(sector_t low, sector_t dflt, sector_t high, sector_t base, const char *mesg) { - uint i; + sector_t value; int default_ok = 1; - static char *ms = NULL; - static int mslen = 0; + const char *fmt = "%s (%u-%u, default %u): "; - if (!ms || strlen(mesg)+100 > mslen) { - mslen = strlen(mesg)+200; - ms = xrealloc(ms,mslen); - } - - if (dflt < low || dflt > high) + if (dflt < low || dflt > high) { + fmt = "%s (%u-%u): "; default_ok = 0; - - if (default_ok) - snprintf(ms, mslen, _("%s (%u-%u, default %u): "), - mesg, low, high, dflt); - else - snprintf(ms, mslen, "%s (%u-%u): ", mesg, low, high); + } while (1) { int use_default = default_ok; /* ask question and read answer */ - while (read_chars(ms) != '\n' && !isdigit(*line_ptr) - && *line_ptr != '-' && *line_ptr != '+') - continue; + do { + printf(fmt, mesg, low, high, dflt); + read_maybe_empty(""); + } while (*line_ptr != '\n' && !isdigit(*line_ptr) + && *line_ptr != '-' && *line_ptr != '+'); if (*line_ptr == '+' || *line_ptr == '-') { int minus = (*line_ptr == '-'); int absolute = 0; - i = atoi(line_ptr+1); + value = atoi(line_ptr + 1); + /* (1) if 2nd char is digit, use_default = 0. + * (2) move line_ptr to first non-digit. */ while (isdigit(*++line_ptr)) use_default = 0; @@ -4219,7 +1626,7 @@ read_int(uint low, uint dflt, uint high, uint base, char *mesg) case 'c': case 'C': if (!display_in_cyl_units) - i *= heads * sectors; + value *= g_heads * g_sectors; break; case 'K': absolute = 1024; @@ -4239,81 +1646,61 @@ read_int(uint low, uint dflt, uint high, uint base, char *mesg) break; } if (absolute) { - unsigned long long bytes; + ullong bytes; unsigned long unit; - bytes = (unsigned long long) i * absolute; + bytes = (ullong) value * absolute; unit = sector_size * units_per_sector; bytes += unit/2; /* round */ bytes /= unit; - i = bytes; + value = bytes; } if (minus) - i = -i; - i += base; + value = -value; + value += base; } else { - i = atoi(line_ptr); + value = atoi(line_ptr); while (isdigit(*line_ptr)) { line_ptr++; use_default = 0; } } - if (use_default) - printf(_("Using default value %u\n"), i = dflt); - if (i >= low && i <= high) + if (use_default) { + value = dflt; + printf("Using default value %u\n", value); + } + if (value >= low && value <= high) break; - else - printf(_("Value out of range.\n")); + puts("Value is out of range"); } - return i; + return value; } -static int -get_partition(int warn, int max) +static unsigned +get_partition(int warn, unsigned max) { struct pte *pe; - int i; + unsigned i; - i = read_int(1, 0, max, 0, _("Partition number")) - 1; + i = read_int(1, 0, max, 0, "Partition number") - 1; pe = &ptes[i]; if (warn) { - if ( - ( - label_sun != current_label_type && - label_sgi != current_label_type && - !pe->part_table->sys_ind - ) -#ifdef CONFIG_FEATURE_SUN_LABEL - || ( - label_sun == current_label_type && - ( - !sunlabel->partitions[i].num_sectors - || !sunlabel->infos[i].id - ) - ) -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - || ( - label_sgi == current_label_type && - !sgi_get_num_sectors(i) - ) -#endif - ){ - fprintf(stderr, - _("Warning: partition %d has empty type\n"), - i+1 - ); + if ((!LABEL_IS_SUN && !LABEL_IS_SGI && !pe->part_table->sys_ind) + || (LABEL_IS_SUN && (!sunlabel->partitions[i].num_sectors || !sunlabel->infos[i].id)) + || (LABEL_IS_SGI && !sgi_get_num_sectors(i)) + ) { + printf("Warning: partition %u has empty type\n", i+1); } } return i; } static int -get_existing_partition(int warn, int max) +get_existing_partition(int warn, unsigned max) { int pno = -1; - int i; + unsigned i; for (i = 0; i < max; i++) { struct pte *pe = &ptes[i]; @@ -4326,10 +1713,10 @@ get_existing_partition(int warn, int max) } } if (pno >= 0) { - printf(_("Selected partition %d\n"), pno+1); + printf("Selected partition %u\n", pno+1); return pno; } - printf(_("No partition is defined yet!\n")); + puts("No partition is defined yet!"); return -1; not_unique: @@ -4337,10 +1724,10 @@ get_existing_partition(int warn, int max) } static int -get_nonexisting_partition(int warn, int max) +get_nonexisting_partition(int warn, unsigned max) { int pno = -1; - int i; + unsigned i; for (i = 0; i < max; i++) { struct pte *pe = &ptes[i]; @@ -4353,10 +1740,10 @@ get_nonexisting_partition(int warn, int max) } } if (pno >= 0) { - printf(_("Selected partition %d\n"), pno+1); + printf("Selected partition %u\n", pno+1); return pno; } - printf(_("All primary partitions have been defined already!\n")); + puts("All primary partitions have been defined already!"); return -1; not_unique: @@ -4364,11 +1751,12 @@ get_nonexisting_partition(int warn, int max) } -void change_units(void) +static void +change_units(void) { display_in_cyl_units = !display_in_cyl_units; update_units(); - printf(_("Changing display/entry units to %s\n"), + printf("Changing display/entry units to %s\n", str_units(PLURAL)); } @@ -4379,9 +1767,7 @@ toggle_active(int 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); + printf("WARNING: Partition %u is an extended partition\n", i + 1); p->boot_ind = (p->boot_ind ? 0 : ACTIVE_FLAG); pe->changed = 1; } @@ -4389,14 +1775,13 @@ toggle_active(int i) static void toggle_dos_compatibility_flag(void) { - dos_compatible_flag = ~dos_compatible_flag; + dos_compatible_flag = 1 - dos_compatible_flag; if (dos_compatible_flag) { - sector_offset = sectors; - printf(_("DOS Compatibility flag is set\n")); - } - else { + sector_offset = g_sectors; + printf("DOS Compatibility flag is %sset\n", ""); + } else { sector_offset = 1; - printf(_("DOS Compatibility flag is not set\n")); + printf("DOS Compatibility flag is %sset\n", "not "); } } @@ -4415,22 +1800,18 @@ delete_partition(int i) return; /* C/H/S not set */ pe->changed = 1; -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) { + if (LABEL_IS_SUN) { sun_delete_partition(i); return; } -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { + if (LABEL_IS_SGI) { sgi_delete_partition(i); return; } -#endif if (i < 4) { if (IS_EXTENDED(p->sys_ind) && i == ext_index) { - partitions = 4; + g_partitions = 4; ptes[ext_index].ext_pointer = NULL; extended_offset = 0; } @@ -4440,7 +1821,7 @@ delete_partition(int i) if (!q->sys_ind && i > 4) { /* the last one in the chain - just delete */ - --partitions; + --g_partitions; --i; clear_partition(ptes[i].ext_pointer); ptes[i].changed = 1; @@ -4453,27 +1834,28 @@ delete_partition(int i) set_start_sect(p, get_start_sect(q)); set_nr_sects(p, get_nr_sects(q)); ptes[i-1].changed = 1; - } else if (partitions > 5) { /* 5 will be moved to 4 */ + } else if (g_partitions > 5) { /* 5 will be moved to 4 */ /* the first logical in a longer chain */ pe = &ptes[5]; if (pe->part_table) /* prevent SEGFAULT */ set_start_sect(pe->part_table, - get_partition_start(pe) - - extended_offset); - pe->offset = extended_offset; + get_partition_start_from_dev_start(pe) - + extended_offset); + pe->offset_from_dev_start = extended_offset; pe->changed = 1; } - if (partitions > 5) { - partitions--; - while (i < partitions) { + if (g_partitions > 5) { + g_partitions--; + while (i < g_partitions) { ptes[i] = ptes[i+1]; i++; } - } else + } else { /* the only logical: clear only */ clear_partition(ptes[i].part_table); + } } } @@ -4483,18 +1865,14 @@ change_sysid(void) int i, sys, origsys; struct partition *p; -#ifdef CONFIG_FEATURE_SGI_LABEL /* If sgi_label then don't use get_existing_partition, let the user select a partition, since get_existing_partition() only works for Linux like partition tables. */ - if (label_sgi != current_label_type) { - i = get_existing_partition(0, partitions); + if (!LABEL_IS_SGI) { + i = get_existing_partition(0, g_partitions); } else { - i = get_partition(0, partitions); + i = get_partition(0, g_partitions); } -#else - i = get_existing_partition(0, partitions); -#endif if (i == -1) return; p = ptes[i].part_table; @@ -4502,143 +1880,133 @@ change_sysid(void) /* if changing types T to 0 is allowed, then the reverse change must be allowed, too */ - if (!sys && label_sgi != current_label_type && - label_sun != current_label_type && !get_nr_sects(p)) - { - printf(_("Partition %d does not exist yet!\n"), i + 1); - } else while (1) { - sys = read_hex (get_sys_types()); - - if (!sys && label_sgi != current_label_type && - label_sun != current_label_type) - { - printf(_("Type 0 means free space to many systems\n" - "(but not to Linux). Having partitions of\n" - "type 0 is probably unwise. You can delete\n" - "a partition using the `d' command.\n")); + if (!sys && !LABEL_IS_SGI && !LABEL_IS_SUN && !get_nr_sects(p)) { + printf("Partition %u does not exist yet!\n", i + 1); + return; + } + while (1) { + sys = read_hex(get_sys_types()); + + if (!sys && !LABEL_IS_SGI && !LABEL_IS_SUN) { + puts("Type 0 means free space to many systems\n" + "(but not to Linux). Having partitions of\n" + "type 0 is probably unwise."); /* break; */ } - if (label_sun != current_label_type && label_sgi != current_label_type) { + if (!LABEL_IS_SUN && !LABEL_IS_SGI) { if (IS_EXTENDED(sys) != IS_EXTENDED(p->sys_ind)) { - printf(_("You cannot change a partition into" - " an extended one or vice versa\n" - "Delete it first.\n")); + puts("You cannot change a partition into" + " an extended one or vice versa"); break; } } if (sys < 256) { -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type && i == 2 && sys != WHOLE_DISK) - printf(_("Consider leaving partition 3 " - "as Whole disk (5),\n" - "as SunOS/Solaris expects it and " - "even Linux likes it.\n\n")); -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type && +#if ENABLE_FEATURE_SUN_LABEL + if (LABEL_IS_SUN && i == 2 && sys != SUN_WHOLE_DISK) + puts("Consider leaving partition 3 " + "as Whole disk (5),\n" + "as SunOS/Solaris expects it and " + "even Linux likes it\n"); +#endif +#if ENABLE_FEATURE_SGI_LABEL + if (LABEL_IS_SGI && ( - (i == 10 && sys != ENTIRE_DISK) || + (i == 10 && sys != SGI_ENTIRE_DISK) || (i == 8 && sys != 0) ) - ){ - printf(_("Consider leaving partition 9 " - "as volume header (0),\nand " - "partition 11 as entire volume (6)" - "as IRIX expects it.\n\n")); + ) { + puts("Consider leaving partition 9 " + "as volume header (0),\nand " + "partition 11 as entire volume (6)" + "as IRIX expects it\n"); } #endif if (sys == origsys) break; -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) { + if (LABEL_IS_SUN) { sun_change_sysid(i, sys); - } else -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { + } else if (LABEL_IS_SGI) { sgi_change_sysid(i, sys); } else -#endif p->sys_ind = sys; - printf(_("Changed system type of partition %d " - "to %x (%s)\n"), i + 1, sys, + printf("Changed system type of partition %u " + "to %x (%s)\n", i + 1, sys, partition_type(sys)); ptes[i].changed = 1; - if (is_dos_partition(origsys) || - is_dos_partition(sys)) - dos_changed = 1; + //if (is_dos_partition(origsys) || is_dos_partition(sys)) + // dos_changed = 1; break; } } } -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ +#endif /* FEATURE_FDISK_WRITABLE */ -/* check_consistency() and long2chs() added Sat Mar 6 12:28:16 1993, +/* check_consistency() and linear2chs() added Sat Mar 6 12:28:16 1993, * faith@cs.unc.edu, based on code fragments from pfdisk by Gordon W. Ross, * Jan. 1990 (version 1.2.1 by Gordon W. Ross Aug. 1990; Modified by S. * Lubkin Oct. 1991). */ static void -long2chs(ulong ls, uint *c, uint *h, uint *s) +linear2chs(unsigned ls, unsigned *c, unsigned *h, unsigned *s) { - int spc = heads * sectors; + int spc = g_heads * g_sectors; *c = ls / spc; ls = ls % spc; - *h = ls / sectors; - *s = ls % sectors + 1; /* sectors count from 1 */ + *h = ls / g_sectors; + *s = ls % g_sectors + 1; /* sectors count from 1 */ } static void check_consistency(const struct partition *p, int partition) { - uint pbc, pbh, pbs; /* physical beginning c, h, s */ - uint pec, peh, pes; /* physical ending c, h, s */ - uint lbc, lbh, lbs; /* logical beginning c, h, s */ - uint lec, leh, les; /* logical ending c, h, s */ + unsigned pbc, pbh, pbs; /* physical beginning c, h, s */ + unsigned pec, peh, pes; /* physical ending c, h, s */ + unsigned lbc, lbh, lbs; /* logical beginning c, h, s */ + unsigned lec, leh, les; /* logical ending c, h, s */ - if (!heads || !sectors || (partition >= 4)) + if (!g_heads || !g_sectors || (partition >= 4)) return; /* do not check extended partitions */ /* physical beginning c, h, s */ - pbc = (p->cyl & 0xff) | ((p->sector << 2) & 0x300); + pbc = cylinder(p->sector, p->cyl); pbh = p->head; - pbs = p->sector & 0x3f; + pbs = sector(p->sector); /* physical ending c, h, s */ - pec = (p->end_cyl & 0xff) | ((p->end_sector << 2) & 0x300); + pec = cylinder(p->end_sector, p->end_cyl); peh = p->end_head; - pes = p->end_sector & 0x3f; + pes = sector(p->end_sector); /* compute logical beginning (c, h, s) */ - long2chs(get_start_sect(p), &lbc, &lbh, &lbs); + linear2chs(get_start_sect(p), &lbc, &lbh, &lbs); /* compute logical ending (c, h, s) */ - long2chs(get_start_sect(p) + get_nr_sects(p) - 1, &lec, &leh, &les); + linear2chs(get_start_sect(p) + get_nr_sects(p) - 1, &lec, &leh, &les); /* Same physical / logical beginning? */ - if (cylinders <= 1024 && (pbc != lbc || pbh != lbh || pbs != lbs)) { - printf(_("Partition %d has different physical/logical " - "beginnings (non-Linux?):\n"), partition + 1); - printf(_(" phys=(%d, %d, %d) "), pbc, pbh, pbs); - printf(_("logical=(%d, %d, %d)\n"),lbc, lbh, lbs); + if (g_cylinders <= 1024 && (pbc != lbc || pbh != lbh || pbs != lbs)) { + printf("Partition %u has different physical/logical " + "start (non-Linux?):\n", partition + 1); + printf(" phys=(%u,%u,%u) ", pbc, pbh, pbs); + printf("logical=(%u,%u,%u)\n", lbc, lbh, lbs); } /* Same physical / logical ending? */ - if (cylinders <= 1024 && (pec != lec || peh != leh || pes != les)) { - printf(_("Partition %d has different physical/logical " - "endings:\n"), partition + 1); - printf(_(" phys=(%d, %d, %d) "), pec, peh, pes); - printf(_("logical=(%d, %d, %d)\n"),lec, leh, les); + if (g_cylinders <= 1024 && (pec != lec || peh != leh || pes != les)) { + printf("Partition %u has different physical/logical " + "end:\n", partition + 1); + printf(" phys=(%u,%u,%u) ", pec, peh, pes); + printf("logical=(%u,%u,%u)\n", lec, leh, les); } /* Ending on cylinder boundary? */ - if (peh != (heads - 1) || pes != sectors) { - printf(_("Partition %i does not end on cylinder boundary.\n"), + if (peh != (g_heads - 1) || pes != g_sectors) { + printf("Partition %u does not end on cylinder boundary\n", partition + 1); } } @@ -4646,23 +2014,24 @@ check_consistency(const struct partition *p, int partition) static void list_disk_geometry(void) { - long long bytes = (total_number_of_sectors << 9); - long megabytes = bytes/1000000; - - if (megabytes < 10000) - printf(_("\nDisk %s: %ld MB, %lld bytes\n"), - disk_device, megabytes, bytes); - else - printf(_("\nDisk %s: %ld.%ld GB, %lld bytes\n"), - disk_device, megabytes/1000, (megabytes/100)%10, bytes); - printf(_("%d heads, %d sectors/track, %d cylinders"), - heads, sectors, cylinders); - if (units_per_sector == 1) - printf(_(", total %llu sectors"), - total_number_of_sectors / (sector_size/512)); - printf(_("\nUnits = %s of %d * %d = %d bytes\n\n"), - str_units(PLURAL), - units_per_sector, sector_size, units_per_sector * sector_size); + ullong bytes = ((ullong)total_number_of_sectors << 9); + ullong xbytes = bytes / (1024*1024); + char x = 'M'; + + if (xbytes >= 10000) { + xbytes += 512; /* fdisk util-linux 2.28 does this */ + xbytes /= 1024; + x = 'G'; + } + printf("Disk %s: %llu %cB, %llu bytes, %"SECT_FMT"u sectors\n" + "%u cylinders, %u heads, %u sectors/track\n" + "Units: %s of %u * %u = %u bytes\n\n", + disk_device, xbytes, x, + bytes, total_number_of_sectors, + g_cylinders, g_heads, g_sectors, + str_units(PLURAL), + units_per_sector, sector_size, units_per_sector * sector_size + ); } /* @@ -4675,17 +2044,18 @@ wrong_p_order(int *prev) { const struct pte *pe; const struct partition *p; - off_t last_p_start_pos = 0, p_start_pos; - int i, last_i = 0; + sector_t last_p_start_pos = 0, p_start_pos; + unsigned i, last_i = 0; - for (i = 0 ; i < partitions; i++) { + for (i = 0; i < g_partitions; i++) { if (i == 4) { last_i = 4; last_p_start_pos = 0; } pe = &ptes[i]; - if ((p = pe->part_table)->sys_ind) { - p_start_pos = get_partition_start(pe); + p = pe->part_table; + if (p->sys_ind) { + p_start_pos = get_partition_start_from_dev_start(pe); if (last_p_start_pos > p_start_pos) { if (prev) @@ -4700,7 +2070,7 @@ wrong_p_order(int *prev) return 0; } -#ifdef CONFIG_FEATURE_FDISK_ADVANCED +#if ENABLE_FEATURE_FDISK_ADVANCED /* * Fix the chain of logicals. * extended_offset is unchanged, the set of sectors used is unchanged @@ -4723,12 +2093,12 @@ fix_chain_of_logicals(void) /* Stage 1: sort sectors but leave sector of part 4 */ /* (Its sector is the global extended_offset.) */ stage1: - for (j = 5; j < partitions-1; j++) { - oj = ptes[j].offset; - ojj = ptes[j+1].offset; + for (j = 5; j < g_partitions - 1; j++) { + oj = ptes[j].offset_from_dev_start; + ojj = ptes[j+1].offset_from_dev_start; if (oj > ojj) { - ptes[j].offset = ojj; - ptes[j+1].offset = oj; + ptes[j].offset_from_dev_start = ojj; + ptes[j+1].offset_from_dev_start = oj; pj = ptes[j].part_table; set_start_sect(pj, get_start_sect(pj)+oj-ojj); pjj = ptes[j+1].part_table; @@ -4743,13 +2113,13 @@ fix_chain_of_logicals(void) /* Stage 2: sort starting sectors */ stage2: - for (j = 4; j < partitions-1; j++) { + for (j = 4; j < g_partitions - 1; j++) { pj = ptes[j].part_table; pjj = ptes[j+1].part_table; sj = get_start_sect(pj); sjj = get_start_sect(pjj); - oj = ptes[j].offset; - ojj = ptes[j+1].offset; + oj = ptes[j].offset_from_dev_start; + ojj = ptes[j+1].offset_from_dev_start; if (oj+sj > ojj+sjj) { tmp = *pj; *pj = *pjj; @@ -4761,7 +2131,7 @@ fix_chain_of_logicals(void) } /* Probably something was changed */ - for (j = 4; j < partitions; j++) + for (j = 4; j < g_partitions; j++) ptes[j].changed = 1; } @@ -4773,7 +2143,7 @@ fix_partition_table_order(void) int i,k; if (!wrong_p_order(NULL)) { - printf(_("Nothing to do. Ordering is correct already.\n\n")); + puts("Ordering is already correct\n"); return; } @@ -4801,92 +2171,113 @@ fix_partition_table_order(void) if (i) fix_chain_of_logicals(); - printf("Done.\n"); - + puts("Done"); } #endif +static const char * +chs_string11(unsigned cyl, unsigned head, unsigned sect) +{ + char *buf = auto_string(xzalloc(sizeof(int)*3 * 3)); + sprintf(buf, "%u,%u,%u", cylinder(sect,cyl), head, sector(sect)); + return buf; +} + static void list_table(int xtra) { - const struct partition *p; int i, w; -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) { + if (LABEL_IS_SUN) { sun_list_table(xtra); return; } -#endif - -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { + if (LABEL_IS_SGI) { sgi_list_table(xtra); return; } -#endif + if (LABEL_IS_GPT) { + gpt_list_table(xtra); + return; + } list_disk_geometry(); -#ifdef CONFIG_FEATURE_OSF_LABEL - if (label_osf == current_label_type) { + if (LABEL_IS_OSF) { xbsd_print_disklabel(xtra); return; } -#endif /* Heuristic: we list partition 3 of /dev/foo as /dev/foo3, - but if the device name ends in a digit, say /dev/foo1, - then the partition is called /dev/foo1p3. */ + * but if the device name ends in a digit, say /dev/foo1, + * then the partition is called /dev/foo1p3. + */ w = strlen(disk_device); if (w && isdigit(disk_device[w-1])) w++; - if (w < 5) - w = 5; + if (w < 7) + w = 7; - printf(_("%*s Boot Start End Blocks Id System\n"), - w+1, _("Device")); + printf("%-*s Boot StartCHS EndCHS StartLBA EndLBA Sectors Size Id Type\n", + w-1, "Device"); - for (i = 0; i < partitions; i++) { + for (i = 0; i < g_partitions; i++) { + const struct partition *p; const struct pte *pe = &ptes[i]; + char boot4[4]; + char numstr6[6]; + sector_t start_sect; + sector_t end_sect; + sector_t nr_sects; p = pe->part_table; - if (p && !is_cleared_partition(p)) { - off_t psects = get_nr_sects(p); - off_t pblocks = psects; - unsigned int podd = 0; + if (!p || is_cleared_partition(p)) + continue; - if (sector_size < 1024) { - pblocks /= (1024 / sector_size); - podd = psects % (1024 / sector_size); - } - if (sector_size > 1024) - pblocks *= (sector_size / 1024); - printf( - "%s %c %11llu %11llu %11llu%c %2x %s\n", - partname(disk_device, i+1, w+2), -/* boot flag */ !p->boot_ind ? ' ' : p->boot_ind == ACTIVE_FLAG - ? '*' : '?', -/* start */ (unsigned long long) cround(get_partition_start(pe)), -/* end */ (unsigned long long) cround(get_partition_start(pe) + psects - - (psects ? 1 : 0)), -/* odd flag on end */ (unsigned long long) pblocks, podd ? '+' : ' ', -/* type id */ p->sys_ind, -/* type name */ partition_type(p->sys_ind)); - check_consistency(p, i); + sprintf(boot4, "%02x", p->boot_ind); + if ((p->boot_ind & 0x7f) == 0) { + /* 0x80 shown as '*', 0x00 is ' ' */ + boot4[0] = p->boot_ind ? '*' : ' '; + boot4[1] = ' '; } + + start_sect = get_partition_start_from_dev_start(pe); + end_sect = start_sect; + nr_sects = get_nr_sects(p); + if (nr_sects != 0) + end_sect += nr_sects - 1; + + smart_ulltoa5((ullong)nr_sects * sector_size, + numstr6, " KMGTPEZY")[0] = '\0'; + +#define SFMT SECT_FMT + // Boot StartCHS EndCHS StartLBA EndLBA Sectors Size Id Type + printf("%s%s %-11s"/**/" %-11s"/**/" %10"SFMT"u %10"SFMT"u %10"SFMT"u %s %2x %s\n", + partname(disk_device, i+1, w+2), + boot4, + chs_string11(p->cyl, p->head, p->sector), + chs_string11(p->end_cyl, p->end_head, p->end_sector), + start_sect, + end_sect, + nr_sects, + numstr6, + p->sys_ind, + partition_type(p->sys_ind) + ); +#undef SFMT + check_consistency(p, i); } /* 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 (label_dos == current_label_type && wrong_p_order(NULL)) { + /* partition table entries are not checked for correct order + * if this is a sgi, sun or aix labeled disk... */ + if (LABEL_IS_DOS && wrong_p_order(NULL)) { /* FIXME */ - printf(_("\nPartition table entries are not in disk order\n")); + puts("\nPartition table entries are not in disk order"); } } -#ifdef CONFIG_FEATURE_FDISK_ADVANCED +#if ENABLE_FEATURE_FDISK_ADVANCED static void x_list_table(int extend) { @@ -4894,20 +2285,25 @@ x_list_table(int extend) const struct partition *p; int i; - printf(_("\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"), - disk_device, heads, sectors, cylinders); - printf(_("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n")); - for (i = 0 ; i < partitions; i++) { + printf("\nDisk %s: %u heads, %u sectors, %u cylinders\n\n", + disk_device, g_heads, g_sectors, g_cylinders); + puts("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID"); + for (i = 0; i < g_partitions; i++) { pe = &ptes[i]; p = (extend ? pe->ext_pointer : pe->part_table); if (p != NULL) { - printf("%2d %02x%4d%4d%5d%4d%4d%5d%11u%11u %02x\n", - i + 1, p->boot_ind, p->head, + printf("%2u %02x%4u%4u%5u%4u%4u%5u%11"SECT_FMT"u%11"SECT_FMT"u %02x\n", + i + 1, p->boot_ind, + p->head, sector(p->sector), - cylinder(p->sector, p->cyl), p->end_head, + cylinder(p->sector, p->cyl), + p->end_head, sector(p->end_sector), cylinder(p->end_sector, p->end_cyl), - get_start_sect(p), get_nr_sects(p), p->sys_ind); + get_start_sect(p), + get_nr_sects(p), + p->sys_ind + ); if (p->sys_ind) check_consistency(p, i); } @@ -4915,127 +2311,128 @@ x_list_table(int extend) } #endif -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE static void -fill_bounds(off_t *first, off_t *last) +fill_bounds(sector_t *first, sector_t *last) { - int i; + unsigned i; const struct pte *pe = &ptes[0]; const struct partition *p; - for (i = 0; i < partitions; pe++,i++) { + for (i = 0; i < g_partitions; pe++,i++) { p = pe->part_table; if (!p->sys_ind || IS_EXTENDED(p->sys_ind)) { first[i] = 0xffffffff; last[i] = 0; } else { - first[i] = get_partition_start(pe); + first[i] = get_partition_start_from_dev_start(pe); last[i] = first[i] + get_nr_sects(p) - 1; } } } static void -check(int n, uint h, uint s, uint c, off_t start) +check(int n, unsigned h, unsigned s, unsigned c, sector_t start) { - off_t total, real_s, real_c; + sector_t total, real_s, real_c; real_s = sector(s) - 1; real_c = cylinder(s, c); - total = (real_c * sectors + real_s) * heads + h; + total = (real_c * g_sectors + real_s) * g_heads + h; if (!total) - fprintf(stderr, _("Warning: partition %d contains sector 0\n"), n); - if (h >= heads) - fprintf(stderr, - _("Partition %d: head %d greater than maximum %d\n"), - n, h + 1, heads); - if (real_s >= sectors) - fprintf(stderr, _("Partition %d: sector %d greater than " - "maximum %d\n"), n, s, sectors); - if (real_c >= cylinders) - fprintf(stderr, _("Partitions %d: cylinder %llu greater than " - "maximum %d\n"), n, (unsigned long long)real_c + 1, cylinders); - if (cylinders <= 1024 && start != total) - fprintf(stderr, - _("Partition %d: previous sectors %llu disagrees with " - "total %llu\n"), n, (unsigned long long)start, (unsigned long long)total); + printf("Partition %u contains sector 0\n", n); + if (h >= g_heads) + printf("Partition %u: head %u greater than maximum %u\n", + n, h + 1, g_heads); + if (real_s >= g_sectors) + printf("Partition %u: sector %u greater than " + "maximum %u\n", n, s, g_sectors); + if (real_c >= g_cylinders) + printf("Partition %u: cylinder %"SECT_FMT"u greater than " + "maximum %u\n", n, real_c + 1, g_cylinders); + if (g_cylinders <= 1024 && start != total) + printf("Partition %u: previous sectors %"SECT_FMT"u disagrees with " + "total %"SECT_FMT"u\n", n, start, total); } static void verify(void) { int i, j; - uint total = 1; - off_t first[partitions], last[partitions]; + sector_t total = 1; + sector_t chs_size; + sector_t first[g_partitions], last[g_partitions]; struct partition *p; if (warn_geometry()) return; -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) { + if (LABEL_IS_SUN) { verify_sun(); return; } -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { + if (LABEL_IS_SGI) { verify_sgi(1); return; } -#endif fill_bounds(first, last); - for (i = 0; i < partitions; i++) { + for (i = 0; i < g_partitions; i++) { struct pte *pe = &ptes[i]; p = pe->part_table; if (p->sys_ind && !IS_EXTENDED(p->sys_ind)) { check_consistency(p, i); - if (get_partition_start(pe) < first[i]) - printf(_("Warning: bad start-of-data in " - "partition %d\n"), i + 1); + if (get_partition_start_from_dev_start(pe) < first[i]) + printf("Warning: bad start-of-data in " + "partition %u\n", i + 1); check(i + 1, p->end_head, p->end_sector, p->end_cyl, last[i]); total += last[i] + 1 - first[i]; - for (j = 0; j < i; j++) - if ((first[i] >= first[j] && first[i] <= last[j]) - || ((last[i] <= last[j] && last[i] >= first[j]))) { - printf(_("Warning: partition %d overlaps " - "partition %d.\n"), j + 1, i + 1); - total += first[i] >= first[j] ? - first[i] : first[j]; - total -= last[i] <= last[j] ? - last[i] : last[j]; + for (j = 0; j < i; j++) { + if ((first[i] >= first[j] && first[i] <= last[j]) + || ((last[i] <= last[j] && last[i] >= first[j]))) { + printf("Warning: partition %u overlaps " + "partition %u\n", j + 1, i + 1); + total += first[i] >= first[j] ? + first[i] : first[j]; + total -= last[i] <= last[j] ? + last[i] : last[j]; + } } } } if (extended_offset) { struct pte *pex = &ptes[ext_index]; - off_t e_last = get_start_sect(pex->part_table) + + sector_t e_last = get_start_sect(pex->part_table) + get_nr_sects(pex->part_table) - 1; - for (i = 4; i < partitions; i++) { + for (i = 4; i < g_partitions; i++) { total++; p = ptes[i].part_table; if (!p->sys_ind) { - if (i != 4 || i + 1 < partitions) - printf(_("Warning: partition %d " - "is empty\n"), i + 1); + if (i != 4 || i + 1 < g_partitions) + printf("Warning: partition %u " + "is empty\n", i + 1); + } else if (first[i] < extended_offset || last[i] > e_last) { + printf("Logical partition %u not entirely in " + "partition %u\n", i + 1, ext_index + 1); } - else if (first[i] < extended_offset || - last[i] > e_last) - printf(_("Logical partition %d not entirely in " - "partition %d\n"), i + 1, ext_index + 1); } } - if (total > heads * sectors * cylinders) - printf(_("Total allocated sectors %d greater than the maximum " - "%d\n"), total, heads * sectors * cylinders); - else if ((total = heads * sectors * cylinders - total) != 0) - printf(_("%d unallocated sectors\n"), total); + chs_size = (sector_t)g_heads * g_sectors * g_cylinders; + if (total > chs_size) + printf("Total allocated sectors %u" + " greater than CHS size %"SECT_FMT"u\n", + total, chs_size + ); + else { + total = chs_size - total; + if (total != 0) + printf("%"SECT_FMT"u unallocated sectors\n", total); + } } static void @@ -5045,25 +2442,21 @@ add_partition(int n, int sys) int i, num_read = 0; struct partition *p = ptes[n].part_table; struct partition *q = ptes[ext_index].part_table; - long long llimit; - off_t start, stop = 0, limit, temp, - first[partitions], last[partitions]; + sector_t limit, temp; + sector_t start, stop = 0; + sector_t first[g_partitions], last[g_partitions]; if (p && p->sys_ind) { - printf(_("Partition %d is already defined. Delete " - "it before re-adding it.\n"), n + 1); + printf(msg_part_already_defined, n + 1); return; } fill_bounds(first, last); if (n < 4) { start = sector_offset; if (display_in_cyl_units || !total_number_of_sectors) - llimit = heads * sectors * cylinders - 1; + limit = (sector_t) g_heads * g_sectors * g_cylinders - 1; else - llimit = total_number_of_sectors - 1; - limit = llimit; - if (limit != llimit) - limit = 0x7fffffff; + limit = total_number_of_sectors - 1; if (extended_offset) { first[ext_index] = extended_offset; last[ext_index] = get_start_sect(q) + @@ -5074,16 +2467,16 @@ add_partition(int n, int sys) limit = get_start_sect(q) + get_nr_sects(q) - 1; } if (display_in_cyl_units) - for (i = 0; i < partitions; i++) + for (i = 0; i < g_partitions; i++) first[i] = (cround(first[i]) - 1) * units_per_sector; - snprintf(mesg, sizeof(mesg), _("First %s"), str_units(SINGULAR)); + snprintf(mesg, sizeof(mesg), "First %s", str_units(SINGULAR)); do { temp = start; - for (i = 0; i < partitions; i++) { + for (i = 0; i < g_partitions; i++) { int lastplusoff; - if (start == ptes[i].offset) + if (start == ptes[i].offset_from_dev_start) start += sector_offset; lastplusoff = last[i] + ((n < 4) ? 0 : sector_offset); if (start >= first[i] && start <= lastplusoff) @@ -5092,19 +2485,19 @@ add_partition(int n, int sys) if (start > limit) break; if (start >= temp+units_per_sector && num_read) { - printf(_("Sector %llu is already allocated\n"), (unsigned long long)temp); + printf("Sector %"SECT_FMT"u is already allocated\n", temp); temp = start; num_read = 0; } if (!num_read && start == temp) { - off_t saved_start; + sector_t saved_start; saved_start = start; - start = read_int(cround(saved_start), cround(saved_start), cround(limit), - 0, mesg); + start = read_int(cround(saved_start), cround(saved_start), cround(limit), 0, mesg); if (display_in_cyl_units) { start = (start - 1) * units_per_sector; - if (start < saved_start) start = saved_start; + if (start < saved_start) + start = saved_start; } num_read = 1; } @@ -5112,36 +2505,35 @@ add_partition(int n, int sys) if (n > 4) { /* NOT for fifth partition */ struct pte *pe = &ptes[n]; - pe->offset = start - sector_offset; - if (pe->offset == extended_offset) { /* must be corrected */ - pe->offset++; + pe->offset_from_dev_start = start - sector_offset; + if (pe->offset_from_dev_start == extended_offset) { /* must be corrected */ + pe->offset_from_dev_start++; if (sector_offset == 1) start++; } } - for (i = 0; i < partitions; i++) { + for (i = 0; i < g_partitions; i++) { struct pte *pe = &ptes[i]; - if (start < pe->offset && limit >= pe->offset) - limit = pe->offset - 1; + if (start < pe->offset_from_dev_start && limit >= pe->offset_from_dev_start) + limit = pe->offset_from_dev_start - 1; if (start < first[i] && limit >= first[i]) limit = first[i] - 1; } if (start > limit) { - printf(_("No free sectors available\n")); + puts("No free sectors available"); if (n > 4) - partitions--; + g_partitions--; return; } if (cround(start) == cround(limit)) { stop = limit; } else { snprintf(mesg, sizeof(mesg), - _("Last %s or +size or +sizeM or +sizeK"), + "Last %s or +size or +sizeM or +sizeK", str_units(SINGULAR)); - stop = read_int(cround(start), cround(limit), cround(limit), - cround(start), mesg); + stop = read_int(cround(start), cround(limit), cround(limit), cround(start), mesg); if (display_in_cyl_units) { stop = stop * units_per_sector - 1; if (stop >limit) @@ -5151,7 +2543,7 @@ add_partition(int n, int sys) set_partition(n, 0, start, stop, sys); if (n > 4) - set_partition(n - 1, 1, ptes[n].offset, stop, EXTENDED); + set_partition(n - 1, 1, ptes[n].offset_from_dev_start, stop, EXTENDED); if (IS_EXTENDED(sys)) { struct pte *pe4 = &ptes[4]; @@ -5159,29 +2551,29 @@ add_partition(int n, int sys) ext_index = n; pen->ext_pointer = p; - pe4->offset = extended_offset = start; + pe4->offset_from_dev_start = extended_offset = start; pe4->sectorbuffer = xzalloc(sector_size); pe4->part_table = pt_offset(pe4->sectorbuffer, 0); pe4->ext_pointer = pe4->part_table + 1; pe4->changed = 1; - partitions = 5; + g_partitions = 5; } } static void add_logical(void) { - if (partitions > 5 || ptes[4].part_table->sys_ind) { - struct pte *pe = &ptes[partitions]; + if (g_partitions > 5 || ptes[4].part_table->sys_ind) { + struct pte *pe = &ptes[g_partitions]; pe->sectorbuffer = xzalloc(sector_size); pe->part_table = pt_offset(pe->sectorbuffer, 0); pe->ext_pointer = pe->part_table + 1; - pe->offset = 0; + pe->offset_from_dev_start = 0; pe->changed = 1; - partitions++; + g_partitions++; } - add_partition(partitions - 1, LINUX_NATIVE); + add_partition(g_partitions - 1, LINUX_NATIVE); } static void @@ -5192,34 +2584,26 @@ new_partition(void) if (warn_geometry()) return; -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) { - add_sun_partition(get_partition(0, partitions), LINUX_NATIVE); + if (LABEL_IS_SUN) { + add_sun_partition(get_partition(0, g_partitions), LINUX_NATIVE); return; } -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { - sgi_add_partition(get_partition(0, partitions), LINUX_NATIVE); + if (LABEL_IS_SGI) { + sgi_add_partition(get_partition(0, g_partitions), LINUX_NATIVE); return; } -#endif -#ifdef CONFIG_FEATURE_AIX_LABEL - if (label_aix == current_label_type) { - printf(_("\tSorry - this fdisk cannot handle AIX disk labels." - "\n\tIf you want to add DOS-type partitions, create" - "\n\ta new empty DOS partition table first. (Use o.)" - "\n\tWARNING: " - "This will destroy the present disk contents.\n")); + if (LABEL_IS_AIX) { + puts("Sorry - this fdisk cannot handle AIX disk labels.\n" +"If you want to add DOS-type partitions, create a new empty DOS partition\n" +"table first (use 'o'). This will destroy the present disk contents."); return; } -#endif for (i = 0; i < 4; i++) free_primary += !ptes[i].part_table->sys_ind; - if (!free_primary && partitions >= MAXIMUM_PARTS) { - printf(_("The maximum number of partitions has been created\n")); + if (!free_primary && g_partitions >= MAXIMUM_PARTS) { + puts("The maximum number of partitions has been created"); return; } @@ -5227,126 +2611,105 @@ new_partition(void) if (extended_offset) add_logical(); else - printf(_("You must delete some partition and add " - "an extended partition first\n")); + puts("You must delete some partition and add " + "an extended partition first"); } else { - char c, line[LINE_LENGTH]; - snprintf(line, sizeof(line), "%s\n %s\n p primary " - "partition (1-4)\n", - "Command action", (extended_offset ? - "l logical (5 or over)" : "e extended")); + char c, line[80]; + snprintf(line, sizeof(line), + "Command action\n" + " %s\n" + " p primary partition (1-4)\n", + (extended_offset ? + "l logical (5 or over)" : "e extended")); while (1) { - if ((c = read_char(line)) == 'p' || c == 'P') { + c = read_nonempty(line); + if ((c | 0x20) == 'p') { i = get_nonexisting_partition(0, 4); if (i >= 0) add_partition(i, LINUX_NATIVE); return; } - else if (c == 'l' && extended_offset) { + if (c == 'l' && extended_offset) { add_logical(); return; } - else if (c == 'e' && !extended_offset) { + if (c == 'e' && !extended_offset) { i = get_nonexisting_partition(0, 4); if (i >= 0) add_partition(i, EXTENDED); return; } - else - printf(_("Invalid partition number " - "for type `%c'\n"), c); + printf("Invalid partition number " + "for type '%c'\n", c); } } } +static void +reread_partition_table(int leave) +{ + int i; + + puts("Calling ioctl() to re-read partition table"); + sync(); + /* Users with slow external USB disks on a 320MHz ARM system (year 2011) + * report that sleep is needed, otherwise BLKRRPART may fail with -EIO: + */ + sleep(1); + i = ioctl_or_perror(dev_fd, BLKRRPART, NULL, + "WARNING: rereading partition table " + "failed, kernel still uses old table"); +#if 0 + if (dos_changed) + puts( + "\nWARNING: If you have created or modified any DOS 6.x\n" + "partitions, please see the fdisk manual page for additional\n" + "information"); +#endif + + if (leave) { + if (ENABLE_FEATURE_CLEAN_UP) + close_dev_fd(); + exit(i != 0); + } +} + static void write_table(void) { int i; - if (label_dos == current_label_type) { + if (LABEL_IS_DOS) { for (i = 0; i < 3; i++) if (ptes[i].changed) ptes[3].changed = 1; - for (i = 3; i < partitions; i++) { + for (i = 3; i < g_partitions; i++) { struct pte *pe = &ptes[i]; - if (pe->changed) { write_part_table_flag(pe->sectorbuffer); - write_sector(pe->offset, pe->sectorbuffer); + write_sector(pe->offset_from_dev_start, pe->sectorbuffer); } } } -#ifdef CONFIG_FEATURE_SGI_LABEL - else if (label_sgi == current_label_type) { - /* no test on change? the printf below might be mistaken */ + else if (LABEL_IS_SGI) { + /* no test on change? the "altered" msg below might be mistaken */ sgi_write_table(); } -#endif -#ifdef CONFIG_FEATURE_SUN_LABEL - else if (label_sun == current_label_type) { - int needw = 0; - - for (i = 0; i < 8; i++) - if (ptes[i].changed) - needw = 1; - if (needw) - sun_write_table(); + else if (LABEL_IS_SUN) { + for (i = 0; i < 8; i++) { + if (ptes[i].changed) { + sun_write_table(); + break; + } + } } -#endif - printf(_("The partition table has been altered!\n\n")); + puts("The partition table has been altered."); reread_partition_table(1); } +#endif /* FEATURE_FDISK_WRITABLE */ -static void -reread_partition_table(int leave) -{ - int error = 0; - int i; - - printf(_("Calling ioctl() to re-read partition table.\n")); - sync(); - sleep(2); - if ((i = ioctl(fd, BLKRRPART)) != 0) { - error = errno; - } else { - /* some kernel versions (1.2.x) seem to have trouble - rereading the partition table, but if asked to do it - twice, the second time works. - biro@yggdrasil.com */ - sync(); - sleep(2); - if ((i = ioctl(fd, BLKRRPART)) != 0) - error = errno; - } - - if (i) { - printf(_("\nWARNING: Re-reading the partition table " - "failed with error %d: %s.\n" - "The kernel still uses the old table.\n" - "The new table will be used " - "at the next reboot.\n"), - error, strerror(error)); - } - - if (dos_changed) - printf( - _("\nWARNING: If you have created or modified any DOS 6.x\n" - "partitions, please see the fdisk manual page for additional\n" - "information.\n")); - - if (leave) { - close(fd); - - printf(_("Syncing disks.\n")); - sync(); - sleep(4); /* for sync() */ - exit(!!i); - } -} -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ - -#ifdef CONFIG_FEATURE_FDISK_ADVANCED +#if ENABLE_FEATURE_FDISK_ADVANCED #define MAX_PER_LINE 16 static void print_buffer(char *pbuffer) @@ -5358,52 +2721,53 @@ print_buffer(char *pbuffer) printf("0x%03X:", i); printf(" %02X", (unsigned char) pbuffer[i]); if (l == MAX_PER_LINE - 1) { - printf("\n"); + bb_putchar('\n'); l = -1; } } if (l > 0) - printf("\n"); - printf("\n"); + bb_putchar('\n'); + bb_putchar('\n'); } - static void print_raw(void) { int i; - printf(_("Device: %s\n"), disk_device); -#if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_SUN_LABEL) - if (label_sun == current_label_type || label_sgi == current_label_type) + printf("Device: %s\n", disk_device); + if (LABEL_IS_SGI || LABEL_IS_SUN) print_buffer(MBRbuffer); - else -#endif - for (i = 3; i < partitions; i++) + else { + for (i = 3; i < g_partitions; i++) print_buffer(ptes[i].sectorbuffer); + } } static void -move_begin(int i) +move_begin(unsigned i) { struct pte *pe = &ptes[i]; struct partition *p = pe->part_table; - off_t new, first; + sector_t new, first, nr_sects; if (warn_geometry()) return; - if (!p->sys_ind || !get_nr_sects(p) || IS_EXTENDED(p->sys_ind)) { - printf(_("Partition %d has no data area\n"), i + 1); + nr_sects = get_nr_sects(p); + if (!p->sys_ind || !nr_sects || IS_EXTENDED(p->sys_ind)) { + printf("Partition %u has no data area\n", i + 1); return; } - first = get_partition_start(pe); - new = read_int(first, first, first + get_nr_sects(p) - 1, first, - _("New beginning of data")) - pe->offset; - - if (new != get_nr_sects(p)) { - first = get_nr_sects(p) + get_start_sect(p) - new; - set_nr_sects(p, first); - set_start_sect(p, new); + first = get_partition_start_from_dev_start(pe); /* == pe->offset_from_dev_start + get_start_sect(p) */ + new = read_int(0 /*was:first*/, first, first + nr_sects - 1, first, "New beginning of data"); + if (new != first) { + sector_t new_relative = new - pe->offset_from_dev_start; + nr_sects += (get_start_sect(p) - new_relative); + set_start_sect(p, new_relative); + set_nr_sects(p, nr_sects); + read_nonempty("Recalculate C/H/S values? (Y/N): "); + if ((line_ptr[0] | 0x20) == 'y') + set_hsc_start_end(p, new, new + nr_sects - 1); pe->changed = 1; } } @@ -5414,95 +2778,77 @@ xselect(void) char c; while (1) { - putchar('\n'); - c = tolower(read_char(_("Expert command (m for help): "))); + bb_putchar('\n'); + c = 0x20 | read_nonempty("Expert command (m for help): "); switch (c) { case 'a': -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) + if (LABEL_IS_SUN) sun_set_alt_cyl(); -#endif break; case 'b': - if (label_dos == current_label_type) - move_begin(get_partition(0, partitions)); + if (LABEL_IS_DOS) + move_begin(get_partition(0, g_partitions)); break; case 'c': - user_cylinders = cylinders = - read_int(1, cylinders, 1048576, 0, - _("Number of cylinders")); -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) - sun_set_ncyl(cylinders); -#endif - if (label_dos == current_label_type) + user_cylinders = g_cylinders = + read_int(1, g_cylinders, 1048576, 0, + "Number of cylinders"); + if (LABEL_IS_SUN) + sun_set_ncyl(g_cylinders); + if (LABEL_IS_DOS) warn_cylinders(); break; case 'd': print_raw(); break; case 'e': -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) + if (LABEL_IS_SGI) sgi_set_xcyl(); - else -#endif -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) + else if (LABEL_IS_SUN) sun_set_xcyl(); - else -#endif - if (label_dos == current_label_type) + else if (LABEL_IS_DOS) x_list_table(1); break; case 'f': - if (label_dos == current_label_type) + if (LABEL_IS_DOS) fix_partition_table_order(); break; case 'g': -#ifdef CONFIG_FEATURE_SGI_LABEL +#if ENABLE_FEATURE_SGI_LABEL create_sgilabel(); #endif break; case 'h': - user_heads = heads = read_int(1, heads, 256, 0, - _("Number of heads")); + user_heads = g_heads = read_int(1, g_heads, 256, 0, "Number of heads"); update_units(); break; case 'i': -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) + if (LABEL_IS_SUN) sun_set_ilfact(); -#endif break; case 'o': -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) + if (LABEL_IS_SUN) sun_set_rspeed(); -#endif break; case 'p': -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) + if (LABEL_IS_SUN) list_table(1); else -#endif x_list_table(0); break; case 'q': - close(fd); - printf("\n"); - exit(0); + if (ENABLE_FEATURE_CLEAN_UP) + close_dev_fd(); + bb_putchar('\n'); + exit(EXIT_SUCCESS); case 'r': return; case 's': - user_sectors = sectors = read_int(1, sectors, 63, 0, - _("Number of sectors")); + user_sectors = g_sectors = read_int(1, g_sectors, 63, 0, "Number of sectors"); if (dos_compatible_flag) { - sector_offset = sectors; - fprintf(stderr, _("Warning: setting " - "sector offset for DOS " - "compatiblity\n")); + sector_offset = g_sectors; + puts("Warning: setting sector offset for DOS " + "compatiblity"); } update_units(); break; @@ -5513,10 +2859,8 @@ xselect(void) write_table(); /* does not return */ break; case 'y': -#ifdef CONFIG_FEATURE_SUN_LABEL - if (label_sun == current_label_type) + if (LABEL_IS_SUN) sun_set_pcylcount(); -#endif break; default: xmenu(); @@ -5540,14 +2884,14 @@ is_ide_cdrom_or_tape(const char *device) the process hangs on the attempt to read a music CD. So try to be careful. This only works since 2.1.73. */ - if (strncmp("/dev/hd", device, 7)) + if (!is_prefixed_with(device, "/dev/hd")) return 0; snprintf(buf, sizeof(buf), "/proc/ide/%s/media", device+5); - procf = fopen(buf, "r"); + procf = fopen_for_read(buf); if (procf != NULL && fgets(buf, sizeof(buf), procf)) - is_ide = (!strncmp(buf, "cdrom", 5) || - !strncmp(buf, "tape", 4)); + is_ide = (is_prefixed_with(buf, "cdrom") || + is_prefixed_with(buf, "tape")); else /* Now when this proc file does not exist, skip the device when it is read-only. */ @@ -5561,7 +2905,7 @@ is_ide_cdrom_or_tape(const char *device) static void -try(const char *device, int user_specified) +open_list_and_close(const char *device, int user_specified) { int gb; @@ -5571,304 +2915,258 @@ try(const char *device, int user_specified) if (!user_specified) if (is_ide_cdrom_or_tape(device)) return; - if ((fd = open(disk_device, type_open)) >= 0) { - gb = get_boot(try_only); - if (gb > 0) { /* I/O error */ - close(fd); - } else if (gb < 0) { /* no DOS signature */ - list_disk_geometry(); - if (label_aix == current_label_type){ - return; - } -#ifdef CONFIG_FEATURE_OSF_LABEL - if (btrydev(device) < 0) -#endif - fprintf(stderr, - _("Disk %s doesn't contain a valid " - "partition table\n"), device); - close(fd); - } else { - close(fd); - list_table(0); -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - if (label_sun != current_label_type && partitions > 4){ - delete_partition(ext_index); - } -#endif - } - } else { + + /* Open disk_device, save file descriptor to dev_fd */ + errno = 0; + gb = get_boot(TRY_ONLY); + if (gb > 0) { /* I/O error */ /* Ignore other errors, since we try IDE and SCSI hard disks which may not be installed on the system. */ - if (errno == EACCES) { - fprintf(stderr, _("Cannot open %s\n"), device); - return; + if (user_specified || errno == EACCES) + bb_perror_msg("can't open '%s'", device); + return; + } + + if (gb < 0) { /* no DOS signature */ + list_disk_geometry(); + if (LABEL_IS_AIX) + goto ret; +#if ENABLE_FEATURE_OSF_LABEL + if (bsd_trydev(device) < 0) +#endif + printf("Disk %s doesn't contain a valid " + "partition table\n", device); + } else { + list_table(0); +#if ENABLE_FEATURE_FDISK_WRITABLE + if (!LABEL_IS_SUN && g_partitions > 4) { + delete_partition(ext_index); } +#endif + } + ret: + close_dev_fd(); +} + +/* Is it a whole disk? The digit check is still useful + for Xen devices for example. */ +static int is_whole_disk(const char *disk) +{ + unsigned len; + int fd = open(disk, O_RDONLY); + + if (fd != -1) { + struct hd_geometry geometry; + int err = ioctl(fd, HDIO_GETGEO, &geometry); + close(fd); + if (!err) + return (geometry.start == 0); } + + /* Treat "nameN" as a partition name, not whole disk */ + /* note: mmcblk0 should work from the geometry check above */ + len = strlen(disk); + if (len != 0 && isdigit(disk[len - 1])) + return 0; + + return 1; } /* for fdisk -l: try all things in /proc/partitions that look like a partition name (do not end in a digit) */ static void -tryprocpt(void) +list_devs_in_proc_partititons(void) { FILE *procpt; - char line[100], ptname[100], devname[120], *s; + char line[100], ptname[100], devname[120]; int ma, mi, sz; - procpt = bb_wfopen(PROC_PARTITIONS, "r"); + procpt = fopen_or_warn("/proc/partitions", "r"); while (fgets(line, sizeof(line), procpt)) { - if (sscanf(line, " %d %d %d %[^\n ]", + if (sscanf(line, " %u %u %u %[^\n ]", &ma, &mi, &sz, ptname) != 4) continue; - for (s = ptname; *s; s++); - if (isdigit(s[-1])) - continue; + sprintf(devname, "/dev/%s", ptname); - try(devname, 0); + if (is_whole_disk(devname)) + open_list_and_close(devname, 0); } -#ifdef CONFIG_FEATURE_CLEAN_UP +#if ENABLE_FEATURE_CLEAN_UP fclose(procpt); #endif } -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE static void unknown_command(int c) { - printf(_("%c: unknown command\n"), c); + printf("%c: unknown command\n", c); } #endif -int fdisk_main(int argc, char **argv) +int fdisk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int fdisk_main(int argc UNUSED_PARAM, char **argv) { - int c; -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - int optl = 0; -#endif -#ifdef CONFIG_FEATURE_FDISK_BLKSIZE - int opts = 0; -#endif + unsigned opt; /* - * Calls: * fdisk -v * fdisk -l [-b sectorsize] [-u] device ... * fdisk -s [partition] ... * fdisk [-b sectorsize] [-u] device * * Options -C, -H, -S set the geometry. - * */ - while ((c = getopt(argc, argv, "b:C:H:lS:uvV" -#ifdef CONFIG_FEATURE_FDISK_BLKSIZE - "s" -#endif - )) != -1) { - switch (c) { - case 'b': - /* Ugly: this sector size is really per device, - so cannot be combined with multiple disks, - and te same goes for the C/H/S options. - */ - sector_size = atoi(optarg); - if (sector_size != 512 && sector_size != 1024 && - sector_size != 2048) - bb_show_usage(); - sector_offset = 2; - user_set_sector_size = 1; - break; - case 'C': - user_cylinders = atoi(optarg); - break; - case 'H': - user_heads = atoi(optarg); - if (user_heads <= 0 || user_heads >= 256) - user_heads = 0; - break; - case 'S': - user_sectors = atoi(optarg); - if (user_sectors <= 0 || user_sectors >= 64) - user_sectors = 0; - break; - case 'l': -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - optl = 1; -#endif - break; -#ifdef CONFIG_FEATURE_FDISK_BLKSIZE - case 's': - opts = 1; - break; -#endif - case 'u': - display_in_cyl_units = 0; - break; - case 'V': - case 'v': - printf("fdisk v" UTIL_LINUX_VERSION "\n"); - return 0; - default: + INIT_G(); + + close_dev_fd(); /* needed: fd 3 must not stay closed */ + + opt = getopt32(argv, "b:+C:+H:+lS:+u" IF_FEATURE_FDISK_BLKSIZE("s"), + §or_size, &user_cylinders, &user_heads, &user_sectors); + argv += optind; + if (opt & OPT_b) { + /* Ugly: this sector size is really per device, + * so cannot be combined with multiple disks, + * and the same goes for the C/H/S options. + */ + if (sector_size < 512 + || sector_size > 0x10000 + || (sector_size & (sector_size-1)) /* not power of 2 */ + ) { bb_show_usage(); } + sector_offset = 2; + user_set_sector_size = 1; } + if (user_heads <= 0 || user_heads >= 256) + user_heads = 0; + if (user_sectors <= 0 || user_sectors >= 64) + user_sectors = 0; + if (opt & OPT_u) + display_in_cyl_units = 0; // -u - if (user_set_sector_size && argc-optind != 1) - printf(_("Warning: the -b (set sector size) option should" - " be used with one specified device\n")); - -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - if (optl) { +#if ENABLE_FEATURE_FDISK_WRITABLE + if (opt & OPT_l) { nowarn = 1; #endif - type_open = O_RDONLY; - if (argc > optind) { - int k; -#if __GNUC__ - /* avoid gcc warning: - variable `k' might be clobbered by `longjmp' */ - (void)&k; -#endif + if (*argv) { listing = 1; - for (k = optind; k < argc; k++) - try(argv[k], 1); + do { + open_list_and_close(*argv, 1); + } while (*++argv); } else { - /* we no longer have default device names */ - /* but, we can use /proc/partitions instead */ - tryprocpt(); + /* we don't have device names, */ + /* use /proc/partitions instead */ + list_devs_in_proc_partititons(); } return 0; -#ifdef CONFIG_FEATURE_FDISK_WRITABLE +#if ENABLE_FEATURE_FDISK_WRITABLE } #endif -#ifdef CONFIG_FEATURE_FDISK_BLKSIZE - if (opts) { - long size; +#if ENABLE_FEATURE_FDISK_BLKSIZE + if (opt & OPT_s) { int j; nowarn = 1; - type_open = O_RDONLY; - - opts = argc - optind; - if (opts <= 0) + if (!argv[0]) bb_show_usage(); - - for (j = optind; j < argc; j++) { - disk_device = argv[j]; - if ((fd = open(disk_device, type_open)) < 0) - fdisk_fatal(unable_to_open); - if (ioctl(fd, BLKGETSIZE, &size)) - fdisk_fatal(ioctl_error); + for (j = 0; argv[j]; j++) { + unsigned long long size; + fd = xopen(argv[j], O_RDONLY); + size = bb_BLKGETSIZE_sectors(fd) / 2; close(fd); - if (opts == 1) - printf("%ld\n", size/2); + if (argv[1]) + printf("%llu\n", size); else - printf("%s: %ld\n", argv[j], size/2); + printf("%s: %llu\n", argv[j], size); } return 0; } #endif -#ifdef CONFIG_FEATURE_FDISK_WRITABLE - if (argc-optind == 1) - disk_device = argv[optind]; - else +#if ENABLE_FEATURE_FDISK_WRITABLE + if (!argv[0] || argv[1]) bb_show_usage(); - get_boot(fdisk); + disk_device = argv[0]; + get_boot(OPEN_MAIN); -#ifdef CONFIG_FEATURE_OSF_LABEL - if (label_osf == current_label_type) { + if (LABEL_IS_OSF) { /* OSF label, and no DOS label */ - printf(_("Detected an OSF/1 disklabel on %s, entering " - "disklabel mode.\n"), - disk_device); - bselect(); + printf("Detected an OSF/1 disklabel on %s, entering " + "disklabel mode\n", disk_device); + bsd_select(); /*Why do we do this? It seems to be counter-intuitive*/ - current_label_type = label_dos; + current_label_type = LABEL_DOS; /* If we return we may want to make an empty DOS label? */ } -#endif while (1) { - putchar('\n'); - c = tolower(read_char(_("Command (m for help): "))); + int c; + bb_putchar('\n'); + c = 0x20 | read_nonempty("Command (m for help): "); switch (c) { case 'a': - if (label_dos == current_label_type) - toggle_active(get_partition(1, partitions)); -#ifdef CONFIG_FEATURE_SUN_LABEL - else if (label_sun == current_label_type) - toggle_sunflags(get_partition(1, partitions), + if (LABEL_IS_DOS) + toggle_active(get_partition(1, g_partitions)); + else if (LABEL_IS_SUN) + toggle_sunflags(get_partition(1, g_partitions), 0x01); -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - else if (label_sgi == current_label_type) + else if (LABEL_IS_SGI) sgi_set_bootpartition( - get_partition(1, partitions)); -#endif + get_partition(1, g_partitions)); else unknown_command(c); break; case 'b': -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { - printf(_("\nThe current boot file is: %s\n"), + if (LABEL_IS_SGI) { + printf("\nThe current boot file is: %s\n", sgi_get_bootfile()); - if (read_chars(_("Please enter the name of the " - "new boot file: ")) == '\n') - printf(_("Boot file unchanged\n")); + if (read_maybe_empty("Please enter the name of the " + "new boot file: ") == '\n') + puts("Boot file unchanged"); else sgi_set_bootfile(line_ptr); - } else -#endif -#ifdef CONFIG_FEATURE_OSF_LABEL - bselect(); + } +#if ENABLE_FEATURE_OSF_LABEL + else + bsd_select(); #endif break; case 'c': - if (label_dos == current_label_type) + if (LABEL_IS_DOS) toggle_dos_compatibility_flag(); -#ifdef CONFIG_FEATURE_SUN_LABEL - else if (label_sun == current_label_type) - toggle_sunflags(get_partition(1, partitions), + else if (LABEL_IS_SUN) + toggle_sunflags(get_partition(1, g_partitions), 0x10); -#endif -#ifdef CONFIG_FEATURE_SGI_LABEL - else if (label_sgi == current_label_type) + else if (LABEL_IS_SGI) sgi_set_swappartition( - get_partition(1, partitions)); -#endif + get_partition(1, g_partitions)); else unknown_command(c); break; case 'd': { int j; -#ifdef CONFIG_FEATURE_SGI_LABEL /* If sgi_label then don't use get_existing_partition, let the user select a partition, since get_existing_partition() only works for Linux-like partition tables */ - if (label_sgi != current_label_type) { - j = get_existing_partition(1, partitions); + if (!LABEL_IS_SGI) { + j = get_existing_partition(1, g_partitions); } else { - j = get_partition(1, partitions); + j = get_partition(1, g_partitions); } -#else - j = get_existing_partition(1, partitions); -#endif if (j >= 0) delete_partition(j); } break; case 'i': -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) + if (LABEL_IS_SGI) create_sgiinfo(); else -#endif unknown_command(c); case 'l': list_types(get_sys_types()); @@ -5886,11 +3184,12 @@ int fdisk_main(int argc, char **argv) list_table(0); break; case 'q': - close(fd); - printf("\n"); + if (ENABLE_FEATURE_CLEAN_UP) + close_dev_fd(); + bb_putchar('\n'); return 0; case 's': -#ifdef CONFIG_FEATURE_SUN_LABEL +#if ENABLE_FEATURE_SUN_LABEL create_sunlabel(); #endif break; @@ -5904,18 +3203,14 @@ int fdisk_main(int argc, char **argv) verify(); break; case 'w': - write_table(); /* does not return */ + write_table(); /* does not return */ break; -#ifdef CONFIG_FEATURE_FDISK_ADVANCED +#if ENABLE_FEATURE_FDISK_ADVANCED case 'x': -#ifdef CONFIG_FEATURE_SGI_LABEL - if (label_sgi == current_label_type) { - fprintf(stderr, - _("\n\tSorry, no experts menu for SGI " - "partition tables available.\n\n")); + if (LABEL_IS_SGI) { + puts("\n\tSorry, no experts menu for SGI " + "partition tables available\n"); } else -#endif - xselect(); break; #endif @@ -5925,5 +3220,5 @@ int fdisk_main(int argc, char **argv) } } return 0; -#endif /* CONFIG_FEATURE_FDISK_WRITABLE */ +#endif /* FEATURE_FDISK_WRITABLE */ }