[BusyBox-cvs] busybox/util-linux Config.in,1.1,1.2 fdisk.c,1.3,1.4

Glenn McGrath bug1 at busybox.net
Sat Jan 4 11:56:10 UTC 2003


Update of /var/cvs/busybox/util-linux
In directory winder:/tmp/cvs-serv28482/util-linux

Modified Files:
	Config.in fdisk.c 
Log Message:
fdisk writable feature, allows compilation of a small fdisk that can 
only read partition table, by Vladimir N. Oleynik


Index: Config.in
===================================================================
RCS file: /var/cvs/busybox/util-linux/Config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.in	5 Dec 2002 08:41:41 -0000	1.1
+++ Config.in	4 Jan 2003 11:56:06 -0000	1.2
@@ -44,38 +44,46 @@
 	help
 	  Please submit a patch to add help text for this item.
 
+config CONFIG_FEATURE_FDISK_WRITABLE
+	bool "  Write support" 
+	default y
+	depends on CONFIG_FDISK
+	help
+	  Allow changes to be written to disk, without this you
+	  will only be able to view the partition table. 
+
 config CONFIG_FEATURE_AIX_LABEL
 	bool "  Support AIX disklabels"
 	default n
-	depends on CONFIG_FDISK
+	depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE  
 	help
 	  Please submit a patch to add help text for this item.
 
 config CONFIG_FEATURE_SGI_LABEL
 	bool "  Support SGI disklabels"
 	default n
-	depends on CONFIG_FDISK
+	depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE
 	help
 	  Please submit a patch to add help text for this item.
 
 config CONFIG_FEATURE_SUN_LABEL
 	bool "  Support SUN disklabels"
 	default n
-	depends on CONFIG_FDISK
+ 	depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE	
 	help
 	  Please submit a patch to add help text for this item.
 
 config CONFIG_FEATURE_OSF_LABEL
 	bool "  Support BSD disklabels"
 	default n
-	depends on CONFIG_FDISK
+	depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE
 	help
 	  Please submit a patch to add help text for this item.
 
 config CONFIG_FEATURE_FDISK_ADVANCED
 	bool "  Support expert mode"
 	default n
-	depends on CONFIG_FDISK
+	depends on CONFIG_FDISK && CONFIG_FEATURE_FDISK_WRITABLE
 	help
 	  Please submit a patch to add help text for this item.
 

Index: fdisk.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fdisk.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fdisk.c	11 Dec 2002 03:49:33 -0000	1.3
+++ fdisk.c	4 Jan 2003 11:56:06 -0000	1.4
@@ -47,7 +47,7 @@
 #include <stdint.h>        /* for uint32_t, uint16_t, uint8_t, int16_t, etc */
 
 /* Copied from linux/major.h */
-#define FLOPPY_MAJOR	2
+#define FLOPPY_MAJOR    2
 
 #include <sys/utsname.h>
 
@@ -128,7 +128,6 @@
 static int     sun_label;                  /* looking at sun disklabel */
 #else
[...1065 lines suppressed...]
 				unknown_command(c);
 			break;
 		case 'd':
-			j = get_existing_partition(1, partitions);
-			if (j >= 0)
-				delete_partition(j);
+			{
+				int j = get_existing_partition(1, partitions);
+				if (j >= 0)
+					delete_partition(j);
+			}
 			break;
 		case 'i':
 #ifdef CONFIG_FEATURE_SGI_LABEL
@@ -5894,4 +5953,5 @@
 		}
 	}
 	return 0;
+#endif /* CONFIG_FEATURE_FDISK_WRITABLE */
 }




More information about the busybox-cvs mailing list