[BusyBox-cvs] busybox/util-linux fdisk.c,1.7,1.8

[Erik Andersen]

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

Modified Files:
	fdisk.c 
Log Message:
last_patch100 from vidz updating fdisk to 2.12pre 


Index: fdisk.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fdisk.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fdisk.c	14 Jul 2003 19:03:14 -0000	1.7
+++ fdisk.c	30 Jul 2003 08:40:37 -0000	1.8
@@ -7,19 +7,10 @@
  * published by the Free Software Foundation: either version 1 or
  * (at your option) any later version.
  *
- * For detailed old history, see older versions.
- * Contributions before 2001 by faith at cs.unc.edu, Michael Bischoff,
- * LeBlanc at mcc.ac.uk, martin at cs.unc.edu, leisner at sdsp.mc.xerox.com,
- * esr at snark.thyrsus.com, aeb at cwi.nl, quinlan at yggdrasil.com,
- * fasten at cs.bonn.edu, orschaer at cip.informatik.uni-erlangen.de,
- * jj at sunsite.mff.cuni.cz, fasten at shw.com, ANeuper at GUUG.de,
- * kgw at suse.de, kalium at gmx.de, dhuggins at linuxcare.com,
- * michal at ellpspace.math.ualberta.ca and probably others.
[...1126 lines suppressed...]
 		case 'd':
 			{
-				int j = get_existing_partition(1, partitions);
+				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 (!sgi_label) {
+					j = get_existing_partition(1, partitions);
+				} else {
+					j = get_partition(1, partitions);
+				}
+#else
+				j = get_existing_partition(1, partitions);
+#endif
 				if (j >= 0)
 					delete_partition(j);
 			}