Index: Makefile.in =================================================================== --- Makefile.in (revisão 495) +++ Makefile.in (cópia de trabalho) @@ -329,7 +329,7 @@ check: echo No self tests included -# check target needed even if empty, in order to make life easyer for +# check target needed even if empty, in order to make life easier for # automatic tools to install GNU soft Index: NEWS =================================================================== --- NEWS (revisão 495) +++ NEWS (cópia de trabalho) @@ -73,7 +73,7 @@ Fixed typo in initialization of FAT32 info sector v4_0_15 Added missing -i option to mshortname - Splitted .deb package into mtools and floppyd in order to + Split .deb package into mtools and floppyd in order to match Ubuntu v4_0_14 New mshortname command @@ -170,7 +170,7 @@ v20060626 Merged Redhat/Fedora patches v20060531 - #ifdef linux-dependant code in mformat.c + #ifdef linux-dependent code in mformat.c v20060525 Fix gcc4 warnings Fix reading of boot sector (block size) @@ -210,7 +210,7 @@ v20030718 Fix rootskip and rate of XDF disks v20030705 - Fix inverted IS_MFORMAT_ONLY conditon in plain_io.c + Fix inverted IS_MFORMAT_ONLY condition in plain_io.c v20030609 Moved putc after variable description (anybody knows about a -W flag so that gcc warns about these?) @@ -264,7 +264,7 @@ v20020125 Fixes for cygwin Fixes in buffer.c for oddly sized image files - Mformat.c fixes to avoid makeing images which would not be + Mformat.c fixes to avoid making images which would not be readable in windows. v20010908 Warn for invalid partition numbers @@ -521,7 +521,7 @@ Jacked up performance, and corrected signal handling bugs. Also corrected various "Disk full bugs" v19971212 - Fixed "Bad address" errors which occured when running mdu on empty + Fixed "Bad address" errors which occurred when running mdu on empty files. When copying recursively, do not barf if a directory already exist at the target. Mcopy operates silently by default. v19971212 @@ -550,7 +550,7 @@ Pre-3.9. Redid the mainloop logic, and got rid of lots of cruft in subdir.c and parse.c. It is now possible to put wildcards in the directory part of the filename. Design also became simpler, - making it easyer to maintain this part in the future. + making it easier to maintain this part in the future. Added a -u flag to mzip to temporarily unprotect a disk Added a test to mzip to prevent manipulation of mounted disks Added support for partitioned devices in mmount @@ -590,7 +590,7 @@ Guard against corrupted "next free block" pointer in a FAT32 InfoBlock v19970715 - Use root priviliges during scsi_init + Use root privileges during scsi_init v19970714 Fixed close-on-exec bug. v19970714 @@ -665,11 +665,11 @@ v19970423 Prefer termios.h on Ultrix v19970422 - Renamed missing_functions to missFuncs in order to accomodate + Renamed missing_functions to missFuncs in order to accommodate operating systems with file name size limits. v19970420 Autoextend size for images that are too small. Moved BSD - dependant #ifdef's after the inclusion of sys/param.h, as it + dependent #ifdef's after the inclusion of sys/param.h, as it is there where BSD is defined (sigh!) v19970419 Insist on the fact that mzip's -f flag only makes sense if @@ -878,7 +878,7 @@ v19961210 Added warning about running mtools with root privs. v19961209 - Fixed unitialized variable in fat.c and added example for Sun + Fixed uninitialized variable in fat.c and added example for Sun mtools.conf v19961209 Fixed comment in scripts/tgz @@ -895,7 +895,7 @@ Test first for tzset in autoconfigure (Solaris) v19961202 Segment fault due to change of buffer size fixed - E-mail adress fixed + E-mail address fixed v19961117 Lots of portability fixes. v19961012 @@ -935,7 +935,7 @@ Beginning of ED and 5 1/4 HD XDF support (doesn't work yet for ED) v19960528 - Make vold and "raw" floppy drive accesible simultaneously on + Make vold and "raw" floppy drive accessible simultaneously on Solaris by calling one A: and the other B: Add missing mbadblock LINK in Makefile.in v19960527 @@ -979,7 +979,7 @@ v19960427 more spelling fixes. v19960426 - Speling fixes + Spelling fixes v19960424 Mmount arg parsing bug fix v19960422 Index: buffer.c =================================================================== --- buffer.c (revisão 495) +++ buffer.c (cópia de trabalho) @@ -33,7 +33,7 @@ size_t sectorSize; /* sector size: all operations happen * in multiples of this */ - size_t cylinderSize; /* cylinder size: preferred alignemnt, + size_t cylinderSize; /* cylinder size: preferred alignment, * but for efficiency, less data may be read */ int ever_dirty; /* was the buffer ever dirty? */ size_t dirty_pos; Index: charsetConv.c =================================================================== --- charsetConv.c (revisão 495) +++ charsetConv.c (cópia de trabalho) @@ -407,7 +407,7 @@ int r = mbrtowc(wchar+i, native, len, &ps); if(r < 0) { /* Unconvertible character. Just pretend it's Latin1 - encoded (if valid Latin1 character) or substitue + encoded (if valid Latin1 character) or substitute with an underscore if not */ char c = *native; Index: configure.in =================================================================== --- configure.in (revisão 495) +++ configure.in (cópia de trabalho) @@ -67,7 +67,7 @@ dnl Check for configuration options dnl Debugging AC_ARG_ENABLE(debug, -[ --enable-debug debuging messages], +[ --enable-debug debugging messages], [if test x$enableval = xyes; then AC_DEFINE([DEBUG],1,[Define for debugging messages]) fi]) Index: debian/changelog =================================================================== --- debian/changelog (revisão 495) +++ debian/changelog (cópia de trabalho) @@ -80,7 +80,7 @@ mtools (4.0.15) stable; urgency=low * Added missing -i option to mshortname - * Splitted .deb package into mtools and floppyd in order to + * Split .deb package into mtools and floppyd in order to match Ubuntu -- Alain Knaff Sun, 17 Oct 2010 19:42:46 +0200 Index: fat_size_calculation.tex =================================================================== --- fat_size_calculation.tex (revisão 495) +++ fat_size_calculation.tex (cópia de trabalho) @@ -27,7 +27,7 @@ This small document explains the formula used by {\tt mformat.c} to figure out fat size and number of clusters. Due to the way that filesystem parameters are stored in the boot sector, we can afford to -have a FAT that is larger than need to be to accomodate the clusters +have a FAT that is larger than need to be to accommodate the clusters present on disk, but under no circumstances can we have one that is too small. @@ -146,7 +146,7 @@ enough for data alone). This situation, combined with a situation where the last FAT sector was flush full could have lead to a situation where $numClus$ would become too large for the FAT to -accomodate. I think this is clearer with an example: +accommodate. I think this is clearer with an example: \begin{itemize} \item $remSect=4127$, $clusSiz=1$, $nfats=1$ \item (Non rounded down) $numClus={(4127+2)*(1024) \over 1032} - @@ -163,7 +163,7 @@ The downside of counting the fractional part however is that we quite often waste a sector in the really common situation where both $nfats$ and $clusSiz$ are even, while $remSect$ is odd. An easy way to address -this is to substract one from $remSect$ before application of the +this is to subtract one from $remSect$ before application of the formula, if this case is detected. Such operation carries no risk, as the odd final sector cannot be used to make a full cluster. Index: mainloop.c =================================================================== --- mainloop.c (revisão 495) +++ mainloop.c (cópia de trabalho) @@ -223,7 +223,7 @@ return 0; case 1: /* we have already a directory */ FREE(&lookupState->Dir); - fprintf(stderr,"Ambigous\n"); + fprintf(stderr,"Ambiguous\n"); return STOP_NOW | ERROR_ONE; default: return STOP_NOW | ERROR_ONE; @@ -504,7 +504,7 @@ return ret; default: /* too much */ - fprintf(stderr, "Ambigous %s\n", arg); + fprintf(stderr, "Ambiguous %s\n", arg); return ERROR_ONE; } } Index: mclasserase.c =================================================================== --- mclasserase.c (revisão 495) +++ mclasserase.c (cópia de trabalho) @@ -256,7 +256,7 @@ /** - * Total Erase of Data on a Disk. After using mclasserase there wont + * Total Erase of Data on a Disk. After using mclasserase there won't * be ANY bits of old files on the disk.
* * @author stefan feuz
Index: mcomp.1 =================================================================== --- mcomp.1 (revisão 495) +++ mcomp.1 (cópia de trabalho) @@ -21,7 +21,7 @@ .SH DESCRIPTION .B mcomp compares two files, the first one must be on a floppy disk so it can -be accesed via \fBmtools\fR. +be accessed via \fBmtools\fR. It is not strictly necessary on Debian GNU/Linux, because the diffutils \fBcmp\fR(1) program provides the same capability after copying the file locally with Index: misc.c =================================================================== --- misc.c (revisão 495) +++ misc.c (cópia de trabalho) @@ -242,7 +242,7 @@ { int *size = ((int *) ptr)-1; total -= *size; - fprintf(stderr, "freeing %d bytes at %p total alloced=%d\n", + fprintf(stderr, "freeing %d bytes at %p total allocated=%d\n", *size, ptr, total); free(size); } Index: missFuncs.c =================================================================== --- missFuncs.c (revisão 495) +++ missFuncs.c (cópia de trabalho) @@ -269,7 +269,7 @@ #endif /* HAVE_STRSPN */ #ifndef HAVE_STRCSPN -/* Return the length of the maximum inital segment of S +/* Return the length of the maximum initial segment of S which contains no characters from REJECT. */ size_t strcspn (const char *s, const char *reject) { Index: mtools.texi =================================================================== --- mtools.texi (revisão 495) +++ mtools.texi (cópia de trabalho) @@ -1917,7 +1917,7 @@ @item R Sets the number of reserved sectors for this filesystem. This must be at least 1 for non-FAT32 disks, and at least 3 for FAT disks (in order -to accomodate the boot sector, the info sector and the backup boot +to accommodate the boot sector, the info sector and the backup boot sector). @item m Index: mzip.c =================================================================== --- mzip.c (revisão 495) +++ mzip.c (cópia de trabalho) @@ -466,7 +466,7 @@ passwd = getpass("Re-type new password:"); if(strncmp(first_try, passwd, _PASSWORD_LEN)) { fprintf(stderr, - "You mispelled it. Password not set.\n"); + "You misspelled it. Password not set.\n"); exit(1); } } else { Index: plain_io.c =================================================================== --- plain_io.c (revisão 495) +++ plain_io.c (cópia de trabalho) @@ -51,7 +51,7 @@ int size_limited; #endif int scsi_sector_size; - void *extra_data; /* extra system dependant information for scsi */ + void *extra_data; /* extra system dependent information for scsi */ int swap; /* do the word swapping */ } SimpleFile_t; @@ -386,7 +386,7 @@ if (firstblock > 0x1fffff || nsect > 0xff) { /* I suspect that the ZIP drive also understands Group 1 * commands. If that is indeed true, we may chose Group 1 - * more agressively in the future */ + * more aggressively in the future */ cdb[0] |= SCSI_GROUP1; clen=10; /* SCSI Group 1 cmd */ Index: privileges.c =================================================================== --- privileges.c (revisão 495) +++ privileges.c (cópia de trabalho) @@ -82,7 +82,7 @@ */ -/* group id handling is lots easyer, as long as we don't use group 0. +/* group id handling is lots easier, as long as we don't use group 0. * If you want to use group id's, create a *new* group mtools or * floppy. Chgrp any devices that you only want to be accessible to * mtools to this group, and give them the appropriate privs. Make @@ -134,7 +134,7 @@ setuid(ruid); /* this should be enough to get rid of the three * ids */ seteuid(ruid); /* for good measure... just in case we came - * accross a system which implemented sane + * across a system which implemented sane * semantics instead of POSIXly broken * semantics for setuid */ #else Index: sysincludes.h =================================================================== --- sysincludes.h (revisão 495) +++ sysincludes.h (cópia de trabalho) @@ -35,7 +35,7 @@ /***********************************************************************/ /* */ -/* OS dependancies which cannot be covered by the autoconfigure script */ +/* OS dependencies which cannot be covered by the autoconfigure script */ /* */ /***********************************************************************/ @@ -93,7 +93,7 @@ /***********************************************************************/ /* */ -/* Compiler dependancies */ +/* Compiler dependencies */ /* */ /***********************************************************************/