Merge remote branch 'origin/master'

Conflicts:
	mount/Makefile.am
	sys-utils/ipcs.c
	tests/ts/blkid/images-fs/befs.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2

4 files changed, 131 insertions, 99 deletions

diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
index 7b87d6cf..36871f3c 100644
--- a/fdisk/Makefile.am
+++ b/fdisk/Makefile.am
@@ -3,10 +3,11 @@ include $(top_srcdir)/config/include-Makefile.am
 EXTRA_DIST = README.fdisk README.cfdisk sfdisk.examples partitiontype.c
 
 fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \
-	../lib/blkdev.c ../lib/wholedisk.c ../lib/mbsalign.c
+	$(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \
+	$(top_srcdir)/lib/mbsalign.c
 
 if LINUX
-fdisk_common += ../lib/linux_version.c
+fdisk_common += $(top_srcdir)/lib/linux_version.c
 endif
 
 if !ARCH_M68K
@@ -53,7 +54,7 @@ endif
 if USE_SLANG
 sbin_PROGRAMS += cfdisk
 dist_man_MANS += cfdisk.8
-cfdisk_SOURCES = cfdisk.c $(fdisk_common) ../lib/mbsalign.c
+cfdisk_SOURCES = cfdisk.c $(fdisk_common)
 cfdisk_CFLAGS = $(cflags_blkid)
 cfdisk_LDADD = -lslang $(ldadd_blkid)
 else
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index b1eaceeb..e7955fe5 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -64,15 +64,25 @@
 #include <errno.h>
 #include <getopt.h>
 #include <fcntl.h>
+
+#ifdef HAVE_SLANG_H
+#include <slang.h>
+#elif defined(HAVE_SLANG_SLANG_H)
+#include <slang/slang.h>
+#endif
+
 #ifdef HAVE_SLCURSES_H
 #include <slcurses.h>
 #elif defined(HAVE_SLANG_SLCURSES_H)
 #include <slang/slcurses.h>
+#elif defined(HAVE_NCURSESW_NCURSES_H) && defined(HAVE_WIDECHAR)
+#include <ncursesw/ncurses.h>
 #elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
 #elif defined(HAVE_NCURSES_NCURSES_H)
 #include <ncurses/ncurses.h>
 #endif
+
 #include <signal.h>
 #include <math.h>
 #include <string.h>
@@ -93,6 +103,7 @@
 #include "common.h"
 #include "gpt.h"
 #include "mbsalign.h"
+#include "widechar.h"
 
 #ifdef __GNU__
 #define DEFAULT_DEVICE "/dev/hd0"
@@ -410,6 +421,11 @@ fdexit(int ret) {
     exit(ret);
 }
 
+/*
+ * Note that @len is size of @str buffer.
+ *
+ * Returns number of read bytes (without \0).
+ */
 static int
 get_string(char *str, int len, char *def) {
     size_t cells = 0, i = 0;
@@ -430,7 +446,8 @@ get_string(char *str, int len, char *def) {
 
     refresh();
 
-#if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
+#if !defined(HAVE_SLCURSES_H) && !defined(HAVE_SLANG_SLCURSES_H) && \
+    defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
     while ((key = get_wch(&c)) != ERR &&
 	   c != '\r' && c != '\n' && c != KEY_ENTER) {
 #else
@@ -460,7 +477,7 @@ get_string(char *str, int len, char *def) {
 	    break;
 	default:
 #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
-	    if (i < len && iswprint(c)) {
+	    if (i + 1 < len && iswprint(c)) {
 		wchar_t wc = (wchar_t) c;
 		char s[MB_CUR_MAX + 1];
 		int  sz = wctomb(s, wc);
@@ -480,7 +497,7 @@ get_string(char *str, int len, char *def) {
 			putchar(BELL);
 	    }
 #else
-	    if (i < len && isprint(c)) {
+	    if (i + 1 < len && isprint(c)) {
 	        mvaddch(y, x + cells, c);
 		if (use_def) {
 		    clrtoeol();
@@ -2393,7 +2410,7 @@ change_id(int i) {
 
     sprintf(def, "%02X", new_id);
     mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: "));
-    if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT)
+    if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT)
 	return;
 
     if (len != GS_DEFAULT) {
diff --git a/fdisk/fdisk.8 b/fdisk/fdisk.8
index 30dc9678..a2d8e434 100644
--- a/fdisk/fdisk.8
+++ b/fdisk/fdisk.8
@@ -3,7 +3,7 @@
 .\" May be distributed under the GNU General Public License
 .TH FDISK 8 "11 June 1998" "Linux 2.0" "Linux Programmer's Manual"
 .SH NAME
-fdisk \- Partition table manipulator for Linux
+fdisk \- partition table manipulator for Linux
 .SH SYNOPSIS
 .B fdisk
 .RB [ \-uc ]
@@ -28,19 +28,34 @@ fdisk \- Partition table manipulator for Linux
 .sp
 .B fdisk \-h
 .SH DESCRIPTION
+.B fdisk
+(in the first form of invocation)
+is a menu-driven program for creation and manipulation of
+partition tables.
+It understands DOS-type partition tables and BSD- or SUN-type disklabels.
+
+.B fdisk
+does not understand GUID partition tables (GPTs) and it is not designed
+for large partitions.  In these cases, use the more advanced GNU
+.BR parted (8).
+
+.B fdisk
+does not use DOS-compatible mode and cylinders as display units by default.
+The old deprecated DOS behavior can be enabled with
+the '-c=dos -u=cylinders' command-line options.
+
 Hard disks can be divided into one or more logical disks called
 .IR partitions .
-This division is described in the
-.I "partition table"
+This division is recorded in the
+.IR "partition table" ,
 found in sector 0 of the disk.
-
-In the BSD world one talks about `disk slices' and a `disklabel'.
+(In the BSD world one talks about `disk slices' and a `disklabel'.)
 
 Linux needs at least one partition, namely for its root file system.
 It can use swap files and/or swap partitions, but the latter are more
-efficient. So, usually one will want a second Linux partition
+efficient.  So, usually one will want a second Linux partition
 dedicated as swap partition.
-On Intel compatible hardware, the BIOS that boots the system
+On Intel-compatible hardware, the BIOS that boots the system
 can often only access the first 1024 cylinders of the disk.
 For this reason people with large disks often create a third partition,
 just a few MB large, typically mounted on
@@ -50,68 +65,56 @@ so as to make sure that this stuff is accessible to the BIOS.
 There may be reasons of security, ease of administration and backup,
 or testing, to use more than the minimum number of partitions.
 
-.B fdisk
-(in the first form of invocation)
-is a menu driven program for creation and manipulation of
-partition tables.
-It understands DOS type partition tables and BSD or SUN type disklabels.
-
-.B fdisk
-doesn't understand GUID Partition Table (GPT) and
-it is not designed for large partitions. In particular case use more advanced GNU
-.BR parted (8).
-
+.SH DEVICES
 The
 .I device
-is usually /dev/sda, /dev/sdb or so. A device name refers to the entire disk.
-The old systems without libata (a library used inside the Linux kernel to
+is usually /dev/sda, /dev/sdb or so.  A device name refers to the entire disk.
+Old systems without libata (a library used inside the Linux kernel to
 support ATA host controllers and devices) make a difference between IDE and
-SCSI disks. In such a case the device name will be /dev/hd* (IDE) or /dev/sd*
+SCSI disks.  In such cases the device name will be /dev/hd* (IDE) or /dev/sd*
 (SCSI).
 
 The
 .I partition
-is a
-.I device
-name followed by a partition number.  For example,
-.B /dev/sda1
+is a device name followed by a partition number.  For example, /dev/sda1
 is the first partition on the first hard disk in the system.
 See also Linux kernel documentation (the Documentation/devices.txt file).
 
-A BSD/SUN type disklabel can describe 8 partitions,
+.SH DISK LABELS
+A BSD/SUN-type disklabel can describe 8 partitions,
 the third of which should be a `whole disk' partition.
 Do not start a partition that actually uses its first sector
 (like a swap partition) at cylinder 0, since that will
 destroy the disklabel.
 
-An IRIX/SGI type disklabel can describe 16 partitions,
+An IRIX/SGI-type disklabel can describe 16 partitions,
 the eleventh of which should be an entire `volume' partition,
 while the ninth should be labeled `volume header'.
 The volume header will also cover the partition table, i.e.,
 it starts at block zero and extends by default over five cylinders.
 The remaining space in the volume header may be used by header
 directory entries.  No partitions may overlap with the volume header.
-Also do not change its type and make some file system on it, since
+Also do not change its type or make some filesystem on it, since
 you will lose the partition table.  Use this type of label only when
 working with Linux on IRIX/SGI machines or IRIX/SGI disks under Linux.
 
-A DOS type partition table can describe an unlimited number
-of partitions. In sector 0 there is room for the description
-of 4 partitions (called `primary'). One of these may be an
+A DOS-type partition table can describe an unlimited number
+of partitions.  In sector 0 there is room for the description
+of 4 partitions (called `primary').  One of these may be an
 extended partition; this is a box holding logical partitions,
 with descriptors found in a linked list of sectors, each
 preceding the corresponding logical partitions.
 The four primary partitions, present or not, get numbers 1-4.
 Logical partitions start numbering from 5.
 
-In a DOS type partition table the starting offset and the size
+In a DOS-type partition table the starting offset and the size
 of each partition is stored in two ways: as an absolute number
-of sectors (given in 32 bits) and as a Cylinders/Heads/Sectors
-triple (given in 10+8+6 bits). The former is OK - with 512-byte
-sectors this will work up to 2 TB. The latter has two different
-problems. First of all, these C/H/S fields can be filled only
+of sectors (given in 32 bits), and as a Cylinders/Heads/Sectors
+triple (given in 10+8+6 bits).  The former is OK -- with 512-byte
+sectors this will work up to 2 TB.  The latter has two
+problems.  First, these C/H/S fields can be filled only
 when the number of heads and the number of sectors per track
-are known. Secondly, even if we know what these numbers should be,
+are known.  And second, even if we know what these numbers should be,
 the 24 bits that are available do not suffice.
 DOS uses C/H/S only, Windows uses both, Linux never uses C/H/S.
 
@@ -121,19 +124,19 @@ will obtain the disk geometry automatically.  This is not
 necessarily the physical disk geometry (indeed, modern disks do not
 really have anything like a physical geometry, certainly not something
 that can be described in simplistic Cylinders/Heads/Sectors form),
-but is the disk geometry that MS-DOS uses for the partition table.
+but it is the disk geometry that MS-DOS uses for the partition table.
 
 Usually all goes well by default, and there are no problems if
-Linux is the only system on the disk. However, if the disk has
+Linux is the only system on the disk.  However, if the disk has
 to be shared with other operating systems, it is often a good idea
 to let an fdisk from another operating system make at least one
-partition. When Linux boots it looks at the partition table, and
+partition.  When Linux boots it looks at the partition table, and
 tries to deduce what (fake) geometry is required for good
 cooperation with other systems.
 
 Whenever a partition table is printed out, a consistency check is performed
 on the partition table entries.  This check verifies that the physical and
-logical start and end points are identical, and that the partition starts
+logical start and end points are identical, and that each partition starts
 and ends on a cylinder boundary (except for the first partition).
 
 Some versions of MS-DOS create a first partition which does not begin
@@ -141,11 +144,11 @@ on a cylinder boundary, but on sector 2 of the first cylinder.
 Partitions beginning in cylinder 1 cannot begin on a cylinder boundary, but
 this is unlikely to cause difficulty unless you have OS/2 on your machine.
 
-A sync() and a BLKRRPART ioctl() (reread partition table from disk)
+A sync() and an ioctl(BLKRRPART) (reread partition table from disk)
 are performed before exiting when the partition table has been updated.
 Long ago it used to be necessary to reboot after the use of fdisk.
-I do not think this is the case anymore - indeed, rebooting too quickly
-might cause loss of not-yet-written data. Note that both the kernel
+I do not think this is the case anymore -- indeed, rebooting too quickly
+might cause loss of not-yet-written data.  Note that both the kernel
 and the disk hardware may buffer data.
 
 .SH "DOS 6.x WARNING"
@@ -180,24 +183,25 @@ program and Linux partitions with the Linux fdisk or Linux cfdisk program.
 .SH OPTIONS
 .TP
 .BI "\-b " sectorsize
-Specify the sector size of the disk. Valid values are 512, 1024, 2048 or 4096.
-(Recent kernels know the sector size. Use this only on old kernels or
-to override the kernel's ideas.) Since util-linux-ng 2.17 fdisk differentiates
-between logical and physical sector size. This option changes both sector sizes to
+Specify the sector size of the disk.  Valid values are 512, 1024, 2048 or 4096.
+(Recent kernels know the sector size.  Use this only on old kernels or
+to override the kernel's ideas.)  Since util-linux-ng-2.17, fdisk differentiates
+between logical and physical sector size.  This option changes both sector sizes to
 .IB sectorsize .
 .TP
-.BI \-h
-Print help and then exit.
-.TP
-.BI \-c
-Switch off DOS-compatible mode. (Recommended)
+.BI "\-c"[=mode]
+Specify the compatiblity mode, 'dos' or 'nondos'.  The default is non-DOS
+mode.  For backward compatibility, it is possible to use the option without
+the <mode> argument -- then the default is used.  Note that the optional
+<mode> argument cannot be separated from the -c option by a space, the correct
+form is for example '-c=dos'.
 .TP
 .BI "\-C " cyls
 Specify the number of cylinders of the disk.
 I have no idea why anybody would want to do so.
 .TP
 .BI "\-H " heads
-Specify the number of heads of the disk. (Not the physical number,
+Specify the number of heads of the disk.  (Not the physical number,
 of course, but the number used for partition tables.)
 Reasonable values are 255 and 16.
 .TP
@@ -207,20 +211,24 @@ Specify the number of sectors per track of the disk.
 partition tables.)
 A reasonable value is 63.
 .TP
+.BI \-h
+Print help and then exit.
+.TP
 .B \-l
 List the partition tables for the specified devices and then exit.
 If no devices are given, those mentioned in
 .I /proc/partitions
 (if that exists) are used.
 .TP
-.B \-u
-When listing partition tables, give sizes in sectors instead
-of cylinders.
+.BI "\-s " partition...
+Print the size (in blocks) of each given partition.
 .TP
-.BI "\-s " partition
-The
-.I size
-of the partition (in blocks) is printed on the standard output.
+.BI "\-u"[=unit]
+When listing partition tables, show sizes in 'sectors' or in 'cylinders'.  The
+default is to show sizes in sectors.  For backward compatibility, it is possible
+to use the option without the <units> argument -- then the default is used.
+Note that the optional <unit> argument cannot be separated from the -u option
+by a space, the correct form is for example '-u=cylinders'.
 .TP
 .B \-v
 Print version number of
@@ -237,14 +245,14 @@ Try them in the order
 .B cfdisk
 is a beautiful program that has strict requirements on
 the partition tables it accepts, and produces high quality partition
-tables. Use it if you can.
+tables.  Use it if you can.
 .B fdisk
 is a buggy program that does fuzzy things - usually it happens to
-produce reasonable results. Its single advantage is that it has
+produce reasonable results.  Its single advantage is that it has
 some support for BSD disk labels and other non-DOS partition tables.
 Avoid it if you can.
 .B sfdisk
-is for hackers only - the user interface is terrible, but it is
+is for hackers only -- the user interface is terrible, but it is
 more correct than fdisk and more powerful than both fdisk and cfdisk.
 Moreover, it can be used noninteractively.)
 .PP
@@ -253,7 +261,7 @@ These days there also is
 The cfdisk interface is nicer, but parted does much more: it not only
 resizes partitions, but also the filesystems that live in them.
 .PP
-The IRIX/SGI type disklabel is currently not supported by the kernel.
+The IRIX/SGI-type disklabel is currently not supported by the kernel.
 Moreover, IRIX/SGI header directories are not fully supported yet.
 .PP
 The option `dump partition table to file' is missing.
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 0126e67b..6572c51d 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -204,7 +204,7 @@ int	fd,				/* the disk */
 	ext_index,			/* the prime extended partition */
 	listing = 0,			/* no aborts for fdisk -l */
 	nowarn = 0,			/* no warnings for fdisk -l/-s */
-	dos_compatible_flag = ~0,
+	dos_compatible_flag = 0,	/* disabled by default */
 	dos_changed = 0,
 	partitions = 4;			/* maximum partition + 1 */
 
@@ -220,7 +220,7 @@ unsigned int	heads,
 	sector_factor = 1,
 	user_set_sector_size = 0,
 	units_per_sector = 1,
-	display_in_cyl_units = 1;
+	display_in_cyl_units = 0;
 
 unsigned long long total_number_of_sectors;	/* (!) 512-byte sectors */
 unsigned long grain = DEFAULT_SECTOR_SIZE,
@@ -259,14 +259,14 @@ void fatal(enum failure why) {
 " fdisk [options] -l <disk> list partition table(s)\n"
 " fdisk -s <partition>      give partition size(s) in blocks\n"
 "\nOptions:\n"
-" -b <size>                 sector size (512, 1024, 2048 or 4096)\n"
-" -c                        switch off DOS-compatible mode\n"
-" -h                        print help\n"
-" -u <size>                 give sizes in sectors instead of cylinders\n"
-" -v                        print version\n"
-" -C <number>               specify the number of cylinders\n"
-" -H <number>               specify the number of heads\n"
-" -S <number>               specify the number of sectors per track\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
 "\n");
 			break;
 		case unable_to_open:
@@ -764,7 +764,7 @@ void update_units(void)
 	if (display_in_cyl_units && cyl_units)
 		units_per_sector = cyl_units;
 	else
-		units_per_sector = 1; 	/* in sectors */
+		units_per_sector = 1;	/* in sectors */
 }
 
 static void
@@ -796,18 +796,12 @@ warn_alignment(void) {
 "the physical sector size. Aligning to a physical sector (or optimal\n"
 "I/O) size boundary is recommended, or performance may be impacted.\n"));
 
-	if (dos_compatible_flag) {
+	if (dos_compatible_flag)
 		fprintf(stderr, _("\n"
 "WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
-"         switch off the mode (command 'c')"));
-
-		if (display_in_cyl_units)
-			fprintf(stderr, _(" and change display units to\n"
-"         sectors (command 'u').\n"));
-		else
-			fprintf(stderr, ".\n");
+"         switch off the mode (with command 'c')."));
 
-	 } else if (display_in_cyl_units)
+	if (display_in_cyl_units)
 		fprintf(stderr, _("\n"
 "WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
 "         change units to sectors.\n"));
@@ -1615,8 +1609,11 @@ void change_units(void)
 {
 	display_in_cyl_units = !display_in_cyl_units;
 	update_units();
-	printf(_("Changing display/entry units to %s\n"),
-		str_units(PLURAL));
+
+	if (display_in_cyl_units)
+		printf(_("Changing display/entry units to cylinders (DEPRECATED!)\n"));
+	else
+		printf(_("Changing display/entry units to sectors\n"));
 }
 
 static void
@@ -1636,7 +1633,7 @@ static void
 toggle_dos_compatibility_flag(void) {
 	dos_compatible_flag = ~dos_compatible_flag;
 	if (dos_compatible_flag)
-		printf(_("DOS Compatibility flag is set\n"));
+		printf(_("DOS Compatibility flag is set (DEPRECATED!)\n"));
 	else
 		printf(_("DOS Compatibility flag is not set\n"));
 
@@ -1804,7 +1801,7 @@ change_sysid(void) {
  * Lubkin Oct.  1991). */
 
 static void
-long2chs(ulong ls, unsigned int *c, unsigned int *h, unsigned int *s) {
+long2chs(unsigned long ls, unsigned int *c, unsigned int *h, unsigned int *s) {
 	int spc = heads * sectors;
 
 	*c = ls / spc;
@@ -2925,7 +2922,7 @@ main(int argc, char **argv) {
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	while ((c = getopt(argc, argv, "b:cC:hH:lsS:uvV")) != -1) {
+	while ((c = getopt(argc, argv, "b:c::C:hH:lsS:u::vV")) != -1) {
 		switch (c) {
 		case 'b':
 			/* Ugly: this sector size is really per device,
@@ -2943,7 +2940,12 @@ main(int argc, char **argv) {
 			user_cylinders = atoi(optarg);
 			break;
 		case 'c':
-			dos_compatible_flag = 0;
+			dos_compatible_flag = 0;	/* default */
+
+			if (optarg && !strcmp(optarg, "=dos"))
+				dos_compatible_flag = ~0;
+			else if (optarg && strcmp(optarg, "=nondos"))
+				fatal(usage);
 			break;
 		case 'h':
 			fatal(help);
@@ -2965,7 +2967,11 @@ main(int argc, char **argv) {
 			opts = 1;
 			break;
 		case 'u':
-			display_in_cyl_units = 0;
+			display_in_cyl_units = 0;		/* default */
+			if (optarg && strcmp(optarg, "=cylinders") == 0)
+				display_in_cyl_units = !display_in_cyl_units;
+			else if (optarg && strcmp(optarg, "=sectors"))
+				fatal(usage);
 			break;
 		case 'V':
 		case 'v':