Imported Upstream version 3.0.20upstream/3.0.20

33 files changed, 330 insertions, 219 deletions

diff --git a/ChangeLog b/ChangeLog
index b8dd479..a7ebc73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,108 @@
-commit 2c88f35 (HEAD, origin/master, origin/HEAD, master)
+commit 1a5d99f (HEAD, origin/master, origin/HEAD, master)
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Date:   Wed Jun 12 12:07:58 2013 +0200
+
+    Softening message about different boot sectors a bit (Closes: #704198).
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit 4727286
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Date:   Wed Jun 12 11:42:52 2013 +0200
+
+    Harmonizing program name output.
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit 17c956c
+Author: Martin Wilck <mwilck@arcor.de>
+Date:   Wed Jun 12 11:38:00 2013 +0200
+
+    Don't align FAT to cluster size.
+    
+    See previous patch for explanation.
+    
+    With this patch and the previous two, the
+    mkdosfs generated FAT32 file systems work well in my extremely
+    picky TechniSat device. Of course, they're also detected cleanly
+    by Linux and Windows.
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit d63e0d6
+Author: Martin Wilck <mwilck@arcor.de>
+Date:   Wed Jun 12 11:36:08 2013 +0200
+
+    Don't align FAT32 reserved sectors to cluster size.
+    
+    For certain file system sizes (in particular, exact GB sizes -
+    don't ask me why) a Technisat HD S2 Plus DVB receiver will still
+    choke on mkdosfs generated file systems, even if the sectors per
+    cluster problem is fixed.
+    
+    By comparing the properties of generated FAT32 FS with results
+    of the Windows tool "h2format" (www.heise.de/download/h2format.html),
+    I found that the remaining problems were caused by rounding of the
+    reserved sectors and FAT space to cluster size (the h2format tool
+    doesn't do this).
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit e048a8d
+Author: Martin Wilck <mwilck@arcor.de>
+Date:   Wed Jun 12 11:33:33 2013 +0200
+
+    Fixing default sectors per cluster for FAT32 (Closes: #690062).
+    
+    The default sectors per cluster calculated by mkdosfs are outdated,
+    see http://technet.microsoft.com/en-us/library/cc938438.aspx.
+    
+    The deviations may cause some 3rd party devices (e.g. TechniSat DVB
+    receivers) to hang when reading mkdosfs generated file systems.
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit 86509aa
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Date:   Tue Jun 11 20:19:09 2013 +0200
+
+    Splitting out legacy symlink creation in toplevel Makefile to own target.
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit da37dd1
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Date:   Wed Jun 12 11:29:12 2013 +0200
+
+    Correcting wrong toolname in fsck.fat.
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit b29a722
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Date:   Tue Jun 11 19:51:47 2013 +0200
+
+    Consistently spelling filesystem as filesystem, and not file system.
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit 977d7aa
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Date:   Tue Jun 11 19:30:19 2013 +0200
+
+    Removing Debian reference in GPL license headers.
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit 5505cc2 (tag: v3.0.19)
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Date:   Tue Jun 11 18:46:03 2013 +0200
+
+    Releasing version 3.0.19.
+    
+    Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
+
+commit 2c88f35
 Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Tue Jun 11 18:44:50 2013 +0200
 
diff --git a/Makefile b/Makefile
index db5f05c..6936fdf 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-# On Debian systems, the complete text of the GNU General Public License
+# The complete text of the GNU General Public License
 # can be found in /usr/share/common-licenses/GPL-3 file.
 
 SHELL := sh -e
@@ -48,23 +48,12 @@ mkfs.fat: mkfs.fat.o
 
 rebuild: distclean build
 
-install: install-bin install-doc install-man
+install: install-bin install-doc install-man install-symlinks
 
 install-bin: build
 	install -d -m 0755 $(DESTDIR)/$(SBINDIR)
 	install -m 0755 fatlabel fsck.fat mkfs.fat $(DESTDIR)/$(SBINDIR)
 
-	# legacy symlinks
-	ln -sf fatlabel $(DESTDIR)/$(SBINDIR)/dosfslabel
-
-	ln -sf fsck.fat $(DESTDIR)/$(SBINDIR)/dosfsck
-	ln -sf fsck.fat $(DESTDIR)/$(SBINDIR)/fsck.msdos
-	ln -sf fsck.fat $(DESTDIR)/$(SBINDIR)/fsck.vfat
-
-	ln -sf mkfs.fat $(DESTDIR)/$(SBINDIR)/mkdosfs
-	ln -sf mkfs.fat $(DESTDIR)/$(SBINDIR)/mkfs.msdos
-	ln -sf mkfs.fat $(DESTDIR)/$(SBINDIR)/mkfs.vfat
-
 install-doc:
 	install -d -m 0755 $(DESTDIR)/$(DOCDIR)/dosfstools
 	install -p -m 0644 ChangeLog doc/* $(DESTDIR)/$(DOCDIR)/dosfstools
@@ -84,17 +73,41 @@ install-man:
 			install -D -m 0644 $${MANPAGE} $(DESTDIR)/$(PREFIX)/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
 		done; \
 	done
-
-	# legacy symlinks
-	ln -sf fatlabel.8 $(DESTDIR)/$(MANDIR)/man8/dosfslabel.8
-
-	ln -sf fsck.fat.8 $(DESTDIR)/$(MANDIR)/man8/dosfsck.8
-	ln -sf fsck.fat.8 $(DESTDIR)/$(MANDIR)/man8/fsck.msdos.8
-	ln -sf fsck.fat.8 $(DESTDIR)/$(MANDIR)/man8/fsck.vfat.8
-
-	ln -sf mkfs.fat.8 $(DESTDIR)/$(MANDIR)/man8/mkdosfs.8
-	ln -sf mkfs.fat.8 $(DESTDIR)/$(MANDIR)/man8/mkfs.msdos.8
-	ln -sf mkfs.fat.8 $(DESTDIR)/$(MANDIR)/man8/mkfs.vfat.8
+install-symlinks:
+	if [ -e $(DESTDIR)/$(SBINDIR)/fatlabel ]; \
+	then \
+		ln -sf fatlabel $(DESTDIR)/$(SBINDIR)/dosfslabel; \
+		if [ -e $(DESTDIR)/$(MANDIR)/man8/dosfslabel.8 ]; \
+		then \
+			ln -sf fatlabel.8 $(DESTDIR)/$(MANDIR)/man8/dosfslabel.8; \
+		fi; \
+	fi
+
+	if [ -e $(DESTDIR)/$(SBINDIR)/fsck.fat ]; \
+	then \
+		ln -sf fsck.fat $(DESTDIR)/$(SBINDIR)/dosfsck; \
+		ln -sf fsck.fat $(DESTDIR)/$(SBINDIR)/fsck.msdos; \
+		ln -sf fsck.fat $(DESTDIR)/$(SBINDIR)/fsck.vfat; \
+		if [ -e $(DESTDIR)/$(MANDIR)/man8/fsck.fat.8 ]; \
+		then \
+			ln -sf fsck.fat.8 $(DESTDIR)/$(MANDIR)/man8/dosfsck.8; \
+			ln -sf fsck.fat.8 $(DESTDIR)/$(MANDIR)/man8/fsck.msdos.8; \
+			ln -sf fsck.fat.8 $(DESTDIR)/$(MANDIR)/man8/fsck.vfat.8; \
+		fi; \
+	fi
+
+	if [ -e $(DESTDIR)/$(SBINDIR)/mkfs.fat ]; \
+	then \
+		ln -sf mkfs.fat $(DESTDIR)/$(SBINDIR)/mkdosfs; \
+		ln -sf mkfs.fat $(DESTDIR)/$(SBINDIR)/mkfs.msdos; \
+		ln -sf mkfs.fat $(DESTDIR)/$(SBINDIR)/mkfs.vfat; \
+		if [ -e $(DESTDIR)/$(MANDIR)/man8/mkfs.fat.8 ]; \
+		then \
+			ln -sf mkfs.fat.8 $(DESTDIR)/$(MANDIR)/man8/mkdosfs.8; \
+			ln -sf mkfs.fat.8 $(DESTDIR)/$(MANDIR)/man8/mkfs.msdos.8; \
+			ln -sf mkfs.fat.8 $(DESTDIR)/$(MANDIR)/man8/mkfs.vfat.8; \
+		fi; \
+	fi
 
 uninstall: uninstall-bin uninstall-doc uninstall-man
 
diff --git a/VERSION b/VERSION
index 25875f0..3e4a61b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.19
+3.0.20
diff --git a/doc/ANNOUNCE.mkdosfs b/doc/ANNOUNCE.mkdosfs
index 1f02ea2..2e01716 100644
--- a/doc/ANNOUNCE.mkdosfs
+++ b/doc/ANNOUNCE.mkdosfs
@@ -27,7 +27,7 @@ Announcing the release of mkdosfs version 0.2
 
 
 I've just uploaded mkdosfs to sunsite.unc.edu.  It works in a similar way
-to Remy Card's mke2fs, but creates an MS-DOS file system.
+to Remy Card's mke2fs, but creates an MS-DOS filesystem.
 
 The filename is mkdosfs-0.2.tar.gz.
 
diff --git a/doc/README.dosfsck b/doc/README.dosfsck
index 7b351aa..3038f36 100644
--- a/doc/README.dosfsck
+++ b/doc/README.dosfsck
@@ -4,12 +4,12 @@ dosfsck, version 1
 WARNING: This is ALPHA test software. Use at your own risk.
 
 dosfsck is the Linux equivalent of PC/MS-DOS' CHKDSK. It checks the
-consistency of PC/MS-DOS file systems and optionally tries to repair
+consistency of PC/MS-DOS filesystems and optionally tries to repair
 them. The tests dosfsck performs are described in the man page.
 
 dosfsck needs header files from dosfs.9 (or later) to compile.
 
-Before using dosfsck to repair a file system that contains data of any
+Before using dosfsck to repair a filesystem that contains data of any
 value, you should verify that dosfsck is able to correct all reported
 errors. (Except fatal errors and those reported as unfixable, of
 course.) In order to do this, run it with the -V option, e.g.
diff --git a/doc/README.mkdosfs b/doc/README.mkdosfs
index ae93ada..5bd9b21 100644
--- a/doc/README.mkdosfs
+++ b/doc/README.mkdosfs
@@ -1,4 +1,4 @@
-mkdosfs - Make DOS file system utilty.
+mkdosfs - Make DOS filesystem utilty.
 
 
 I wrote this, partially to complement the dosfsck utility written by Werner
@@ -7,7 +7,7 @@ advice about writing this code), and also to avoid me having to boot DOS
 just to create data partitions (I use Linux to back up DOS :-) ).
 
 The code is really derived from Remy Card's mke2fs utility - I used this as a
-framework, although all of the file system specific stuff was removed and the
+framework, although all of the filesystem specific stuff was removed and the
 DOS stuff inserted.  I believe originally mke2fs was based on Linus' mkfs
 code, hence the acknowledgements in the source code.
 
diff --git a/manpages/de/fatlabel.de.8 b/manpages/de/fatlabel.de.8
index 0d0d934..439599e 100644
--- a/manpages/de/fatlabel.de.8
+++ b/manpages/de/fatlabel.de.8
@@ -15,7 +15,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program. If not, see <http://www.gnu.org/licenses/>.
 .\"
-.\" On Debian systems, the complete text of the GNU General Public License
+.\" The complete text of the GNU General Public License
 .\" can be found in /usr/share/common-licenses/GPL-3 file.
 .\"
 .\"
diff --git a/manpages/de/fsck.fat.de.8 b/manpages/de/fsck.fat.de.8
index f731b4e..8c4abb7 100644
--- a/manpages/de/fsck.fat.de.8
+++ b/manpages/de/fsck.fat.de.8
@@ -15,7 +15,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program. If not, see <http://www.gnu.org/licenses/>.
 .\"
-.\" On Debian systems, the complete text of the GNU General Public License
+.\" The complete text of the GNU General Public License
 .\" can be found in /usr/share/common-licenses/GPL-3 file.
 .\"
 .\"
diff --git a/manpages/de/mkfs.fat.de.8 b/manpages/de/mkfs.fat.de.8
index 273c058..b1e90fc 100644
--- a/manpages/de/mkfs.fat.de.8
+++ b/manpages/de/mkfs.fat.de.8
@@ -15,7 +15,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program. If not, see <http://www.gnu.org/licenses/>.
 .\"
-.\" On Debian systems, the complete text of the GNU General Public License
+.\" The complete text of the GNU General Public License
 .\" can be found in /usr/share/common-licenses/GPL-3 file.
 .\"
 .\"
@@ -26,7 +26,7 @@
 .\"*******************************************************************
 .TH MKFS.FAT 8 2013\-06\-11 3.0.19 dosfstools
 .SH NAME
-\fBmkfs.fat\fP \- create an MS\-DOS file system under Linux
+\fBmkfs.fat\fP \- create an MS\-DOS filesystem under Linux
 .SH SYNOPSIS
 \fBmkfs.fat\fP [ \fB\-a\fP ] [ \fB\-A\fP ] [ \fB\-b\fP \fIsector\-of\-backup\fP ] [ \fB\-c\fP ] [
 \fB\-l\fP \fIfilename\fP ] [ \fB\-C\fP ] [ \fB\-f\fP \fInumber\-of\-FATs\fP ] [ \fB\-F\fP
@@ -36,10 +36,10 @@
 \fIsectors\-per\-cluster\fP ] [ \fB\-S\fP \fIlogical\-sector\-size\fP ] [ \fB\-v\fP ]
 \fIdevice\fP [ \fIblock\-count\fP ]
 .SH DESCRIPTION
-\fBmkfs.fat\fP is used to create an MS\-DOS file system under Linux on a device
+\fBmkfs.fat\fP is used to create an MS\-DOS filesystem under Linux on a device
 (usually a disk partition).  \fIdevice\fP is the special file corresponding to
 the device (e.g /dev/hdXX).  \fIblock\-count\fP is the number of blocks on the
-device.  If omitted, \fBmkfs.fat\fP automatically determines the file system
+device.  If omitted, \fBmkfs.fat\fP automatically determines the filesystem
 size.
 .SH OPTIONS
 .TP 
@@ -52,18 +52,18 @@ additional clusters of storage at the expense of a significant performance
 degradation on RAIDs, flash media or large\-sector hard disks.
 .TP 
 \fB\-A\fP
-Use Atari variation of the MS\-DOS file system. This is default if
-\fBmkfs.fat\fP is run on an Atari, then this option turns off Atari
-format. There are some differences when using Atari format: If not directed
-otherwise by the user, \fBmkfs.fat\fP will always use 2 sectors per cluster,
-since GEMDOS doesn't like other values very much.  It will also obey the
-maximum number of sectors GEMDOS can handle.  Larger file systems are
-managed by raising the logical sector size.  Under Atari format, an
-Atari\-compatible serial number for the file system is generated, and a 12
-bit FAT is used only for file systems that have one of the usual floppy
-sizes (720k, 1.2M, 1.44M, 2.88M), a 16 bit FAT otherwise. This can be
-overridden with the \fB\-F\fP option. Some PC\-specific boot sector fields aren't
-written, and a boot message (option \fB\-m\fP) is ignored.
+Use Atari variation of the MS\-DOS filesystem. This is default if \fBmkfs.fat\fP
+is run on an Atari, then this option turns off Atari format. There are some
+differences when using Atari format: If not directed otherwise by the user,
+\fBmkfs.fat\fP will always use 2 sectors per cluster, since GEMDOS doesn't like
+other values very much.  It will also obey the maximum number of sectors
+GEMDOS can handle.  Larger filesystems are managed by raising the logical
+sector size.  Under Atari format, an Atari\-compatible serial number for the
+filesystem is generated, and a 12 bit FAT is used only for filesystems that
+have one of the usual floppy sizes (720k, 1.2M, 1.44M, 2.88M), a 16 bit FAT
+otherwise. This can be overridden with the \fB\-F\fP option. Some PC\-specific
+boot sector fields aren't written, and a boot message (option \fB\-m\fP) is
+ignored.
 .TP 
 \fB\-b\fP\fI sector\-of\-backup \fP
 Selects the location of the backup boot sector for FAT32. Default depends on
@@ -71,29 +71,29 @@ number of reserved sectors, but usually is sector 6. The backup must be
 within the range of reserved sectors.
 .TP 
 \fB\-c\fP
-Check the device for bad blocks before creating the file system.
+Check the device for bad blocks before creating the filesystem.
 .TP 
 \fB\-C\fP
 Create the file given as \fIdevice\fP on the command line, and write the
-to\-be\-created file system to it. This can be used to create the new file
-system in a file instead of on a real device, and to avoid using \fBdd\fP in
-advance to create a file of appropriate size. With this option, the
+to\-be\-created filesystem to it. This can be used to create the new
+filesystem in a file instead of on a real device, and to avoid using \fBdd\fP
+in advance to create a file of appropriate size. With this option, the
 \fIblock\-count\fP must be given, because otherwise the intended size of the
-file system wouldn't be known. The file created is a sparse file, which
+filesystem wouldn't be known. The file created is a sparse file, which
 actually only contains the meta\-data areas (boot sector, FATs, and root
 directory). The data portions won't be stored on the disk, but the file
 nevertheless will have the correct size. The resulting file can be copied
 later to a floppy disk or other device, or mounted through a loop device.
 .TP 
 \fB\-f\fP\fI number\-of\-FATs\fP
-Specify the number of file allocation tables in the file system.  The
-default is 2.  Currently the Linux MS\-DOS file system does not support more
-than 2 FATs.
+Specify the number of file allocation tables in the filesystem.  The default
+is 2.  Currently the Linux MS\-DOS filesystem does not support more than 2
+FATs.
 .TP 
 \fB\-F\fP\fI FAT\-size\fP
 Specifies the type of file allocation tables used (12, 16 or 32 bit).  If
 nothing is specified, \fBmkfs.fat\fP will automatically select between 12, 16
-and 32 bit, whatever fits better for the file system size.
+and 32 bit, whatever fits better for the filesystem size.
 .TP 
 \fB\-h\fP\fI number\-of\-hidden\-sectors \fP
 Select the number of hidden sectors in the volume. Apparently some digital
@@ -102,16 +102,16 @@ sectors, this option allows you to satisfy them. Assumes \'0\' if no value
 is given on the command line.
 .TP 
 \fI\-i  volume\-id\fP
-Sets the volume ID of the newly created file system; \fIvolume\-id\fP is a
-32\-bit hexadecimal number (for example, 2e24ec82).  The default is a number
-which depends on the file system creation time.
+Sets the volume ID of the newly created filesystem; \fIvolume\-id\fP is a 32\-bit
+hexadecimal number (for example, 2e24ec82).  The default is a number which
+depends on the filesystem creation time.
 .TP 
 \fB\-I\fP
 It is typical for fixed disk devices to be partitioned so, by default, you
 are not permitted to create a filesystem across the entire device.
 \fBmkfs.fat\fP will complain and tell you that it refuses to work.  This is
 different when using MO disks.  One doesn't always need partitions on MO
-disks.  The file system can go directly to the whole disk.  Under other OSes
+disks.  The filesystem can go directly to the whole disk.  Under other OSes
 this is known as the 'superfloppy' format.
 
 This switch will force \fBmkfs.fat\fP to work properly.
@@ -120,14 +120,14 @@ This switch will force \fBmkfs.fat\fP to work properly.
 Read the bad blocks list from \fIfilename\fP.
 .TP 
 \fB\-m\fP\fI message\-file\fP
-Sets the message the user receives on attempts to boot this file system
+Sets the message the user receives on attempts to boot this filesystem
 without having properly installed an operating system.  The message file
 must not exceed 418 bytes once line feeds have been converted to carriage
 return\-line feed combinations, and tabs have been expanded.  If the filename
 is a hyphen (\-), the text is taken from standard input.
 .TP 
 \fB\-n\fP\fI volume\-name\fP
-Sets the volume name (label) of the file system.  The volume name can be up
+Sets the volume name (label) of the filesystem.  The volume name can be up
 to 11 characters long.  The default is no label.
 .TP 
 \fB\-r\fP\fI root\-dir\-entries\fP
@@ -151,7 +151,7 @@ greater than or equal to 512, i.e. 512, 1024, 2048, 4096, 8192, 16384, or
 \fB\-v\fP
 Verbose execution.
 .SH BUGS
-\fBmkfs.fat\fP can not create boot\-able file systems. This isn't as easy as you
+\fBmkfs.fat\fP can not create boot\-able filesystems. This isn't as easy as you
 might think at first glance for various reasons and has been discussed a lot
 already.  \fBmkfs.fat\fP simply will not support it ;)
 .SH AUTHOR
diff --git a/manpages/en/fatlabel.8 b/manpages/en/fatlabel.8
index c6a4ae6..fec5ca7 100644
--- a/manpages/en/fatlabel.8
+++ b/manpages/en/fatlabel.8
@@ -15,7 +15,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program. If not, see <http://www.gnu.org/licenses/>.
 .\"
-.\" On Debian systems, the complete text of the GNU General Public License
+.\" The complete text of the GNU General Public License
 .\" can be found in /usr/share/common-licenses/GPL-3 file.
 .\"
 .\"
diff --git a/manpages/en/fsck.fat.8 b/manpages/en/fsck.fat.8
index 19c423a..320d080 100644
--- a/manpages/en/fsck.fat.8
+++ b/manpages/en/fsck.fat.8
@@ -15,7 +15,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program. If not, see <http://www.gnu.org/licenses/>.
 .\"
-.\" On Debian systems, the complete text of the GNU General Public License
+.\" The complete text of the GNU General Public License
 .\" can be found in /usr/share/common-licenses/GPL-3 file.
 .\"
 .\"
diff --git a/manpages/en/mkfs.fat.8 b/manpages/en/mkfs.fat.8
index 3e61146..f32f9be 100644
--- a/manpages/en/mkfs.fat.8
+++ b/manpages/en/mkfs.fat.8
@@ -15,14 +15,14 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program. If not, see <http://www.gnu.org/licenses/>.
 .\"
-.\" On Debian systems, the complete text of the GNU General Public License
+.\" The complete text of the GNU General Public License
 .\" can be found in /usr/share/common-licenses/GPL-3 file.
 .\"
 .\"
 .TH MKFS.FAT 8 2013\-06\-11 3.0.19 "dosfstools"
 .SH NAME
 .B mkfs.fat
-\- create an MS-DOS file system under Linux
+\- create an MS-DOS filesystem under Linux
 .SH SYNOPSIS
 .B mkfs.fat
 [
@@ -95,14 +95,14 @@
 ]
 .SH DESCRIPTION
 .B mkfs.fat
-is used to create an MS-DOS file system under Linux on a device (usually
+is used to create an MS-DOS filesystem under Linux on a device (usually
 a disk partition).
 .I device
 is the special file corresponding to the device (e.g /dev/hdXX).
 .I block-count
 is the number of blocks on the device.  If omitted,
 .B mkfs.fat
-automatically determines the file system size.
+automatically determines the filesystem size.
 .SH OPTIONS
 .TP
 .B \-a
@@ -115,15 +115,15 @@ of a significant performance degradation on RAIDs, flash media or
 large-sector hard disks.
 .TP
 .B \-A
-Use Atari variation of the MS-DOS file system. This is default if
+Use Atari variation of the MS-DOS filesystem. This is default if
 \fBmkfs.fat\fP is run on an Atari, then this option turns off Atari
 format. There are some differences when using Atari format: If not
 directed otherwise by the user, \fBmkfs.fat\fP will always use 2
 sectors per cluster, since GEMDOS doesn't like other values very much.
 It will also obey the maximum number of sectors GEMDOS can handle.
-Larger file systems are managed by raising the logical sector size.
+Larger filesystems are managed by raising the logical sector size.
 Under Atari format, an Atari-compatible serial number for the
-file system is generated, and a 12 bit FAT is used only for file systems
+filesystem is generated, and a 12 bit FAT is used only for filesystems
 that have one of the usual floppy sizes (720k, 1.2M, 1.44M, 2.88M), a
 16 bit FAT otherwise. This can be overridden with the \fB\-F\fP
 option. Some PC-specific boot sector fields aren't written, and a boot
@@ -135,15 +135,15 @@ depends on number of reserved sectors, but usually is sector 6. The
 backup must be within the range of reserved sectors.
 .TP
 .B \-c
-Check the device for bad blocks before creating the file system.
+Check the device for bad blocks before creating the filesystem.
 .TP
 .B \-C
 Create the file given as \fIdevice\fP on the command line, and write
-the to-be-created file system to it. This can be used to create the
-new file system in a file instead of on a real device, and to avoid
+the to-be-created filesystem to it. This can be used to create the
+new filesystem in a file instead of on a real device, and to avoid
 using \fBdd\fP in advance to create a file of appropriate size. With
 this option, the \fIblock-count\fP must be given, because otherwise
-the intended size of the file system wouldn't be known. The file
+the intended size of the filesystem wouldn't be known. The file
 created is a sparse file, which actually only contains the meta-data
 areas (boot sector, FATs, and root directory). The data portions won't
 be stored on the disk, but the file nevertheless will have the
@@ -151,14 +151,14 @@ correct size. The resulting file can be copied later to a floppy disk
 or other device, or mounted through a loop device.
 .TP
 .BI \-f " number-of-FATs"
-Specify the number of file allocation tables in the file system.  The
-default is 2.  Currently the Linux MS-DOS file system does not support
+Specify the number of file allocation tables in the filesystem.  The
+default is 2.  Currently the Linux MS-DOS filesystem does not support
 more than 2 FATs.
 .TP
 .BI \-F " FAT-size"
 Specifies the type of file allocation tables used (12, 16 or 32 bit).
 If nothing is specified, \fBmkfs.fat\fR will automatically select
-between 12, 16 and 32 bit, whatever fits better for the file system size.
+between 12, 16 and 32 bit, whatever fits better for the filesystem size.
 .TP
 .BI \-h " number-of-hidden-sectors "
 Select the number of hidden sectors in the volume. Apparently some
@@ -167,10 +167,10 @@ such hidden sectors, this option allows you to satisfy them. Assumes
 \'0\' if no value is given on the command line.
 .TP
 .I \-i " volume-id"
-Sets the volume ID of the newly created file system;
+Sets the volume ID of the newly created filesystem;
 .I volume-id
 is a 32-bit hexadecimal number (for example, 2e24ec82).  The default
-is a number which depends on the file system creation time.
+is a number which depends on the filesystem creation time.
 .TP
 .B \-I
 It is typical for fixed disk devices to be partitioned so, by default, you are
@@ -178,7 +178,7 @@ not permitted to create a filesystem across the entire device.
 .B mkfs.fat
 will complain and tell you that it refuses to work.  This is different
 when using MO disks.  One doesn't always need partitions on MO disks.
-The file system can go directly to the whole disk.  Under other OSes
+The filesystem can go directly to the whole disk.  Under other OSes
 this is known as the 'superfloppy' format.
 
 This switch will force
@@ -190,14 +190,14 @@ Read the bad blocks list from
 .IR filename .
 .TP
 .BI \-m " message-file"
-Sets the message the user receives on attempts to boot this file system
+Sets the message the user receives on attempts to boot this filesystem
 without having properly installed an operating system.  The message
 file must not exceed 418 bytes once line feeds have been converted to
 carriage return-line feed combinations, and tabs have been expanded.
 If the filename is a hyphen (-), the text is taken from standard input.
 .TP
 .BI \-n " volume-name"
-Sets the volume name (label) of the file system.  The volume name can
+Sets the volume name (label) of the filesystem.  The volume name can
 be up to 11 characters long.  The default is no label.
 .TP
 .BI \-r " root-dir-entries"
@@ -222,7 +222,7 @@ and greater than or equal to 512, i.e. 512, 1024, 2048, 4096, 8192,
 Verbose execution.
 .SH BUGS
 .B mkfs.fat
-can not create boot-able file systems. This isn't as easy as you might
+can not create boot-able filesystems. This isn't as easy as you might
 think at first glance for various reasons and has been discussed a lot
 already.
 .B mkfs.fat
diff --git a/manpages/po/de/mkfs.fat.8.po b/manpages/po/de/mkfs.fat.8.po
index d5f708f..32a844d 100644
--- a/manpages/po/de/mkfs.fat.8.po
+++ b/manpages/po/de/mkfs.fat.8.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dosfstools VERSION\n"
-"POT-Creation-Date: 2013-06-11 18:45+0300\n"
+"POT-Creation-Date: 2013-06-11 19:49+0300\n"
 "PO-Revision-Date: 2013-06-06 09:34+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -59,7 +59,7 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/fatlabel.8:41 en/fsck.fat.8:126 en/mkfs.fat.8:241
+#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:241
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -77,13 +77,13 @@ msgid "B<-A>"
 msgstr ""
 
 #. type: TP
-#: en/fsck.fat.8:100 en/mkfs.fat.8:220
+#: en/fsck.fat.8:102 en/mkfs.fat.8:220
 #, no-wrap
 msgid "B<-v>"
 msgstr ""
 
 #. type: SH
-#: en/fsck.fat.8:123 en/mkfs.fat.8:223
+#: en/fsck.fat.8:125 en/mkfs.fat.8:223
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -96,7 +96,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/mkfs.fat.8:26
-msgid "B<mkfs.fat> - create an MS-DOS file system under Linux"
+msgid "B<mkfs.fat> - create an MS-DOS filesystem under Linux"
 msgstr ""
 
 #. type: Plain text
@@ -113,10 +113,10 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:106
 msgid ""
-"B<mkfs.fat> is used to create an MS-DOS file system under Linux on a device "
+"B<mkfs.fat> is used to create an MS-DOS filesystem under Linux on a device "
 "(usually a disk partition).  I<device> is the special file corresponding to "
 "the device (e.g /dev/hdXX).  I<block-count> is the number of blocks on the "
-"device.  If omitted, B<mkfs.fat> automatically determines the file system "
+"device.  If omitted, B<mkfs.fat> automatically determines the filesystem "
 "size."
 msgstr ""
 
@@ -134,18 +134,18 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:131
 msgid ""
-"Use Atari variation of the MS-DOS file system. This is default if B<mkfs."
-"fat> is run on an Atari, then this option turns off Atari format. There are "
-"some differences when using Atari format: If not directed otherwise by the "
-"user, B<mkfs.fat> will always use 2 sectors per cluster, since GEMDOS "
-"doesn't like other values very much.  It will also obey the maximum number "
-"of sectors GEMDOS can handle.  Larger file systems are managed by raising "
-"the logical sector size.  Under Atari format, an Atari-compatible serial "
-"number for the file system is generated, and a 12 bit FAT is used only for "
-"file systems that have one of the usual floppy sizes (720k, 1.2M, 1.44M, "
-"2.88M), a 16 bit FAT otherwise. This can be overridden with the B<-F> "
-"option. Some PC-specific boot sector fields aren't written, and a boot "
-"message (option B<-m>) is ignored."
+"Use Atari variation of the MS-DOS filesystem. This is default if B<mkfs.fat> "
+"is run on an Atari, then this option turns off Atari format. There are some "
+"differences when using Atari format: If not directed otherwise by the user, "
+"B<mkfs.fat> will always use 2 sectors per cluster, since GEMDOS doesn't like "
+"other values very much.  It will also obey the maximum number of sectors "
+"GEMDOS can handle.  Larger filesystems are managed by raising the logical "
+"sector size.  Under Atari format, an Atari-compatible serial number for the "
+"filesystem is generated, and a 12 bit FAT is used only for filesystems that "
+"have one of the usual floppy sizes (720k, 1.2M, 1.44M, 2.88M), a 16 bit FAT "
+"otherwise. This can be overridden with the B<-F> option. Some PC-specific "
+"boot sector fields aren't written, and a boot message (option B<-m>) is "
+"ignored."
 msgstr ""
 
 #. type: TP
@@ -170,7 +170,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/mkfs.fat.8:139
-msgid "Check the device for bad blocks before creating the file system."
+msgid "Check the device for bad blocks before creating the filesystem."
 msgstr ""
 
 #. type: TP
@@ -183,10 +183,10 @@ msgstr ""
 #: en/mkfs.fat.8:152
 msgid ""
 "Create the file given as I<device> on the command line, and write the to-be-"
-"created file system to it. This can be used to create the new file system in "
-"a file instead of on a real device, and to avoid using B<dd> in advance to "
+"created filesystem to it. This can be used to create the new filesystem in a "
+"file instead of on a real device, and to avoid using B<dd> in advance to "
 "create a file of appropriate size. With this option, the I<block-count> must "
-"be given, because otherwise the intended size of the file system wouldn't be "
+"be given, because otherwise the intended size of the filesystem wouldn't be "
 "known. The file created is a sparse file, which actually only contains the "
 "meta-data areas (boot sector, FATs, and root directory). The data portions "
 "won't be stored on the disk, but the file nevertheless will have the correct "
@@ -203,9 +203,9 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:157
 msgid ""
-"Specify the number of file allocation tables in the file system.  The "
-"default is 2.  Currently the Linux MS-DOS file system does not support more "
-"than 2 FATs."
+"Specify the number of file allocation tables in the filesystem.  The default "
+"is 2.  Currently the Linux MS-DOS filesystem does not support more than 2 "
+"FATs."
 msgstr ""
 
 #. type: TP
@@ -219,7 +219,7 @@ msgstr ""
 msgid ""
 "Specifies the type of file allocation tables used (12, 16 or 32 bit).  If "
 "nothing is specified, B<mkfs.fat> will automatically select between 12, 16 "
-"and 32 bit, whatever fits better for the file system size."
+"and 32 bit, whatever fits better for the filesystem size."
 msgstr ""
 
 #. type: TP
@@ -246,9 +246,9 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:174
 msgid ""
-"Sets the volume ID of the newly created file system; I<volume-id> is a 32-"
-"bit hexadecimal number (for example, 2e24ec82).  The default is a number "
-"which depends on the file system creation time."
+"Sets the volume ID of the newly created filesystem; I<volume-id> is a 32-bit "
+"hexadecimal number (for example, 2e24ec82).  The default is a number which "
+"depends on the filesystem creation time."
 msgstr ""
 
 #. type: TP
@@ -264,7 +264,7 @@ msgid ""
 "are not permitted to create a filesystem across the entire device.  B<mkfs."
 "fat> will complain and tell you that it refuses to work.  This is different "
 "when using MO disks.  One doesn't always need partitions on MO disks.  The "
-"file system can go directly to the whole disk.  Under other OSes this is "
+"filesystem can go directly to the whole disk.  Under other OSes this is "
 "known as the 'superfloppy' format."
 msgstr ""
 
@@ -293,7 +293,7 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:198
 msgid ""
-"Sets the message the user receives on attempts to boot this file system "
+"Sets the message the user receives on attempts to boot this filesystem "
 "without having properly installed an operating system.  The message file "
 "must not exceed 418 bytes once line feeds have been converted to carriage "
 "return-line feed combinations, and tabs have been expanded.  If the filename "
@@ -309,7 +309,7 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:202
 msgid ""
-"Sets the volume name (label) of the file system.  The volume name can be up "
+"Sets the volume name (label) of the filesystem.  The volume name can be up "
 "to 11 characters long.  The default is no label."
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:230
 msgid ""
-"B<mkfs.fat> can not create boot-able file systems. This isn't as easy as you "
+"B<mkfs.fat> can not create boot-able filesystems. This isn't as easy as you "
 "might think at first glance for various reasons and has been discussed a lot "
 "already.  B<mkfs.fat> simply will not support it ;)"
 msgstr ""
diff --git a/manpages/pot/mkfs.fat.8.pot b/manpages/pot/mkfs.fat.8.pot
index f728ddc..7628d16 100644
--- a/manpages/pot/mkfs.fat.8.pot
+++ b/manpages/pot/mkfs.fat.8.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dosfstools VERSION\n"
-"POT-Creation-Date: 2013-06-11 18:45+0300\n"
+"POT-Creation-Date: 2013-06-11 19:49+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,7 +59,7 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/fatlabel.8:41 en/fsck.fat.8:126 en/mkfs.fat.8:241
+#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:241
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -77,13 +77,13 @@ msgid "B<-A>"
 msgstr ""
 
 #. type: TP
-#: en/fsck.fat.8:100 en/mkfs.fat.8:220
+#: en/fsck.fat.8:102 en/mkfs.fat.8:220
 #, no-wrap
 msgid "B<-v>"
 msgstr ""
 
 #. type: SH
-#: en/fsck.fat.8:123 en/mkfs.fat.8:223
+#: en/fsck.fat.8:125 en/mkfs.fat.8:223
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -96,7 +96,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/mkfs.fat.8:26
-msgid "B<mkfs.fat> - create an MS-DOS file system under Linux"
+msgid "B<mkfs.fat> - create an MS-DOS filesystem under Linux"
 msgstr ""
 
 #. type: Plain text
@@ -113,10 +113,10 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:106
 msgid ""
-"B<mkfs.fat> is used to create an MS-DOS file system under Linux on a device "
+"B<mkfs.fat> is used to create an MS-DOS filesystem under Linux on a device "
 "(usually a disk partition).  I<device> is the special file corresponding to "
 "the device (e.g /dev/hdXX).  I<block-count> is the number of blocks on the "
-"device.  If omitted, B<mkfs.fat> automatically determines the file system "
+"device.  If omitted, B<mkfs.fat> automatically determines the filesystem "
 "size."
 msgstr ""
 
@@ -134,18 +134,18 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:131
 msgid ""
-"Use Atari variation of the MS-DOS file system. This is default if B<mkfs."
-"fat> is run on an Atari, then this option turns off Atari format. There are "
-"some differences when using Atari format: If not directed otherwise by the "
-"user, B<mkfs.fat> will always use 2 sectors per cluster, since GEMDOS "
-"doesn't like other values very much.  It will also obey the maximum number "
-"of sectors GEMDOS can handle.  Larger file systems are managed by raising "
-"the logical sector size.  Under Atari format, an Atari-compatible serial "
-"number for the file system is generated, and a 12 bit FAT is used only for "
-"file systems that have one of the usual floppy sizes (720k, 1.2M, 1.44M, "
-"2.88M), a 16 bit FAT otherwise. This can be overridden with the B<-F> "
-"option. Some PC-specific boot sector fields aren't written, and a boot "
-"message (option B<-m>) is ignored."
+"Use Atari variation of the MS-DOS filesystem. This is default if B<mkfs.fat> "
+"is run on an Atari, then this option turns off Atari format. There are some "
+"differences when using Atari format: If not directed otherwise by the user, "
+"B<mkfs.fat> will always use 2 sectors per cluster, since GEMDOS doesn't like "
+"other values very much.  It will also obey the maximum number of sectors "
+"GEMDOS can handle.  Larger filesystems are managed by raising the logical "
+"sector size.  Under Atari format, an Atari-compatible serial number for the "
+"filesystem is generated, and a 12 bit FAT is used only for filesystems that "
+"have one of the usual floppy sizes (720k, 1.2M, 1.44M, 2.88M), a 16 bit FAT "
+"otherwise. This can be overridden with the B<-F> option. Some PC-specific "
+"boot sector fields aren't written, and a boot message (option B<-m>) is "
+"ignored."
 msgstr ""
 
 #. type: TP
@@ -170,7 +170,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/mkfs.fat.8:139
-msgid "Check the device for bad blocks before creating the file system."
+msgid "Check the device for bad blocks before creating the filesystem."
 msgstr ""
 
 #. type: TP
@@ -183,10 +183,10 @@ msgstr ""
 #: en/mkfs.fat.8:152
 msgid ""
 "Create the file given as I<device> on the command line, and write the to-be-"
-"created file system to it. This can be used to create the new file system in "
-"a file instead of on a real device, and to avoid using B<dd> in advance to "
+"created filesystem to it. This can be used to create the new filesystem in a "
+"file instead of on a real device, and to avoid using B<dd> in advance to "
 "create a file of appropriate size. With this option, the I<block-count> must "
-"be given, because otherwise the intended size of the file system wouldn't be "
+"be given, because otherwise the intended size of the filesystem wouldn't be "
 "known. The file created is a sparse file, which actually only contains the "
 "meta-data areas (boot sector, FATs, and root directory). The data portions "
 "won't be stored on the disk, but the file nevertheless will have the correct "
@@ -203,9 +203,9 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:157
 msgid ""
-"Specify the number of file allocation tables in the file system.  The "
-"default is 2.  Currently the Linux MS-DOS file system does not support more "
-"than 2 FATs."
+"Specify the number of file allocation tables in the filesystem.  The default "
+"is 2.  Currently the Linux MS-DOS filesystem does not support more than 2 "
+"FATs."
 msgstr ""
 
 #. type: TP
@@ -219,7 +219,7 @@ msgstr ""
 msgid ""
 "Specifies the type of file allocation tables used (12, 16 or 32 bit).  If "
 "nothing is specified, B<mkfs.fat> will automatically select between 12, 16 "
-"and 32 bit, whatever fits better for the file system size."
+"and 32 bit, whatever fits better for the filesystem size."
 msgstr ""
 
 #. type: TP
@@ -246,9 +246,9 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:174
 msgid ""
-"Sets the volume ID of the newly created file system; I<volume-id> is a 32-"
-"bit hexadecimal number (for example, 2e24ec82).  The default is a number "
-"which depends on the file system creation time."
+"Sets the volume ID of the newly created filesystem; I<volume-id> is a 32-bit "
+"hexadecimal number (for example, 2e24ec82).  The default is a number which "
+"depends on the filesystem creation time."
 msgstr ""
 
 #. type: TP
@@ -264,7 +264,7 @@ msgid ""
 "are not permitted to create a filesystem across the entire device.  B<mkfs."
 "fat> will complain and tell you that it refuses to work.  This is different "
 "when using MO disks.  One doesn't always need partitions on MO disks.  The "
-"file system can go directly to the whole disk.  Under other OSes this is "
+"filesystem can go directly to the whole disk.  Under other OSes this is "
 "known as the 'superfloppy' format."
 msgstr ""
 
@@ -293,7 +293,7 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:198
 msgid ""
-"Sets the message the user receives on attempts to boot this file system "
+"Sets the message the user receives on attempts to boot this filesystem "
 "without having properly installed an operating system.  The message file "
 "must not exceed 418 bytes once line feeds have been converted to carriage "
 "return-line feed combinations, and tabs have been expanded.  If the filename "
@@ -309,7 +309,7 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:202
 msgid ""
-"Sets the volume name (label) of the file system.  The volume name can be up "
+"Sets the volume name (label) of the filesystem.  The volume name can be up "
 "to 11 characters long.  The default is no label."
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr ""
 #. type: Plain text
 #: en/mkfs.fat.8:230
 msgid ""
-"B<mkfs.fat> can not create boot-able file systems. This isn't as easy as you "
+"B<mkfs.fat> can not create boot-able filesystems. This isn't as easy as you "
 "might think at first glance for various reasons and has been discussed a lot "
 "already.  B<mkfs.fat> simply will not support it ;)"
 msgstr ""
diff --git a/src/boot.c b/src/boot.c
index 283b627..39add78 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
@@ -171,7 +171,7 @@ static void check_backup_boot(DOS_FS * fs, struct boot_sector *b, int lss)
 	char buf[20];
 
 	printf("There are differences between boot sector and its backup.\n");
-	printf("Differences: (offset:original/backup)\n  ");
+	printf("This is mostly harmless. Differences: (offset:original/backup)\n  ");
 	pos = 2;
 	for (p = (__u8 *) b, q = (__u8 *) & b2, i = 0; i < sizeof(b2);
 	     ++p, ++q, ++i) {
@@ -441,7 +441,7 @@ void read_boot(DOS_FS * fs)
 
     if (fs->clusters >
 	((unsigned long long)fs->fat_size * 8 / fs->fat_bits) - 2)
-	die("File system has %d clusters but only space for %d FAT entries.",
+	die("Filesystem has %d clusters but only space for %d FAT entries.",
 	    fs->clusters,
 	    ((unsigned long long)fs->fat_size * 8 / fs->fat_bits) - 2);
     if (!fs->root_entries && !fs->root_cluster)
diff --git a/src/boot.h b/src/boot.h
index 148dceb..7b42844 100644
--- a/src/boot.h
+++ b/src/boot.h
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/check.c b/src/check.c
index 40ef533..12affac 100644
--- a/src/check.c
+++ b/src/check.c
@@ -1,4 +1,4 @@
-/* check.c - Check and repair a PC/MS-DOS file system
+/* check.c - Check and repair a PC/MS-DOS filesystem
 
    Copyright (C) 1993 Werner Almesberger <werner.almesberger@lrc.di.epfl.ch>
    Copyright (C) 1998 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/check.h b/src/check.h
index ae05988..0a076ba 100644
--- a/src/check.h
+++ b/src/check.h
@@ -1,4 +1,4 @@
-/* check.h - Check and repair a PC/MS-DOS file system
+/* check.h - Check and repair a PC/MS-DOS filesystem
 
    Copyright (C) 1993 Werner Almesberger <werner.almesberger@lrc.di.epfl.ch>
    Copyright (C) 2008-2013 Daniel Baumann <mail@daniel-baumann.ch>
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
@@ -34,7 +34,7 @@ loff_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern);
 int scan_root(DOS_FS * fs);
 
 /* Scans the root directory and recurses into all subdirectories. See check.c
-   for all the details. Returns a non-zero integer if the file system has to
+   for all the details. Returns a non-zero integer if the filesystem has to
    be checked again. */
 
 #endif
diff --git a/src/common.c b/src/common.c
index 09004dd..12afc69 100644
--- a/src/common.c
+++ b/src/common.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/common.h b/src/common.h
index 7e998ff..395bb07 100644
--- a/src/common.h
+++ b/src/common.h
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/fat.c b/src/fat.c
index 1ac3b99..7e8239e 100644
--- a/src/fat.c
+++ b/src/fat.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/fat.h b/src/fat.h
index 7eaef9e..096d224 100644
--- a/src/fat.h
+++ b/src/fat.h
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   THe complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
@@ -25,7 +25,7 @@
 
 void read_fat(DOS_FS * fs);
 
-/* Loads the FAT of the file system described by FS. Initializes the FAT,
+/* Loads the FAT of the filesystem described by FS. Initializes the FAT,
    replaces broken FATs and rejects invalid cluster entries. */
 
 void get_fat(FAT_ENTRY * entry, void *fat, unsigned long cluster, DOS_FS * fs);
diff --git a/src/fatlabel.c b/src/fatlabel.c
index 15f0454..8397a97 100644
--- a/src/fatlabel.c
+++ b/src/fatlabel.c
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
     if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
 	usage(0);
     else if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-	printf("fatlabel " VERSION ", " VERSION_DATE ", FAT32, LFN\n");
+	printf("fatlabel " VERSION " (" VERSION_DATE ")\n");
 	exit(0);
     }
 
diff --git a/src/file.c b/src/file.c
index 1272e17..c80769a 100644
--- a/src/file.c
+++ b/src/file.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/file.h b/src/file.h
index c7e2e4d..3d2624d 100644
--- a/src/file.h
+++ b/src/file.h
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/fsck.fat.c b/src/fsck.fat.c
index d8a0649..dbf8890 100644
--- a/src/fsck.fat.c
+++ b/src/fsck.fat.c
@@ -1,4 +1,4 @@
-/* mkfs.fat.c - User interface
+/* fsck.fat.c - User interface
 
    Copyright (C) 1993 Werner Almesberger <werner.almesberger@lrc.di.epfl.ch>
    Copyright (C) 1998 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
@@ -51,8 +51,8 @@ static void usage(char *name)
 {
     fprintf(stderr, "usage: %s [-aAbflrtvVwy] [-d path -d ...] "
 	    "[-u path -u ...]\n%15sdevice\n", name, "");
-    fprintf(stderr, "  -a       automatically repair the file system\n");
-    fprintf(stderr, "  -A       toggle Atari file system format\n");
+    fprintf(stderr, "  -a       automatically repair the filesystem\n");
+    fprintf(stderr, "  -A       toggle Atari filesystem format\n");
     fprintf(stderr, "  -b       make read-only boot sector check\n");
     fprintf(stderr,
 	    "  -c N     use DOS codepage N to decode short file names (default: %d)\n",
@@ -63,7 +63,7 @@ static void usage(char *name)
     fprintf(stderr,
 	    "  -n       no-op, check non-interactively without changing\n");
     fprintf(stderr, "  -p       same as -a, for compat with other *fsck\n");
-    fprintf(stderr, "  -r       interactively repair the file system\n");
+    fprintf(stderr, "  -r       interactively repair the filesystem\n");
     fprintf(stderr, "  -t       test for bad clusters\n");
     fprintf(stderr, "  -u path  try to undelete that (non-directory) file\n");
     fprintf(stderr, "  -v       verbose mode\n");
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
 	    break;
 	case 'v':
 	    verbose = 1;
-	    printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n");
+	    printf("fsck.fat " VERSION " (" VERSION_DATE ")\n");
 	    break;
 	case 'V':
 	    verify = 1;
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
     if (optind != argc - 1)
 	usage(argv[0]);
 
-    printf("mkfs.fat " VERSION ", " VERSION_DATE ", FAT32, LFN\n");
+    printf("fsck.fat " VERSION " (" VERSION_DATE ")\n");
     fs_open(argv[optind], rw);
 
     read_boot(&fs);
@@ -216,7 +216,7 @@ exit:
 	    else
 		printf("Performing changes.\n");
 	} else
-	    printf("Leaving file system unchanged.\n");
+	    printf("Leaving filesystem unchanged.\n");
     }
 
     if (!boot_only)
diff --git a/src/fsck.fat.h b/src/fsck.fat.h
index a3a40b3..8f3374e 100644
--- a/src/fsck.fat.h
+++ b/src/fsck.fat.h
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/io.c b/src/io.c
index 7e3a592..490c7a2 100644
--- a/src/io.c
+++ b/src/io.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
@@ -223,7 +223,7 @@ int fs_close(int write)
 	    changes = next;
 	}
     if (close(fd) < 0)
-	pdie("closing file system");
+	pdie("closing filesystem");
     return changed || did_change;
 }
 
diff --git a/src/io.h b/src/io.h
index 45cb7d8..33c60db 100644
--- a/src/io.h
+++ b/src/io.h
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
@@ -35,7 +35,7 @@ loff_t llseek(int fd, loff_t offset, int whence);
 
 void fs_open(char *path, int rw);
 
-/* Opens the file system PATH. If RW is zero, the file system is opened
+/* Opens the filesystem PATH. If RW is zero, the filesystem is opened
    read-only, otherwise, it is opened read-write. */
 
 void fs_read(loff_t pos, int size, void *data);
@@ -56,13 +56,13 @@ void fs_write(loff_t pos, int size, void *data);
 
 int fs_close(int write);
 
-/* Closes the file system, performs all pending changes if WRITE is non-zero
+/* Closes the filesystem, performs all pending changes if WRITE is non-zero
    and removes the list of changes. Returns a non-zero integer if the file
    system has been changed since the last fs_open, zero otherwise. */
 
 int fs_changed(void);
 
-/* Determines whether the file system has changed. See fs_close. */
+/* Determines whether the filesystem has changed. See fs_close. */
 
 extern unsigned device_no;
 
diff --git a/src/lfn.c b/src/lfn.c
index 9e55605..8516cc5 100644
--- a/src/lfn.c
+++ b/src/lfn.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/lfn.h b/src/lfn.h
index 41b08f3..3dde4fa 100644
--- a/src/lfn.h
+++ b/src/lfn.h
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
index c7d39a3..cfa3288 100644
--- a/src/mkfs.fat.c
+++ b/src/mkfs.fat.c
@@ -20,7 +20,7 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
@@ -525,7 +525,7 @@ static void check_mount(char *device_name)
 	return;
     while ((mnt = getmntent(f)) != NULL)
 	if (strcmp(device_name, mnt->mnt_fsname) == 0)
-	    die("%s contains a mounted file system.");
+	    die("%s contains a mounted filesystem.");
     endmntent(f);
 }
 
@@ -692,18 +692,18 @@ def_hd_params:
 	}
 	if (size_fat == 32) {
 	    /* For FAT32, try to do the same as M$'s format command
-	     * (see http://www.win.tue.nl/~aeb/linux/fs/fat/fatgen103.pdf p. 20):
-	     * fs size <= 260M: 0.5k clusters
-	     * fs size <=   8G: 4k clusters
-	     * fs size <=  16G: 8k clusters
-	     * fs size >   16G: 16k clusters
+	     * (http://technet.microsoft.com/en-us/library/cc938438.aspx):
+	     * fs size <   8G:  4k clusters
+	     * fs size <  16G:  8k clusters
+	     * fs size <  32G: 16k clusters
+	     * fs size >= 32G: 32k clusters
 	     */
 	    unsigned long sz_mb =
 		(blocks + (1 << (20 - BLOCK_SIZE_BITS)) - 1) >> (20 -
 								 BLOCK_SIZE_BITS);
 	    bs.cluster_size =
-		sz_mb > 16 * 1024 ? 32 : sz_mb > 8 * 1024 ? 16 : sz_mb >
-		260 ? 8 : 1;
+		sz_mb >= 32 * 1024 ? 64 : sz_mb >= 16 * 1024 ? 32 : sz_mb >=
+		8 * 1024 ? 16 : 8;
 	} else {
 	    /* FAT12 and FAT16: start at 4 sectors per cluster */
 	    bs.cluster_size = (char)4;
@@ -842,8 +842,7 @@ static void setup_tables(void)
 	    maxclustsize = 128;
 
 	do {
-	    fatdata32 = num_sectors
-		- align_object(reserved_sectors, bs.cluster_size);
+	    fatdata32 = num_sectors - reserved_sectors;
 	    fatdata1216 = fatdata32
 		- align_object(root_dir_sectors, bs.cluster_size);
 
@@ -905,7 +904,6 @@ static void setup_tables(void)
 	    clust32 = ((long long)fatdata32 * sector_size + nr_fats * 8) /
 		((int)bs.cluster_size * sector_size + nr_fats * 4);
 	    fatlength32 = cdiv((clust32 + 2) * 4, sector_size);
-	    fatlength32 = align_object(fatlength32, bs.cluster_size);
 	    /* Need to recalculate number of clusters, since the unused parts of the
 	     * FATS and data area together could make up space for an additional,
 	     * not really present cluster. */
@@ -967,7 +965,7 @@ static void setup_tables(void)
 			    "the total number of clusters becomes less than the "
 			    "threshold value for\n"
 			    "distinction between 12 and 16 bit FATs.\n");
-		    die("Make the file system a bit smaller manually.");
+		    die("Make the filesystem a bit smaller manually.");
 		}
 	    }
 	    cluster_count = clust16;
