[BusyBox-cvs] busybox/util-linux Config.in, 1.13, 1.14 fdisk.c, 1.23, 1.24

[Erik Andersen,,,]

Update of /var/cvs/busybox/util-linux
In directory nail:/tmp/cvs-serv29416/util-linux

Modified Files:
	Config.in fdisk.c 
Log Message:
Erik,

>http://busybox.net/cgi-bin/cvsweb/busybox/util-linux/fdisk.c?r1=1.22&r2=1.23&diff_format=u

Its hack for "force" ;-)

If to return the previous version of a Config.in
http://busybox.net/cgi-bin/cvsweb/busybox/util-linux/Config.in?r1=1.12&r2=1.13
and to apply last patch, then I shall calm down. ;-)


(OOPS, last patch have autocorrected from my editor begins spaces to tabs and
removed spaces from empty lines too).


--w
vodz




Index: Config.in
===================================================================
RCS file: /var/cvs/busybox/util-linux/Config.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/Config.in	30 Mar 2004 09:13:05 -0000	1.13
+++ b/Config.in	19 May 2004 10:49:17 -0000	1.14
@@ -74,6 +74,14 @@
 	  can be used to list and edit the set of partitions or BSD style
 	  'disk slices' that are defined on a hard drive.
 
+config FDISK_SUPPORT_LARGE_DISKS
+	bool "  support over 4GB disks"
+	default y
+	depends on CONFIG_FDISK
+	select CONFIG_LFS
+	help
+	  Enable this option to support large disks > 4GB.
+
 config CONFIG_FEATURE_FDISK_WRITABLE
 	bool "  Write support"
 	default y

Index: fdisk.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fdisk.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- a/fdisk.c	19 May 2004 09:00:00 -0000	1.23
+++ b/fdisk.c	19 May 2004 10:49:17 -0000	1.24
@@ -19,7 +19,9 @@
  * to instead really use 64 bit interfaces, at least for
  * glibc and uClibc... */
 #ifndef __USE_FILE_OFFSET64
-# define __USE_FILE_OFFSET64	1
+# ifdef FDISK_SUPPORT_LARGE_DISKS
+#   define __USE_FILE_OFFSET64    1
+# endif
 #endif
 
 #include <sys/types.h>
@@ -4206,7 +4208,7 @@
 		       && *line_ptr != '-' && *line_ptr != '+')
 			continue;
 
-	        if (*line_ptr == '+' || *line_ptr == '-') {
+		if (*line_ptr == '+' || *line_ptr == '-') {
 		       int minus = (*line_ptr == '-');
 		       int absolute = 0;
 
@@ -4214,7 +4216,7 @@
 
 		       while (isdigit(*++line_ptr))
 			       use_default = 0;
-	
+
 		       switch (*line_ptr) {
 			       case 'c':
 			       case 'C':
@@ -4244,14 +4246,14 @@
 
 			       bytes = (unsigned long long) i * absolute;
 			       unit = sector_size * units_per_sector;
-			       bytes += unit/2;	/* round */
+			       bytes += unit/2; /* round */
 			       bytes /= unit;
 			       i = bytes;
 			}
 		       if (minus)
 			       i = -i;
 		       i += base;
-	        } else {
+		} else {
 			i = atoi(line_ptr);
 			while (isdigit(*line_ptr)) {
 				line_ptr++;
@@ -4613,7 +4615,7 @@
 
 /* Ending on cylinder boundary? */
 	if (peh != (heads - 1) || pes != sectors) {
-	        printf(_("Partition %i does not end on cylinder boundary.\n"),
+		printf(_("Partition %i does not end on cylinder boundary.\n"),
 			partition + 1);
 #if 0
 		printf(_("     phys=(%d, %d, %d) "), pec, peh, pes);
@@ -5186,8 +5188,8 @@
 		free_primary += !ptes[i].part_table->sys_ind;
 
        if (!free_primary && partitions >= MAXIMUM_PARTS) {
-	        printf(_("The maximum number of partitions has been created\n"));
-	        return;
+		printf(_("The maximum number of partitions has been created\n"));
+		return;
        }
 
 	if (!free_primary) {