diff -ur --new-file --exclude-from=/home/aknaff/Projects/exclude mtools-3.9.11/Changelog mtools/Changelog

--- mtools-3.9.11/Changelog	2007-05-30 14:05:03.000000000 +0200

+++ mtools/Changelog	2007-06-01 12:01:32.000000000 +0200

@@ -1,3 +1,5 @@

+v20070601

+	Fixed misc blunders...

 v20070531

 	Fixed lots of minor items raised by gcc4

 	Merged some of the BSD patches

diff -ur --new-file --exclude-from=/home/aknaff/Projects/exclude mtools-3.9.11/cmdname mtools/cmdname

--- mtools-3.9.11/cmdname	1970-01-01 01:00:00.000000000 +0100

+++ mtools/cmdname	2004-02-28 19:48:32.000000000 +0100

@@ -0,0 +1,26 @@

+floppyd - floppy daemon for remote access to floppy drive

+floppyd_installtest - tests whether floppyd is installed and running

+mattrib - change MSDOS file attribute flags

+mbadblocks - tests a floppy disk, and marks the bad blocks in the FAT

+mcd - change MSDOS directory

+mcat - dump raw disk image

+mclasserase - erase memory cards

+mcopy - copy MSDOS files to/from Unix

+mdel - delete an MSDOS file

+mdeltree - recursively delete an MSDOS directory and its contents

+mdir - display an MSDOS directory

+mdu - display the amount of space occupied by an MSDOS directory

+mformat - add an MSDOS filesystem to a low-level formatted floppy disk

+minfo - print the parameters of a MSDOS filesystem

+mkmanifest - makes list of file names and their DOS 8+3 equivalent

+mlabel - make an MSDOS volume label

+mmd - make an MSDOS subdirectory

+mmount - mount an MSDOS disk

+mpartition - partition an MSDOS hard disk

+mrd - remove an MSDOS subdirectory

+mmove - move or rename an MSDOS file or subdirectory

+mren - rename an existing MSDOS file

+mshowfat - shows FAT clusters allocated to file

+mtype - display contents of an MSDOS file

+mtoolstest - tests and displays the configuration

+mzip - change protection mode and eject disk on Zip/Jaz drive

diff -ur --new-file --exclude-from=/home/aknaff/Projects/exclude mtools-3.9.11/floppyd_installtest.c mtools/floppyd_installtest.c

--- mtools-3.9.11/floppyd_installtest.c	2007-05-26 22:58:38.000000000 +0200

+++ mtools/floppyd_installtest.c	2007-06-01 12:00:48.000000000 +0200

@@ -199,11 +199,7 @@

 	 */

 	addr.sin_family = AF_INET;

-#ifndef HAVE_HTONS

-	addr.sin_port = myhtons(port);

-#else	

 	addr.sin_port = htons(port);

-#endif	

 	addr.sin_addr.s_addr = ip;

         /*

diff -ur --new-file --exclude-from=/home/aknaff/Projects/exclude mtools-3.9.11/floppyd_io.c mtools/floppyd_io.c

--- mtools-3.9.11/floppyd_io.c	2007-05-26 22:58:22.000000000 +0200

+++ mtools/floppyd_io.c	2007-06-01 12:01:06.000000000 +0200

@@ -489,11 +489,7 @@

 	 */

 	addr.sin_family = AF_INET;

-#ifndef HAVE_HTONS

-	addr.sin_port = myhtons(port);

-#else	

 	addr.sin_port = htons(port);

-#endif	

 	addr.sin_addr.s_addr = ip;

         /*

diff -ur --new-file --exclude-from=/home/aknaff/Projects/exclude mtools-3.9.11/mclasserase.c mtools/mclasserase.c

--- mtools-3.9.11/mclasserase.c	2007-05-26 10:00:41.000000000 +0200

+++ mtools/mclasserase.c	2007-06-01 11:52:46.000000000 +0200

@@ -19,7 +19,11 @@

 #include "vfat.h"

 #include "mainloop.h"

 #include "fsP.h"

-#include "getopt.h"

+

+#ifdef HAVE_GETOPT_H

+#include <getopt.h>

+#endif

+

 #include "file.h"

 #include <unistd.h>

diff -ur --new-file --exclude-from=/home/aknaff/Projects/exclude mtools-3.9.11/todo mtools/todo

--- mtools-3.9.11/todo	1970-01-01 01:00:00.000000000 +0100

+++ mtools/todo	2002-05-01 11:49:04.000000000 +0200

@@ -0,0 +1,9 @@

+ The todo list is now.

+   - better man pages for the COUNTRY stuff

+   - test writing with xdf disks

+   - man pages for xdf stuff (shouldn't be too tough)

+   - various transfer size optimisation (right now, most read/write routines

+   use the minimal possible transfer size :-( )

+   - code to enable suns to access xdf and 2m disks :-)

+

+ Volunteers appreciated, especially for the first 3 items.