|
From: Richard R. <fl...@us...> - 2005-07-06 22:47:34
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31362/ntfsprogs Modified Files: mkntfs.c ntfscp.c ntfsdump_logfile.c ntfsinfo.c ntfsls.c ntfsmftalloc.c ntfsmount.c ntfsmove.c ntfsresize.c ntfsrm.c ntfstruncate.c ntfsundelete.c ntfsundelete.h ntfswipe.c sd.c Log Message: got bored. don't read the diffs. Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- mkntfs.c 19 Jun 2005 21:09:41 -0000 1.58 +++ mkntfs.c 6 Jul 2005 22:47:18 -0000 1.59 @@ -113,7 +113,7 @@ #include <limits.h> #if defined(linux) && defined(_IO) && !defined(BLKSSZGET) -# define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytse. */ +# define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytes. */ #endif #include "types.h" @@ -211,7 +211,7 @@ struct { } opts; /** - * mkDprintf - debugging output (-vv); overriden by quiet (-q) + * mkDprintf - debugging output (-vv); overridden by quiet (-q) */ static void mkDprintf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); @@ -3015,7 +3015,7 @@ static void mkntfs_initialize_rl_mft(voi * The mft mirror is either 4kb (the first four records) or one cluster * in size, which ever is bigger. In either case, it contains a * byte-for-byte identical copy of the beginning of the mft (i.e. either - * ther first four records (4kb) or the first cluster worth of records, + * the first four records (4kb) or the first cluster worth of records, * whichever is bigger). */ j = (4 * vol->mft_record_size + vol->cluster_size - 1) / vol->cluster_size; @@ -3731,7 +3731,7 @@ int main(int argc, char **argv) mkntfs_initialize_bitmaps(); /* Initialize MFT & set opts.logfile_lcn. */ mkntfs_initialize_rl_mft(); - /* Initlialize $LogFile. */ + /* Initialise $LogFile. */ mkntfs_initialize_rl_logfile(); /* Initialize $Boot. */ mkntfs_initialize_rl_boot(); Index: ntfscp.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- ntfscp.c 25 Jun 2005 16:37:50 -0000 1.23 +++ ntfscp.c 6 Jul 2005 22:47:19 -0000 1.24 @@ -163,7 +163,7 @@ static int parse_options (int argc, char attr = strtol(optarg, &s, 0); if (*s) { - Eprintf("Coudn't parse attribute.\n"); + Eprintf("Couldn't parse attribute.\n"); err++; } else opts.attribute = (ATTR_TYPES)attr; Index: ntfsdump_logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- ntfsdump_logfile.c 21 Jun 2005 09:57:22 -0000 1.27 +++ ntfsdump_logfile.c 6 Jul 2005 22:47:19 -0000 1.28 @@ -25,7 +25,7 @@ /* TODO: * - Remove the need for clipping at 64MiB. * - Add normal command line switchs (use getopt_long()). - * - For a volume: allow dumping only uncommited records. + * - For a volume: allow dumping only uncommitted records. * - For a file: get an optional command line parameter for the last SN. * - Sanity checks. */ Index: ntfsinfo.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -p -r1.65 -r1.66 --- ntfsinfo.c 19 Jun 2005 21:09:41 -0000 1.65 +++ ntfsinfo.c 6 Jul 2005 22:47:19 -0000 1.66 @@ -204,7 +204,7 @@ static int parse_options (int argc, char opts.notime++; break; case 'T': - /* 'T' is depreceted, notify */ + /* 'T' is deprecated, notify */ Eprintf ("Option 'T' is deprecated, it was replaced by 't'.\n"); err++; break; @@ -287,7 +287,7 @@ static char *ntfsinfo_time_to_str(const /** * ntfs_attr_get_name() - * @attr: a vaild attribute record + * @attr: a valid attribute record * * return multi-byte string containing the attribute name if exist. the user * is then responsible of freeing that memory. @@ -569,7 +569,7 @@ static void ntfs_dump_attr_list(ATTR_REC printf("\tList name:\t\t '%s'\n",stream_name); free(stream_name); } else { - /* an error occured, errno holds the reason - notify the user */ + /* an error occurred, errno holds the reason - notify the user */ fprintf(stderr, "ntfsinfo error: could not parse stream name: %s\n", strerror(errno)); } @@ -617,7 +617,7 @@ static void ntfs_dump_attr_list(ATTR_REC for(;(u8 *)entry < (u8 *) value + l; entry = (ATTR_LIST_ENTRY *) ((u8 *) entry + le16_to_cpu(entry->length))) { printf("\n"); - printf("\t\tAtrribute type:\t0x%x\n", + printf("\t\tAttribute type:\t0x%x\n", (unsigned int)le32_to_cpu(entry->type)); printf("\t\tRecord length:\t%u\n", le16_to_cpu(entry->length)); @@ -675,7 +675,7 @@ static void ntfs_dump_attr_file_name(ATT printf("\tFile Name:\t\t '%s'\n", mbs_file_name); free(mbs_file_name); } else { - /* an error occured, errno holds the reason - notify the user */ + /* an error occurred, errno holds the reason - notify the user */ fprintf(stderr, "ntfsinfo error: could not parse file name: %s\n", strerror(errno)); } @@ -854,7 +854,7 @@ static void ntfs_dump_attr_security_desc data_size, sec_desc_attr); if (bytes_read != data_size) { Eprintf("ntfsinfo error: could not " - "read secutiry descriptor\n"); + "read security descriptor\n"); free(sec_desc_attr); return; } @@ -940,7 +940,7 @@ static void ntfs_dump_attr_volume_name(A printf("\tVolume Name:\t\t '%s'\n",mbs_vol_name); free(mbs_vol_name); } else { - /* an error occured, errno holds the reason - notify the user */ + /* an error occurred, errno holds the reason - notify the user */ fprintf(stderr,"ntfsinfo error: could not parse volume name: %s\n", strerror(errno)); } @@ -1011,7 +1011,7 @@ static void ntfs_dump_attr_data(ATTR_REC printf("\tStream name:\t\t '%s'\n",stream_name); free(stream_name); } else { - /* an error occured, errno holds the reason - notify the user */ + /* an error occurred, errno holds the reason - notify the user */ fprintf(stderr, "ntfsinfo error: could not parse stream name: %s\n", strerror(errno)); } @@ -1168,7 +1168,7 @@ static void ntfs_dump_attr_index_root(AT printf("\tIndex name:\t\t '%s'\n",index_name); free(index_name); } else { - /* an error occured, errno holds the reason - notify the user */ + /* an error occurred, errno holds the reason - notify the user */ fprintf(stderr, "ntfsinfo error: could not parse index name: %s\n", strerror(errno)); } @@ -1183,7 +1183,7 @@ static void ntfs_dump_attr_index_root(AT type = le32_to_cpu(index_root->type); if (type) { if (index_root->type != AT_FILE_NAME) { - /* wierd, this should be illgeal */ + /* weird, this should be illgeal */ printf("0x%0X\n", type); fprintf(stderr, "ntfsinfo error: Unknown Indexed Attr Type: 0x%0X\n", type); @@ -1375,7 +1375,7 @@ static void ntfs_dump_attr_index_allocat free(index_name); } else { /* - * An error occured, errno holds the reason - + * An error occurred, errno holds the reason - * notify the user */ fprintf(stderr, "ntfsinfo error: could not parse " @@ -1395,7 +1395,7 @@ static void ntfs_dump_attr_index_allocat printf("\tUsed data size:\t\t %llu\n", (unsigned long long)le64_to_cpu(attr->data_size)); } else { - Eprintf("Invalid $INDEX_ALLOCTION attribute. Should be be" + Eprintf("Invalid $INDEX_ALLOCATION attribute. Should be be" " non-resident\n"); } @@ -1420,7 +1420,7 @@ static void ntfs_dump_attr_bitmap(ATTR_R printf("\tBitmap name:\t\t '%s'\n",bitmap_name); free(bitmap_name); } else { - /* an error occured, errno holds the reason - notify the user */ + /* an error occurred, errno holds the reason - notify the user */ fprintf(stderr, "ntfsinfo error: could not parse bitmap name: %s\n", strerror(errno)); } @@ -1567,7 +1567,7 @@ static void ntfs_dump_attr_unknown(ATTR_ printf("\tAttribute name:\t '%s'\n",attr_name); free(attr_name); } else { - /* an error occured, errno holds the reason - notify the user */ + /* an error occurred, errno holds the reason - notify the user */ fprintf(stderr, "ntfsinfo error: could not parse attribute name: %s\n", strerror(errno)); } @@ -1666,7 +1666,7 @@ static void ntfs_dump_file_attributes(nt ntfs_attr_search_ctx *ctx = NULL; /* then start enumerating attributes - see ntfs_attr_lookup documentation for detailed explenation */ + see ntfs_attr_lookup documentation for detailed explanation */ ctx = ntfs_attr_get_search_ctx(inode, NULL); while (!ntfs_attr_lookup(AT_UNUSED, NULL, 0, 0, 0, NULL, 0, ctx)) { switch (ctx->attr->type) { Index: ntfsls.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- ntfsls.c 12 Jun 2005 18:12:56 -0000 1.22 +++ ntfsls.c 6 Jul 2005 22:47:19 -0000 1.23 @@ -447,7 +447,7 @@ static int readdir_recursive(ntfs_inode if (tofree) free_dir(tofree); - /* if at the outter-most readdir_recursive, then clean up */ + /* if at the outer-most readdir_recursive, then clean up */ if (ni_depth == 0) { free_dirs(&dirs.list); } @@ -575,7 +575,7 @@ static int list_dir_entry(ntfsls_dirent result = 0; release: - /* Release atrtibute search context and close the inode. */ + /* Release attribute search context and close the inode. */ if (ctx) ntfs_attr_put_search_ctx(ctx); if (ni) Index: ntfsmftalloc.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmftalloc.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- ntfsmftalloc.c 22 Dec 2004 14:04:41 -0000 1.4 +++ ntfsmftalloc.c 6 Jul 2005 22:47:19 -0000 1.5 @@ -84,7 +84,7 @@ static struct { } opts; /** - * mkDprintf - debugging output (-vv); overriden by quiet (-q) + * mkDprintf - debugging output (-vv); overridden by quiet (-q) */ static void mkDprintf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); @@ -152,7 +152,7 @@ static void copyright(void) } /** - * license - print licese statement + * license - print license statement */ static void license(void) { Index: ntfsmount.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- ntfsmount.c 5 Jul 2005 04:54:28 -0000 1.8 +++ ntfsmount.c 6 Jul 2005 22:47:19 -0000 1.9 @@ -204,8 +204,8 @@ static int ntfs_fuse_statfs(const char * * after use. * * Return values: - * <0 Error occured, return -errno; - * 0 No stream name, @*stream is not allocated and set to AT_UNMAMED. + * <0 Error occurred, return -errno; + * 0 No stream name, @*stream is not allocated and set to AT_UNNAMED. * >0 Stream name length in unicode characters. */ static int ntfs_fuse_parse_path(const char *org_path, char **path, Index: ntfsmove.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- ntfsmove.c 19 Jun 2005 21:09:41 -0000 1.12 +++ ntfsmove.c 6 Jul 2005 22:47:19 -0000 1.13 @@ -640,7 +640,7 @@ static s64 move_runlist (ntfs_volume *vo // got to get the runlist out of this function // requires a mrec arg, not an ino (ino->mrec will do for now) -// check size of new runlist before allocting / moving +// check size of new runlist before allocating / moving // replace one datarun with another (by hand) static s64 move_datarun (ntfs_volume *vol, ntfs_inode *ino, ATTR_RECORD *rec, runlist_element *run, u64 loc, int flags) Index: ntfsresize.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- ntfsresize.c 3 Jul 2005 23:21:01 -0000 1.69 +++ ntfsresize.c 6 Jul 2005 22:47:19 -0000 1.70 @@ -1049,7 +1049,7 @@ close_inode: return 0; } -static void build_resize_constrains(ntfs_resize_t *resize) +static void build_resize_constraints(ntfs_resize_t *resize) { s64 i; runlist *rl; @@ -1073,7 +1073,7 @@ static void build_resize_constrains(ntfs free(rl); } -static void resize_constrains_by_attributes(ntfs_resize_t *resize) +static void resize_constraints_by_attributes(ntfs_resize_t *resize) { if (!(resize->ctx = attr_get_search_ctx(resize->ni, NULL))) exit(1); @@ -1081,18 +1081,18 @@ static void resize_constrains_by_attribu while (!ntfs_attrs_walk(resize->ctx)) { if (resize->ctx->attr->type == AT_END) break; - build_resize_constrains(resize); + build_resize_constraints(resize); } ntfs_attr_put_search_ctx(resize->ctx); } -static void set_resize_constrains(ntfs_resize_t *resize) +static void set_resize_constraints(ntfs_resize_t *resize) { s64 nr_mft_records, inode; ntfs_inode *ni; - printf("Collecting shrinkage constrains ...\n"); + printf("Collecting shrinkage constraints ...\n"); nr_mft_records = resize->vol->mft_na->initialized_size >> resize->vol->mft_record_size_bits; @@ -1110,7 +1110,7 @@ static void set_resize_constrains(ntfs_r goto close_inode; resize->ni = ni; - resize_constrains_by_attributes(resize); + resize_constraints_by_attributes(resize); close_inode: if (inode_close(ni) != 0) exit(1); @@ -1518,7 +1518,7 @@ static void rl_insert_at_run(runlist **r return; - /* FIXME: fastpath if ins_items = 1 */ + /* FIXME: fast path if ins_items = 1 */ // (*rl + run)->lcn = ins->lcn; } @@ -2293,7 +2293,7 @@ int main(int argc, char **argv) if (new_size < vol->nr_clusters) resize.shrink = 1; - set_resize_constrains(&resize); + set_resize_constraints(&resize); set_disk_usage_constraint(&resize); check_resize_constraints(&resize); Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- ntfsrm.c 23 Jun 2005 18:55:03 -0000 1.35 +++ ntfsrm.c 6 Jul 2005 22:47:19 -0000 1.36 @@ -1887,7 +1887,7 @@ static int ntfs_inode_close2 (ntfs_inode // unlink // ino->private_data - // XXX tempoarary until we have commit/rollback + // XXX temporary until we have commit/rollback NInoClearDirty(ni); return ntfs_inode_close (ni); @@ -4524,7 +4524,7 @@ static int ntfs_file_remove (ntfs_volume * successor. */ - // find the key nearest the root which has no descendents + // find the key nearest the root which has no descendants printf ("\n"); printf (BOLD YELLOW "Find childless parent:\n" END); for (par = del->parent, old = par; par; old = par, par = par->parent) { Index: ntfstruncate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- ntfstruncate.c 19 Jun 2005 21:09:41 -0000 1.25 +++ ntfstruncate.c 6 Jul 2005 22:47:19 -0000 1.26 @@ -93,7 +93,7 @@ struct { } opts; /** - * mkDprintf - debugging output (-vv); overriden by quiet (-q) + * mkDprintf - debugging output (-vv); overridden by quiet (-q) */ static void mkDprintf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); @@ -159,7 +159,7 @@ static void copyright(void) } /** - * license - print licese statement + * license - print license statement */ static void license(void) { Index: ntfsundelete.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- ntfsundelete.c 20 Jun 2005 14:31:59 -0000 1.40 +++ ntfsundelete.c 6 Jul 2005 22:47:20 -0000 1.41 @@ -716,7 +716,7 @@ static void free_file (struct ufile *fil * * Check that @rec is the parent of the file represented by @name. * If @rec is a directory, but it is created after @name, then we - * can't determine wheter @rec is really @name's parent. + * can't determine whether @rec is really @name's parent. * * Return: @rec's filename, either same name space as @name or lowest space. * NULL if can't determine parenthood or on error. Index: ntfsundelete.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- ntfsundelete.h 23 Aug 2004 22:54:51 -0000 1.11 +++ ntfsundelete.h 6 Jul 2005 22:47:20 -0000 1.12 @@ -91,7 +91,7 @@ struct data { long long size_init; /* Initialised size, may be less than data size */ long long size_vcn; /* Highest VCN in the data runs */ runlist_element *runlist; /* Decoded data runs */ - int percent; /* Amont potentially recoverable */ + int percent; /* Amount potentially recoverable */ void *data; /* If resident, a pointer to the data */ char padding[4]; /* Unused: padding to 64 bit. */ }; Index: ntfswipe.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- ntfswipe.c 19 Jun 2005 21:09:41 -0000 1.35 +++ ntfswipe.c 6 Jul 2005 22:47:20 -0000 1.36 @@ -352,7 +352,7 @@ static int parse_options (int argc, char * * Read $Bitmap and wipe any clusters that are marked as not in use. * - * Return: >0 Success, the atrribute was wiped + * Return: >0 Success, the attribute was wiped * 0 Nothing to wipe * -1 Error, something went wrong */ @@ -406,7 +406,7 @@ free: * @act: Wipe, test or info * @na: Opened ntfs attribute * - * Return: >0 Success, the atrribute was wiped + * Return: >0 Success, the attribute was wiped * 0 Nothing to wipe * -1 Error, something went wrong */ @@ -511,7 +511,7 @@ next: * @act: Wipe, test or info * @na: Opened ntfs attribute * - * Return: >0 Success, the atrribute was wiped + * Return: >0 Success, the attribute was wiped * 0 Nothing to wipe * -1 Error, something went wrong */ @@ -598,7 +598,7 @@ static s64 wipe_tails (ntfs_volume *vol, } if (!NAttrNonResident(na)) { - Vprintf ("Resident $DATA atrribute. Skipping.\n"); + Vprintf ("Resident $DATA attribute. Skipping.\n"); goto close_attr; } @@ -773,7 +773,7 @@ free: * @byte: Overwrite with this value * @act: Wipe, test or info * @naa: Opened ntfs $INDEX_ALLOCATION attribute - * @nab: Opened ntfs $BIMTAP attribute + * @nab: Opened ntfs $BITMAP attribute * @indx_record_size: Size of INDX record * * Return: >0 Success, the clusters were wiped @@ -1049,7 +1049,7 @@ close_inode: * @act: Wipe, test or info * * The logfile journals the metadata to give the volume fault-tolerance. If the - * volume is in a consistant state, then this information can be erased. + * volume is in a consistent state, then this information can be erased. * * Return: >0 Success, the clusters were wiped * 0 Nothing to wipe @@ -1197,7 +1197,7 @@ static s64 wipe_pagefile (ntfs_volume *v goto io_error_exit; } - /* Get length of pagfile.sys contents. */ + /* Get length of pagefile.sys contents. */ len = na->data_size; if (!len) { Dprintf("pagefile.sys has zero length, no disk write needed.\n"); Index: sd.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/sd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sd.c 19 Jun 2005 21:09:42 -0000 1.6 +++ sd.c 6 Jul 2005 22:47:20 -0000 1.7 @@ -4,7 +4,7 @@ /** * init_system_file_sd * - * NTFS 1.2 - System files security decriptors + * NTFS 1.2 - System files security descriptors * =========================================== * * Create the security descriptor for system file number @sys_file_no and @@ -15,14 +15,14 @@ * * $Volume, $Quota, and system files 0xb-0xf are the same. They are almost the * same as the above, the only difference being that the two SIDs present in - * the DACL grant GENERIC_WRITE and GENERIC_READ equivalent priviledges while - * the above only grant GENERIC_READ equivalent priviledges. (For some reason + * the DACL grant GENERIC_WRITE and GENERIC_READ equivalent privileges while + * the above only grant GENERIC_READ equivalent privileges. (For some reason * the flags for GENERIC_READ/GENERIC_WRITE are not set by NT4, even though * the permissions are equivalent, so we comply. * * Root directory system file (".") is different altogether. * - * The sd is recturned in *@sd_val and has length *@sd_val_len. + * The sd is returned in *@sd_val and has length *@sd_val_len. * * Do NOT free *@sd_val as it is static memory. This also means that you can * only use *@sd_val until the next call to this function. |
|
From: Szakacsits S. <sz...@si...> - 2005-07-07 18:04:20
|
Hi,
On Wed, 6 Jul 2005, Richard Russon wrote:
> - printf("Collecting shrinkage constrains ...\n");
> + printf("Collecting shrinkage constraints ...\n");
I've been annoyed by these 'constrains' unconsciously for two years but
never realized the misspellings. They always looked just wrong. Thanks! :-)
Cheers,
Szaka
|
|
From: Richard R. <nt...@fl...> - 2005-07-07 22:21:03
|
Hi Szaka,
> > - printf("Collecting shrinkage constrains ...\n");
> > + printf("Collecting shrinkage constraints ...\n");
>
> They always looked just wrong.
hehe, never underestimate the power of a drunkard with ispell!
Rich.
|
