Merge tag 'upstream/2.17'

Upstream version 2.17

Conflicts:
	Makefile.in
	cpm.5.in

diff --cc cpm.5.in
Simple merge

diff --cc cpmls.c
Simple merge

diff --cc fsck.cpm.1.in
index 72930370f2bea58e7e4fb4ea64ba333762cf74fd,929074d95d25ca358d82cf4a23da7ac64748a236..04f861c5a5b8acde9671719130dfb872066dc993
--- 1/fsck.cpm.1.in
--- 2/fsck.cpm.1.in
+++ b/fsck.cpm.1.in
@@@ -37,12 -37,14 +37,15 @@@ Any errors are indicated by exit code 1
  .SH FILES .\"{{{
  @DATADIR@/diskdefs    CP/M disk format definitions
  .\"}}}
+ .SH ENVIRONMENT \"{{{
+ CPMTOOLSFMT     Default format
+ .\"}}}
  .SH DIAGNOSTICS .\"{{{
 -.IP "\fIimage\fP: \fIused\fP/\fItotal\fP files (\fIn\fP.\fIn\fP% non-contiguos), \fIused\fP/\fItotal\fP blocks"
 +.IP "\fIimage\fP: \fIused\fP/\fItotal\fP files (\fIn\fP.\fIn\fP% 
 +non-contiguous), \fIused\fP/\fItotal\fP blocks"
  No inconsistencies could be found.  The number of used files actually
  is the number of used extents.  Since a file may use more than
 -one extent, this may be greather than the actual number of files, but a
 +one extent, this may be greater than the actual number of files, but a
  correct measure would not reflect how many files could still be created
  at most.  A file is considered fragmented, if sequential data blocks
  pointed to by the same extent do not have sequential block numbers.

diff --cc fsed.cpm.1.in
Simple merge