@@ -992,10 +990,6 @@ static void setup_tables(void)
 	    die("FAT not 12, 16 or 32 bits");
 	}
 
-	/* Adjust the reserved number of sectors for alignment */
-	reserved_sectors = align_object(reserved_sectors, bs.cluster_size);
-	bs.reserved = htole16(reserved_sectors);
-
 	/* Adjust the number of root directory entries to help enforce alignment */
 	if (align_structures) {
 	    root_dir_entries = align_object(root_dir_sectors, bs.cluster_size)
@@ -1005,7 +999,7 @@ static void setup_tables(void)
 	unsigned clusters, maxclust, fatdata;
 
 	/* GEMDOS always uses a 12 bit FAT on floppies, and always a 16 bit FAT on
-	 * hard disks. So use 12 bit if the size of the file system suggests that
+	 * hard disks. So use 12 bit if the size of the filesystem suggests that
 	 * this fs is for a floppy disk, if the user hasn't explicitly requested a
 	 * size.
 	 */
@@ -1137,9 +1131,9 @@ static void setup_tables(void)
 
     if (!cluster_count) {
 	if (sectors_per_cluster)	/* If yes, die if we'd spec'd sectors per cluster */
-	    die("Too many clusters for file system - try more sectors per cluster");
+	    die("Too many clusters for filesystem - try more sectors per cluster");
 	else
-	    die("Attempting to create a too large file system");
+	    die("Attempting to create a too large filesystem");
     }
 
     /* The two following vars are in hard sectors, i.e. 512 byte sectors! */
@@ -1148,8 +1142,8 @@ static void setup_tables(void)
     start_data_block = (start_data_sector + SECTORS_PER_BLOCK - 1) /
 	SECTORS_PER_BLOCK;
 
-    if (blocks < start_data_block + 32)	/* Arbitrary undersize file system! */
-	die("Too few blocks for viable file system");
+    if (blocks < start_data_block + 32)	/* Arbitrary undersize filesystem! */
+	die("Too few blocks for viable filesystem");
 
     if (verbose) {
 	printf("%s has %d head%s and %d sector%s per track,\n",
@@ -1159,7 +1153,7 @@ static void setup_tables(void)
 	printf("logical sector size is %d,\n", sector_size);
 	printf("using 0x%02x media descriptor, with %d sectors;\n",
 	       (int)(bs.media), num_sectors);
-	printf("file system has %d %d-bit FAT%s and %d sector%s per cluster.\n",
+	printf("filesystem has %d %d-bit FAT%s and %d sector%s per cluster.\n",
 	       (int)(bs.fats), size_fat, (bs.fats != 1) ? "s" : "",
 	       (int)(bs.cluster_size), (bs.cluster_size != 1) ? "s" : "");
 	printf("FAT size is %d sector%s, and provides %d cluster%s.\n",
@@ -1408,7 +1402,7 @@ int main(int argc, char **argv)
     volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec);	/* Default volume ID = creation time, fudged for more uniqueness */
     check_atari();
 
-    printf("%s " VERSION " (" VERSION_DATE ")\n", program_name);
+    printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n");
 
     while ((c = getopt(argc, argv, "aAb:cCf:F:Ii:l:m:n:r:R:s:S:h:v")) != EOF)
 	/* Scan the command line for options */
@@ -1698,14 +1692,14 @@ int main(int argc, char **argv)
     establish_params(statbuf.st_rdev, statbuf.st_size);
     /* Establish the media parameters */
 
-    setup_tables();		/* Establish the file system tables */
+    setup_tables();		/* Establish the filesystem tables */
 
     if (check)			/* Determine any bad block locations and mark them */
 	check_blocks();
     else if (listfile)
 	get_list_blocks(listfile);
 
-    write_tables();		/* Write the file system tables away! */
+    write_tables();		/* Write the filesystem tables away! */
 
     exit(0);			/* Terminate with no errors! */
 }
diff --git a/src/version.h b/src/version.h
index 3d1d3a4..cf963d6 100644
--- a/src/version.h
+++ b/src/version.h
@@ -16,14 +16,14 @@
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-   On Debian systems, the complete text of the GNU General Public License
+   The complete text of the GNU General Public License
    can be found in /usr/share/common-licenses/GPL-3 file.
 */
 
 #ifndef _version_h
 #define _version_h
 
-#define VERSION "3.0.19"
-#define VERSION_DATE "11 Jun 2013"
+#define VERSION "3.0.20"
+#define VERSION_DATE "12 Jun 2013"
 
 #endif