X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Ffdisk.c;h=7fe70fb72a4b1aa36bc677cb0a429534d85891c3;hb=d840c5d139cfa50fbe4f6f67c178b0edf0c690c8;hp=1bb3a9d4e72c908d8ce8a630c799e13eecf8188f;hpb=af3fd14e4df87d8af833d5e7b97d285b4d137d60;p=oweals%2Fbusybox.git diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 1bb3a9d4e..7fe70fb72 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -4,9 +4,30 @@ * 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. */ +/* 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" +//usage: "\n -S SECTORS" + #ifndef _LARGEFILE64_SOURCE /* For lseek64 */ # define _LARGEFILE64_SOURCE @@ -21,6 +42,13 @@ #endif #include "libbb.h" +#if BB_LITTLE_ENDIAN +# define inline_if_little_endian ALWAYS_INLINE +#else +# define inline_if_little_endian /* nothing */ +#endif + + /* Looks like someone forgot to add this to config system */ #ifndef ENABLE_FEATURE_FDISK_BLKSIZE # define ENABLE_FEATURE_FDISK_BLKSIZE 0 @@ -100,12 +128,30 @@ struct partition { unsigned char size4[4]; /* nr of sectors in partition */ } PACKED; -static const char unable_to_open[] ALIGN1 = "can't open '%s'"; -static const char unable_to_read[] ALIGN1 = "can't read from %s"; -static const char unable_to_seek[] ALIGN1 = "can't seek on %s"; +/* + * per partition table entry data + * + * The four primary partitions have the same sectorbuffer (MBRbuffer) + * and have NULL ext_pointer. + * Each logical partition table entry has two pointers, one for the + * partition and one link to the next one. + */ +struct pte { + struct partition *part_table; /* points into sectorbuffer */ + struct partition *ext_pointer; /* points into sectorbuffer */ + sector_t offset_from_dev_start; /* disk sector number */ + char *sectorbuffer; /* disk sector contents */ +#if ENABLE_FEATURE_FDISK_WRITABLE + char changed; /* boolean */ +#endif +}; + +#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_DOS, LABEL_SUN, LABEL_SGI, LABEL_AIX, LABEL_OSF, LABEL_GPT }; #define LABEL_IS_DOS (LABEL_DOS == current_label_type) @@ -142,6 +188,14 @@ enum label_type { #define STATIC_OSF extern #endif +#if ENABLE_FEATURE_GPT_LABEL +#define LABEL_IS_GPT (LABEL_GPT == current_label_type) +#define STATIC_GPT static +#else +#define LABEL_IS_GPT 0 +#define STATIC_GPT extern +#endif + enum action { OPEN_MAIN, TRY_ONLY, CREATE_EMPTY_DOS, CREATE_EMPTY_SUN }; static void update_units(void); @@ -155,6 +209,7 @@ static sector_t read_int(sector_t low, sector_t dflt, sector_t high, sector_t ba #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 @@ -167,24 +222,6 @@ static int get_boot(void); static sector_t get_start_sect(const struct partition *p); static sector_t get_nr_sects(const struct partition *p); -/* - * per partition table entry data - * - * The four primary partitions have the same sectorbuffer (MBRbuffer) - * and have NULL ext_pointer. - * Each logical partition table entry has two pointers, one for the - * partition and one link to the next one. - */ -struct pte { - struct partition *part_table; /* points into sectorbuffer */ - struct partition *ext_pointer; /* points into sectorbuffer */ - sector_t offset; /* disk sector number */ - char *sectorbuffer; /* disk sector contents */ -#if ENABLE_FEATURE_FDISK_WRITABLE - char changed; /* boolean */ -#endif -}; - /* DOS partition types */ static const char *const i386_sys_types[] = { @@ -400,8 +437,14 @@ static sector_t bb_BLKGETSIZE_sectors(int fd) return v64; } /* Needs temp of type long */ - if (ioctl(fd, BLKGETSIZE, &longsectors)) + 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); + } if (sizeof(long) > sizeof(sector_t) && longsectors != (sector_t)longsectors ) { @@ -428,16 +471,6 @@ static sector_t bb_BLKGETSIZE_sectors(int fd) #define hsc2sector(h,s,c) \ (sector(s) - 1 + sectors * ((h) + heads * cylinder(s,c))) -#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 close_dev_fd(void) { @@ -445,27 +478,6 @@ close_dev_fd(void) xmove_fd(xopen(bb_dev_null, O_RDONLY), dev_fd); } -#if ENABLE_FEATURE_FDISK_WRITABLE -/* Read line; return 0 or first printable char */ -static int -read_line(const char *prompt) -{ - int sz; - - sz = read_line_input(prompt, line_buffer, sizeof(line_buffer), NULL); - if (sz <= 0) - exit(EXIT_SUCCESS); /* Ctrl-D or Ctrl-C */ - - if (line_buffer[sz-1] == '\n') - line_buffer[--sz] = '\0'; - - line_ptr = line_buffer; - while (*line_ptr && !isgraph(*line_ptr)) - line_ptr++; - return *line_ptr; -} -#endif - /* * Return partition name - uses static storage */ @@ -497,30 +509,13 @@ partname(const char *dev, int pno, int lth) if (lth) { snprintf(bufp, bufsiz, "%*.*s%s%-2u", - lth-wp-2, w, dev, p, pno); + lth-wp-2, w, dev, p, pno); } else { snprintf(bufp, bufsiz, "%.*s%s%-2u", w, dev, p, pno); } return bufp; } -#if ENABLE_FEATURE_FDISK_WRITABLE -static void -set_all_unchanged(void) -{ - int i; - - for (i = 0; i < MAXIMUM_PARTS; i++) - ptes[i].changed = 0; -} - -static ALWAYS_INLINE void -set_changed(int i) -{ - ptes[i].changed = 1; -} -#endif /* FEATURE_FDISK_WRITABLE */ - static ALWAYS_INLINE struct partition * get_part_table(int i) { @@ -541,7 +536,67 @@ valid_part_table_flag(const char *mbuffer) return (mbuffer[510] == 0x55 && (uint8_t)mbuffer[511] == 0xaa); } +static void fdisk_fatal(const char *why) +{ + if (listing) { + close_dev_fd(); + longjmp(listingbuf, 1); + } + bb_error_msg_and_die(why, disk_device); +} + +static void +seek_sector(sector_t secno) +{ +#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 +} + #if ENABLE_FEATURE_FDISK_WRITABLE +/* Read line; return 0 or first printable char */ +static int +read_line(const char *prompt) +{ + int sz; + + sz = read_line_input(NULL, prompt, line_buffer, sizeof(line_buffer), /*timeout*/ -1); + if (sz <= 0) + exit(EXIT_SUCCESS); /* Ctrl-D or Ctrl-C */ + + if (line_buffer[sz-1] == '\n') + line_buffer[--sz] = '\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; +} + +static ALWAYS_INLINE void +set_changed(int i) +{ + ptes[i].changed = 1; +} + static ALWAYS_INLINE void write_part_table_flag(char *b) { @@ -574,58 +629,28 @@ read_hex(const char *const *sys) unsigned long v; while (1) { read_nonempty("Hex code (type L to list codes): "); - if (*line_ptr == 'l' || *line_ptr == 'L') { + if ((line_ptr[0] | 0x20) == 'l') { list_types(sys); continue; } v = bb_strtoul(line_ptr, NULL, 16); - if (v > 0xff) - /* Bad input also triggers this */ - continue; - return v; + if (v <= 0xff) + return v; } } -#endif /* FEATURE_FDISK_WRITABLE */ -static void fdisk_fatal(const char *why) -{ - if (listing) { - close_dev_fd(); - longjmp(listingbuf, 1); - } - bb_error_msg_and_die(why, disk_device); -} - -static void -seek_sector(sector_t secno) -{ -#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 -} - -#if ENABLE_FEATURE_FDISK_WRITABLE static void write_sector(sector_t secno, const void *buf) { seek_sector(secno); xwrite(dev_fd, buf, sector_size); } -#endif +#endif /* FEATURE_FDISK_WRITABLE */ #include "fdisk_aix.c" -typedef struct { +struct sun_partition { unsigned char info[128]; /* Informative text string */ unsigned char spare0[14]; struct sun_info { @@ -651,12 +676,16 @@ typedef struct { } partitions[8]; unsigned short magic; /* Magic number */ unsigned short csum; /* Label xor'd checksum */ -} sun_partition; +} 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" + #if ENABLE_FEATURE_SGI_LABEL || ENABLE_FEATURE_SUN_LABEL static uint16_t fdisk_swap16(uint16_t x) @@ -712,40 +741,42 @@ STATIC_SUN void sun_write_table(void); #include "fdisk_sun.c" -#if ENABLE_FEATURE_FDISK_WRITABLE -/* 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 val) +static inline_if_little_endian unsigned +read4_little_endian(const unsigned char *cp) { - cp[0] = val; - cp[1] = val >> 8; - cp[2] = val >> 16; - cp[3] = val >> 24; + uint32_t v; + move_from_unaligned32(v, cp); + return SWAP_LE32(v); } -#endif /* FEATURE_FDISK_WRITABLE */ -static unsigned -read4_little_endian(const unsigned char *cp) +static sector_t +get_start_sect(const struct partition *p) +{ + return read4_little_endian(p->start4); +} + +static sector_t +get_nr_sects(const struct partition *p) { - return cp[0] + (cp[1] << 8) + (cp[2] << 16) + (cp[3] << 24); + return read4_little_endian(p->size4); } #if ENABLE_FEATURE_FDISK_WRITABLE -static void -set_start_sect(struct partition *p, unsigned start_sect) +/* 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) { - store4_little_endian(p->start4, start_sect); + uint32_t v = SWAP_LE32(val); + move_to_unaligned32(cp, v); } -#endif -static sector_t -get_start_sect(const struct partition *p) +static void +set_start_sect(struct partition *p, unsigned start_sect) { - return read4_little_endian(p->start4); + store4_little_endian(p->start4, start_sect); } -#if ENABLE_FEATURE_FDISK_WRITABLE static void set_nr_sects(struct partition *p, unsigned nr_sects) { @@ -753,17 +784,11 @@ set_nr_sects(struct partition *p, unsigned nr_sects) } #endif -static sector_t -get_nr_sects(const struct partition *p) -{ - return read4_little_endian(p->size4); -} - /* Allocate a buffer and read a partition table sector */ static void read_pte(struct pte *pe, sector_t offset) { - pe->offset = offset; + pe->offset_from_dev_start = offset; pe->sectorbuffer = xzalloc(sector_size); seek_sector(offset); /* xread would make us abort - bad for fdisk -l */ @@ -776,9 +801,9 @@ read_pte(struct pte *pe, sector_t offset) } static sector_t -get_partition_start(const struct pte *pe) +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); } #if ENABLE_FEATURE_FDISK_WRITABLE @@ -841,6 +866,11 @@ menu(void) 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"); @@ -941,7 +971,7 @@ get_sys_types(void) } #else #define get_sys_types() i386_sys_types -#endif /* FEATURE_FDISK_WRITABLE */ +#endif static const char * partition_type(unsigned char type) @@ -956,6 +986,24 @@ partition_type(unsigned char type) 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)); +} #if ENABLE_FEATURE_FDISK_WRITABLE static int @@ -997,25 +1045,28 @@ list_types(const char *const *sys) } while (done < last[0]); bb_putchar('\n'); } -#endif /* 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); } -#if ENABLE_FEATURE_FDISK_WRITABLE static void set_partition(int i, int doext, sector_t start, sector_t stop, int sysid) { @@ -1027,18 +1078,13 @@ set_partition(int i, int doext, sector_t start, sector_t stop, int sysid) 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 / (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); + set_hsc_start_end(p, start, stop); ptes[i].changed = 1; } #endif @@ -1188,26 +1234,22 @@ read_extended(int ext) static void create_doslabel(void) { - int i; - printf(msg_building_new_label, "DOS disklabel"); current_label_type = LABEL_DOS; - #if ENABLE_FEATURE_OSF_LABEL possibly_osf_label = 0; #endif 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); } -#endif /* FEATURE_FDISK_WRITABLE */ +#endif static void get_sectorsize(void) @@ -1304,7 +1346,18 @@ get_geometry(void) /* * Opens disk_device and optionally reads MBR. - * FIXME: document what each 'what' value will do! + * 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 @@ -1324,7 +1377,7 @@ static int get_boot(void) 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; #if ENABLE_FEATURE_FDISK_WRITABLE pe->changed = (what == CREATE_EMPTY_DOS); @@ -1386,6 +1439,10 @@ static int get_boot(void) if (check_aix_label()) return 0; #endif +#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; @@ -1405,7 +1462,7 @@ static int get_boot(void) if (!valid_part_table_flag(MBRbuffer)) { if (what == OPEN_MAIN) { printf("Device contains neither a valid DOS " - "partition table, nor Sun, SGI or OSF " + "partition table, nor Sun, SGI, OSF or GPT " "disklabel\n"); #ifdef __sparc__ IF_FEATURE_SUN_LABEL(create_sunlabel();) @@ -1708,9 +1765,9 @@ delete_partition(int i) if (pe->part_table) /* prevent SEGFAULT */ set_start_sect(pe->part_table, - get_partition_start(pe) - + get_partition_start_from_dev_start(pe) - extended_offset); - pe->offset = extended_offset; + pe->offset_from_dev_start = extended_offset; pe->changed = 1; } @@ -1720,9 +1777,10 @@ delete_partition(int i) ptes[i] = ptes[i+1]; i++; } - } else + } else { /* the only logical: clear only */ clear_partition(ptes[i].part_table); + } } } @@ -1921,7 +1979,7 @@ wrong_p_order(int *prev) pe = &ptes[i]; p = pe->part_table; if (p->sys_ind) { - p_start_pos = get_partition_start(pe); + p_start_pos = get_partition_start_from_dev_start(pe); if (last_p_start_pos > p_start_pos) { if (prev) @@ -1960,11 +2018,11 @@ fix_chain_of_logicals(void) /* (Its sector is the global extended_offset.) */ stage1: for (j = 5; j < g_partitions - 1; j++) { - 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 > 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; @@ -1984,8 +2042,8 @@ fix_chain_of_logicals(void) 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; @@ -2038,7 +2096,6 @@ fix_partition_table_order(void) fix_chain_of_logicals(); printf("Done.\n"); - } #endif @@ -2052,10 +2109,14 @@ list_table(int xtra) sun_list_table(xtra); return; } - if (LABEL_IS_SUN) { + if (LABEL_IS_SGI) { sgi_list_table(xtra); return; } + if (LABEL_IS_GPT) { + gpt_list_table(xtra); + return; + } list_disk_geometry(); @@ -2102,8 +2163,8 @@ list_table(int xtra) partname(disk_device, i+1, w+2), !p->boot_ind ? ' ' : p->boot_ind == ACTIVE_FLAG /* boot flag */ ? '*' : '?', - cround(get_partition_start(pe)), /* start */ - cround(get_partition_start(pe) + psects /* end */ + cround(get_partition_start_from_dev_start(pe)), /* start */ + cround(get_partition_start_from_dev_start(pe) + psects /* end */ - (psects ? 1 : 0)), pblocks, podd ? '+' : ' ', /* odd flag on end */ p->sys_ind, /* type id */ @@ -2165,7 +2226,7 @@ fill_bounds(sector_t *first, sector_t *last) 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; } } @@ -2222,7 +2283,7 @@ verify(void) p = pe->part_table; if (p->sys_ind && !IS_EXTENDED(p->sys_ind)) { check_consistency(p, i); - if (get_partition_start(pe) < first[i]) + 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, @@ -2312,7 +2373,7 @@ add_partition(int n, int sys) 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) @@ -2329,8 +2390,7 @@ add_partition(int n, int sys) 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) @@ -2342,9 +2402,9 @@ 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++; } @@ -2353,8 +2413,8 @@ add_partition(int n, int sys) 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; } @@ -2370,8 +2430,7 @@ add_partition(int n, int sys) snprintf(mesg, sizeof(mesg), "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) @@ -2381,7 +2440,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]; @@ -2389,7 +2448,7 @@ 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; @@ -2407,7 +2466,7 @@ add_logical(void) 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; g_partitions++; } @@ -2461,7 +2520,7 @@ new_partition(void) "l logical (5 or over)" : "e extended")); while (1) { c = read_nonempty(line); - if (c == 'p' || c == 'P') { + if ((c | 0x20) == 'p') { i = get_nonexisting_partition(0, 4); if (i >= 0) add_partition(i, LINUX_NATIVE); @@ -2483,6 +2542,35 @@ new_partition(void) } } +static void +reread_partition_table(int leave) +{ + int i; + + printf("Calling ioctl() to re-read partition table\n"); + 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) + 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"); +#endif + + if (leave) { + if (ENABLE_FEATURE_CLEAN_UP) + close_dev_fd(); + exit(i != 0); + } +} + static void write_table(void) { @@ -2494,10 +2582,9 @@ write_table(void) ptes[3].changed = 1; 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); } } } @@ -2506,44 +2593,17 @@ write_table(void) sgi_write_table(); } else if (LABEL_IS_SUN) { - int needw = 0; - - for (i = 0; i < 8; i++) - if (ptes[i].changed) - needw = 1; - if (needw) - sun_write_table(); + for (i = 0; i < 8; i++) { + if (ptes[i].changed) { + sun_write_table(); + break; + } + } } - printf("The partition table has been altered!\n\n"); + printf("The partition table has been altered.\n"); reread_partition_table(1); } - -static void -reread_partition_table(int leave) -{ - int i; - - printf("Calling ioctl() to re-read partition table\n"); - sync(); - /* sleep(2); Huh? */ - i = ioctl_or_perror(dev_fd, BLKRRPART, NULL, - "WARNING: rereading partition table " - "failed, kernel still uses old table"); -#if 0 - 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"); -#endif - - if (leave) { - if (ENABLE_FEATURE_CLEAN_UP) - close_dev_fd(); - exit(i != 0); - } -} #endif /* FEATURE_FDISK_WRITABLE */ #if ENABLE_FEATURE_FDISK_ADVANCED @@ -2586,22 +2646,25 @@ move_begin(unsigned i) { struct pte *pe = &ptes[i]; struct partition *p = pe->part_table; - sector_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)) { + 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; } } @@ -2613,7 +2676,7 @@ xselect(void) while (1) { bb_putchar('\n'); - c = tolower(read_nonempty("Expert command (m for help): ")); + c = 0x20 | read_nonempty("Expert command (m for help): "); switch (c) { case 'a': if (LABEL_IS_SUN) @@ -2653,8 +2716,7 @@ xselect(void) #endif break; case 'h': - user_heads = g_heads = read_int(1, g_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': @@ -2679,8 +2741,7 @@ xselect(void) case 'r': return; case 's': - user_sectors = g_sectors = read_int(1, g_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 = g_sectors; printf("Warning: setting sector offset for DOS " @@ -2720,14 +2781,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_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. */ @@ -2785,13 +2846,37 @@ open_list_and_close(const char *device, int user_specified) 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 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 = fopen_or_warn("/proc/partitions", "r"); @@ -2800,12 +2885,10 @@ list_devs_in_proc_partititons(void) if (sscanf(line, " %u %u %u %[^\n ]", &ma, &mi, &sz, ptname) != 4) continue; - for (s = ptname; *s; s++) - continue; - if (isdigit(s[-1])) - continue; + sprintf(devname, "/dev/%s", ptname); - open_list_and_close(devname, 0); + if (is_whole_disk(devname)) + open_list_and_close(devname, 0); } #if ENABLE_FEATURE_CLEAN_UP fclose(procpt); @@ -2821,7 +2904,7 @@ unknown_command(int c) #endif int fdisk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int fdisk_main(int argc, char **argv) +int fdisk_main(int argc UNUSED_PARAM, char **argv) { unsigned opt; /* @@ -2839,16 +2922,18 @@ int fdisk_main(int argc, char **argv) opt_complementary = "b+:C+:H+:S+"; /* numeric params */ opt = getopt32(argv, "b:C:H:lS:u" IF_FEATURE_FDISK_BLKSIZE("s"), §or_size, &user_cylinders, &user_heads, &user_sectors); - argc -= optind; argv += optind; - if (opt & OPT_b) { // -b + 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 != 1024 - && sector_size != 2048) + * 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; } @@ -2883,14 +2968,14 @@ int fdisk_main(int argc, char **argv) int j; nowarn = 1; - if (argc <= 0) + if (!argv[0]) bb_show_usage(); - for (j = 0; j < argc; j++) { + 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 (argc == 1) + if (argv[1]) printf("%llu\n", size); else printf("%s: %llu\n", argv[j], size); @@ -2900,7 +2985,7 @@ int fdisk_main(int argc, char **argv) #endif #if ENABLE_FEATURE_FDISK_WRITABLE - if (argc != 1) + if (!argv[0] || argv[1]) bb_show_usage(); disk_device = argv[0]; @@ -2919,7 +3004,7 @@ int fdisk_main(int argc, char **argv) while (1) { int c; bb_putchar('\n'); - c = tolower(read_nonempty("Command (m for help): ")); + c = 0x20 | read_nonempty("Command (m for help): "); switch (c) { case 'a': if (LABEL_IS_DOS) @@ -2938,7 +3023,7 @@ int fdisk_main(int argc, char **argv) printf("\nThe current boot file is: %s\n", sgi_get_bootfile()); if (read_maybe_empty("Please enter the name of the " - "new boot file: ") == '\n') + "new boot file: ") == '\n') printf("Boot file unchanged\n"); else sgi_set_bootfile(line_ptr); @@ -3016,7 +3101,7 @@ int fdisk_main(int argc, char **argv) verify(); break; case 'w': - write_table(); /* does not return */ + write_table(); /* does not return */ break; #if ENABLE_FEATURE_FDISK_ADVANCED case 'x':