X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Ffdisk.c;h=310bd555e9224625fa36b1420ef2abd881339744;hb=6ced427a6debb71967a8b9cebc12e31c08de0f6a;hp=5ef5acb1bb4e1b4c93de4b810bd9cf0f0abe410f;hpb=18958e9309b6565245ae14a19aab947fb2da79aa;p=oweals%2Fbusybox.git

diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 5ef5acb1b..310bd555e 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* fdisk.c -- Partition table manipulator for Linux.
  *
  * Copyright (C) 1992  A. V. Le Blanc (LeBlanc@mcc.ac.uk)
@@ -43,11 +44,6 @@
 
 #define DKTYPENAMES
 
-#define BLKRRPART  _IO(0x12,95)    /* re-read partition table */
-#define BLKGETSIZE _IO(0x12,96)    /* return device size */
-#define BLKFLSBUF  _IO(0x12,97)    /* flush buffer cache */
-#define BLKSSZGET  _IO(0x12,104)   /* get block device sector size */
-
 /*
    fdisk.h
 */
@@ -482,7 +478,7 @@ check_aix_label(void)
 
 #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
 
-#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__)
+#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__)
@@ -1448,10 +1444,6 @@ xbsd_initlabel(struct partition *p, struct xbsd_disklabel *d)
 	else
 		d->d_type = BSD_DTYPE_ST506;
 
-#if 0 /* not used (at least not written to disk) by NetBSD/i386 1.0 */
-	d->d_subtype = BSD_DSTYPE_INDOSPART & pindex;
-#endif
-
 #if !defined (__alpha__)
 	d->d_flags = BSD_D_DOSPART;
 #else
@@ -1979,7 +1971,7 @@ 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));
-	strncpy((char*)sgilabel->directory[0].vol_file_name, "sgilabel", 8);
+	strcpy((char*)sgilabel->directory[0].vol_file_name, "sgilabel");
 }
 
 static sgiinfo *fill_sgiinfo(void);
@@ -2610,14 +2602,10 @@ sun_autoconfigure_scsi(void)
 	if (!ioctl(fd, SCSI_IOCTL_GET_IDLUN, &id)) {
 		sprintf(buffer,
 			"Host: scsi%d Channel: %02d Id: %02d Lun: %02d\n",
-#if 0
-			((id[0]>>24)&0xff)-/*PROC_SCSI_SCSI+PROC_SCSI_FILE*/33,
-#else
 			/* 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,
-#endif
 			(id[0]>>16) & 0xff,
 			id[0] & 0xff,
 			(id[0]>>8) & 0xff
@@ -4650,25 +4638,10 @@ check_consistency(const struct partition *p, int partition)
 		printf(_("logical=(%d, %d, %d)\n"),lec, leh, les);
 	}
 
-#if 0
-/* Beginning on cylinder boundary? */
-	if (pbh != !pbc || pbs != 1) {
-		printf(_("Partition %i does not start on cylinder "
-			"boundary:\n"), partition + 1);
-		printf(_("     phys=(%d, %d, %d) "), pbc, pbh, pbs);
-		printf(_("should be (%d, %d, 1)\n"), pbc, !pbc);
-	}
-#endif
-
 /* Ending on cylinder boundary? */
 	if (peh != (heads - 1) || pes != sectors) {
 		printf(_("Partition %i does not end on cylinder boundary.\n"),
 			partition + 1);
-#if 0
-		printf(_("     phys=(%d, %d, %d) "), pec, peh, pes);
-		printf(_("should be (%d, %d, %d)\n"),
-		pec, heads - 1, sectors);
-#endif
 	}
 }
 
@@ -5189,7 +5162,7 @@ add_partition(int n, int sys)
 		ext_index = n;
 		pen->ext_pointer = p;
 		pe4->offset = extended_offset = start;
-		pe4->sectorbuffer = xcalloc(1, sector_size);
+		pe4->sectorbuffer = xzalloc(sector_size);
 		pe4->part_table = pt_offset(pe4->sectorbuffer, 0);
 		pe4->ext_pointer = pe4->part_table + 1;
 		pe4->changed = 1;
@@ -5203,7 +5176,7 @@ add_logical(void)
 	if (partitions > 5 || ptes[4].part_table->sys_ind) {
 		struct pte *pe = &ptes[partitions];
 
-		pe->sectorbuffer = xcalloc(1, sector_size);
+		pe->sectorbuffer = xzalloc(sector_size);
 		pe->part_table = pt_offset(pe->sectorbuffer, 0);
 		pe->ext_pointer = pe->part_table + 1;
 		pe->offset = 0;
@@ -5742,14 +5715,9 @@ int fdisk_main(int argc, char **argv)
 		}
 	}
 
-#if 0
-	printf(_("This kernel finds the sector size itself - "
-		 "-b option ignored\n"));
-#else
 	if (user_set_sector_size && argc-optind != 1)
 		printf(_("Warning: the -b (set sector size) option should"
 			 " be used with one specified device\n"));
-#endif
 
 #ifdef CONFIG_FEATURE_FDISK_WRITABLE
 	if (optl) {