You can subscribe to this list here.
| 2001 |
Jan
(38) |
Feb
(25) |
Mar
(37) |
Apr
(50) |
May
|
Jun
(156) |
Jul
(174) |
Aug
(94) |
Sep
(107) |
Oct
(18) |
Nov
(153) |
Dec
(91) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(79) |
Feb
(117) |
Mar
(39) |
Apr
(164) |
May
(12) |
Jun
(64) |
Jul
(138) |
Aug
(43) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(17) |
Jun
(100) |
Jul
(210) |
Aug
(127) |
Sep
(89) |
Oct
(214) |
Nov
(176) |
Dec
(20) |
| 2006 |
Jan
(29) |
Feb
(85) |
Mar
(45) |
Apr
(54) |
May
(9) |
Jun
(7) |
Jul
(28) |
Aug
(65) |
Sep
(3) |
Oct
(62) |
Nov
(68) |
Dec
(52) |
| 2007 |
Jan
(6) |
Feb
|
Mar
(8) |
Apr
|
May
|
Jun
(2) |
Jul
(4) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Szakacsits S. <sz...@si...> - 2005-06-23 23:07:33
|
On Thu, 23 Jun 2005, Yura Pakhuchiy wrote: > On Wed, 2005-06-22 at 01:17 +0300, Szakacsits Szabolcs wrote: >> BTW, printf isn't signal-safe, it can't be used in signal handlers. > > I'm sorry, but can you explain this problem more detailer? I read signal > man page and found nothing about it. 'man 2 signal' and see the NOTES section. Better, advanced Unix programming books explain signal handling related typical problems but google could help too, e.g. these pages look excellent: http://www.slamb.org/projects/sigsafe/api/patternref.html Szaka |
|
From: Richard R. <fl...@us...> - 2005-06-23 18:55:16
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29556/ntfsprogs Modified Files: ntfsrm.c Log Message: ntfsrm: fix a couple of crashes slightly simplify bitmap logic wasn't using mst pwrite for INDX rm works again bmp commit was overwriting end of attr strip down bitmap set bitmaps: handle cluster boundaries correctly overhaul the bitmap code ntfs_binary_print Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- ntfsrm.c 21 Jun 2005 09:57:22 -0000 1.34 +++ ntfsrm.c 23 Jun 2005 18:55:03 -0000 1.35 @@ -1,8 +1,7 @@ /** * ntfsrm - Part of the Linux-NTFS project. * - * Copyright (c) 2004 Richard Russon - * Copyright (c) 2005 Anton Altaparmakov + * Copyright (c) 2004-2005 Richard Russon * * This utility will delete files from an NTFS volume. * @@ -22,7 +21,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include <stdio.h> #include <getopt.h> #include <stdlib.h> @@ -44,7 +42,7 @@ GEN_PRINTF (Eprintf, stderr, NULL, GEN_PRINTF (Vprintf, stdout, &opts.verbose, TRUE) GEN_PRINTF (Qprintf, stdout, &opts.quiet, FALSE) -//#define RM_WRITE 1 +#define RM_WRITE 1 static int ntfs_inode_close2 (ntfs_inode *ni); @@ -252,6 +250,29 @@ static void ntfs_dt_print (struct ntfs_d } /** + * ntfs_binary_print + */ +static void ntfs_binary_print (u8 num, BOOL backwards, BOOL colour) +{ + int i; + + if (backwards) + for (i = 1; i < 129; i<<=1) { + if (colour) + printf ("%s", (num&i) ? "[31m1[0m" : "0"); + else + printf ("%s", (num&i) ? "1" : "0"); + } + else + for (i = 128; i > 0; i>>=1) { + if (colour) + printf ("%s", (num&i) ? "[31m1[0m" : "0"); + else + printf ("%s", (num&i) ? "1" : "0"); + } +} + +/** * ntfsinfo_time_to_str */ static const char *ntfsinfo_time_to_str(const s64 sle_ntfs_clock) @@ -271,6 +292,7 @@ static int ntfs_bmp_commit (struct ntfs_ { int i; u32 cs; + u32 ws; // write size if (!bmp) return 0; @@ -283,24 +305,27 @@ static int ntfs_bmp_commit (struct ntfs_ cs = bmp->vol->cluster_size; - printf ("commit bmp 0x%02X (%sresident)\n", bmp->attr->type, bmp->attr->rl ? "non-" : ""); + printf ("commit bmp inode %lld, 0x%02X (%sresident)\n", bmp->attr->ni->mft_no, bmp->attr->type, NAttrNonResident (bmp->attr) ? "non-" : ""); - if (bmp->attr->rl) { + if (NAttrNonResident (bmp->attr)) { // non-resident for (i = 0; i < bmp->count; i++) { #ifdef RM_WRITE - ntfs_attr_pwrite (bmp->attr, bmp->data_vcn[i] * cs, cs, bmp->data[i]); // XXX retval -#else - printf (RED "\tntfs_attr_pwrite (vcn %lld)\n" END, bmp->data_vcn[i]); + if (((bmp->data_vcn[i]+1) * cs) < bmp->attr->data_size) + ws = cs; + else + ws = bmp->attr->data_size & (cs - 1); + //printf ("writing %d bytes\n", ws); + ntfs_attr_pwrite (bmp->attr, bmp->data_vcn[i] * cs, ws, bmp->data[i]); // XXX retval #endif + printf (RED "\tntfs_attr_pwrite (vcn %lld)\n" END, bmp->data_vcn[i]); } } else { // resident #ifdef RM_WRITE ntfs_attr_pwrite (bmp->attr, bmp->data_vcn[0], bmp->attr->data_size, bmp->data[0]); // XXX retval -#else - printf (RED "\tntfs_attr_pwrite resident\n" END); #endif + printf (RED "\tntfs_attr_pwrite resident (%lld)\n" END, bmp->attr->data_size); } for (i = 0; i < bmp->count; i++) @@ -452,7 +477,8 @@ static u8 * ntfs_bmp_get_data (struct nt return NULL; //printf ("loading from bitmap cluster %lld\n", vcn); - if (ntfs_attr_pread (bmp->attr, vcn, cs, buffer) < 0) { + //printf ("loading from bitmap byte %lld\n", vcn<<cb); + if (ntfs_attr_pread (bmp->attr, vcn<<cb, cs, buffer) < 0) { free (buffer); return NULL; } @@ -466,98 +492,66 @@ static u8 * ntfs_bmp_get_data (struct nt */ static int ntfs_bmp_set_range (struct ntfs_bmp *bmp, VCN vcn, s64 length, int value) { + // shouldn't all the vcns be lcns? s64 i; u8 *buffer; - VCN begin; - VCN end; - int start; - int finish; - u8 sta_part = 0; - u8 fin_part = 0; - int cs; - int cb; - VCN a; - VCN b; + int clust_size; + + int block_start, block_finish; // rename to c[sf] (rename to clust_) + int vcn_start, vcn_finish; // rename to v[sf] + int byte_start, byte_finish; // rename to b[sf] + u8 mask_start, mask_finish; // rename to m[sf] if (!bmp) return -1; - cs = bmp->vol->cluster_size; - cb = bmp->vol->cluster_size_bits; + if (value) + value = 0xFF; - //printf ("\n"); - //printf ("set range: %lld - %lld (%d)\n", vcn, vcn+length-1, cs<<3); + clust_size = bmp->vol->cluster_size; - a = ROUND_DOWN (vcn, cs<<3); - b = ROUND_UP (vcn + length -1, cs<<3); - //printf ("vcn = %lld\n", vcn); - //printf ("a = %lld\n", a >> (cb+3)); - //printf ("b = %lld\n", b >> (cb+3)); - //printf ("count = %lld\n", (b-a)/(cs<<3)); + vcn_start = vcn; + vcn_finish = vcn + length - 1; - for (i = a; i < b; i += (cs<<3)) { - buffer = ntfs_bmp_get_data (bmp, i); + for (i = vcn_start; i < ROUND_UP (vcn_finish, clust_size<<3); i += (clust_size<<3)) { + buffer = ntfs_bmp_get_data (bmp, ROUND_DOWN (i, clust_size<<3)); if (!buffer) return -1; -#if 0 - memset (buffer, 0xFF, cs); - value = 0; - memset (buffer, 0x00, cs); - value = 1; -#endif - //utils_dump_mem (buffer, 0, 32, DM_DEFAULTS); - //printf ("\n"); + block_start = ROUND_DOWN (i, clust_size<<3); + block_finish = block_start + (clust_size<<3) - 1; - begin = i; - end = begin + (cs<<3) - 1; - //printf ("begin = %lld, vcn = %lld,%lld end = %lld\n", begin, vcn, vcn+length-1, end); - - if ((vcn > begin) && (vcn < end)) { - start = ((vcn+8) >> 3) & (cs-1); - sta_part = 0xff << (vcn&7); - } else { - start = 0; - } + mask_start = (0xFF << (vcn_start & 7)); + mask_finish = (0xFF >> (7 - (vcn_finish & 7))); - if (((vcn+length-1) >= begin) && ((vcn+length-1) <= end)) { - finish = ((vcn+length-1) >> 3) & (cs-1); - fin_part = 0xff >> (7-((vcn+length-1)&7)); + if ((vcn_start >= block_start) && (vcn_start <= block_finish)) { + byte_start = (vcn_start - block_start) >> 3; } else { - finish = cs-1; + byte_start = 0; + mask_start = 0xFF; } -#if 0 - //printf ("\n"); - printf ("%lld) ", i>>12); - if (start > 0) { - printf ("(%02x) ", sta_part); + if ((vcn_finish >= block_start) && (vcn_finish <= block_finish)) { + byte_finish = (vcn_finish - block_start) >> 3; } else { - printf (" "); + byte_finish = clust_size - 1; + mask_finish = 0xFF; } - printf ("%d - %d", start, finish); - - if (finish < (cs-1)) { - printf (" (%02x)\n", fin_part); - } else { - printf (" \n"); + if ((byte_finish - byte_start) > 1) { + memset (buffer+byte_start+1, value, byte_finish-byte_start-1); + } else if (byte_finish == byte_start) { + mask_start &= mask_finish; + mask_finish = value; } -#endif + if (value) { - if (start != 0) - buffer[start-1] |= sta_part; - if ((finish - start) > 0) - memset (buffer+start, 0xff, finish-start); - buffer[finish] |= fin_part; + buffer[byte_start] |= mask_start; + buffer[byte_finish] |= mask_finish; } else { - if (start != 0) - buffer[start-1] &= ~sta_part; - if ((finish - start) > 0) - memset (buffer+start, 0x00, finish-start); - buffer[finish] &= ~fin_part; + buffer[byte_start] &= (~mask_start); + buffer[byte_finish] &= (~mask_finish); } - //utils_dump_mem (buffer, 0, 16, DM_DEFAULTS); } printf (GREEN "Modified: inode %lld, ", bmp->attr->ni->mft_no); @@ -910,7 +904,7 @@ static BOOL ntfs_dt_alloc_children2 (str dt->children = realloc (dt->children, new * sizeof (*dt->children)); dt->sub_nodes = realloc (dt->sub_nodes, new * sizeof (*dt->sub_nodes)); - dt->inodes = realloc (dt->sub_nodes, new * sizeof (*dt->inodes)); + dt->inodes = realloc (dt->inodes, new * sizeof (*dt->inodes)); // XXX wipe new space @@ -1075,10 +1069,10 @@ static int ntfs_dt_commit (struct ntfs_d } #ifdef RM_WRITE - ntfs_attr_pwrite (attr, dt->vcn * dt->dir->index_size, dt->dir->index_size, dt->data); -#else - printf (RED "\tntfs_attr_pwrite (vcn %lld)\n" END, dt->vcn); + //utils_dump_mem (dt->data, 0, 16, DM_DEFAULTS); + ntfs_attr_mst_pwrite(attr, dt->vcn * dt->dir->index_size, 1, dt->dir->index_size, dt->data); // XXX retval #endif + printf (RED "\tntfs_attr_pwrite (vcn %lld)\n" END, dt->vcn); dt->changed = FALSE; } @@ -1087,9 +1081,8 @@ static int ntfs_dt_commit (struct ntfs_d if ((dt->inodes[i]) && (NInoDirty (dt->inodes[i]))) { #ifdef RM_WRITE ntfs_inode_sync (dt->inodes[i]); -#else - printf (RED "\tntfs_inode_sync %llu\n" END, dt->inodes[i]->mft_no); #endif + printf (RED "\tntfs_inode_sync %llu\n" END, dt->inodes[i]->mft_no); } if (ntfs_dt_commit (dt->sub_nodes[i]) < 0) @@ -1200,6 +1193,7 @@ static struct ntfs_dt * ntfs_dt_alloc (s //printf ("%lld\n", ntfs_attr_pread (dir->iroot, 0, dt->data_len, dt->data)); ntfs_attr_pread (dir->iroot, 0, dt->data_len, dt->data); //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); + //printf ("\n"); ntfs_dt_count_root (dt); @@ -1914,9 +1908,8 @@ static int ntfs_dir_commit (struct ntfs_ if (NInoDirty (dir->inode)) { #ifdef RM_WRITE ntfs_inode_sync (dir->inode); -#else - printf (RED "\tntfs_inode_sync %llu\n" END, dir->inode->mft_no); #endif + printf (RED "\tntfs_inode_sync %llu\n" END, dir->inode->mft_no); } if (ntfs_dt_commit (dir->index) < 0) @@ -4277,8 +4270,7 @@ static int ntfs_index_dump_alloc (ntfs_a break; } printf ("%.*s", indent, space_line); - printf ("fill = %u/%u\n", (unsigned)block->index.index_length, - (unsigned)block->index.allocated_size); + printf ("fill = %u/%u\n", (unsigned)block->index.index_length, (unsigned)block->index.allocated_size); return 0; } @@ -4543,7 +4535,8 @@ static int ntfs_file_remove (ntfs_volume //utils_dump_mem (par->data, 0, par->data_len, DM_BLUE|DM_GREEN|DM_INDENT); - file = &par->children[par_num]->key.file_name; printf ("\tpar name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); + if (par) + file = &par->children[par_num]->key.file_name; printf ("\tpar name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); if (par == NULL) { // unhook everything @@ -4710,19 +4703,18 @@ static int ntfs_file_remove2 (ntfs_volum ino = dt->inodes[dt_num]; dir = dt->dir; - bmp_mft = (struct ntfs_bmp *) vol->private_bmp1; - bmp_vol = (struct ntfs_bmp *) vol->private_bmp2; + bmp_mft = vol->private_bmp1; + bmp_vol = vol->private_bmp2; - utils_mftrec_mark_free5 (ino, bmp_mft, ie->indexed_file); + if (1) utils_mftrec_mark_free5 (ino, bmp_mft, ie->indexed_file); - utils_free_non_residents2 (ino, bmp_vol); + if (1) utils_free_non_residents2 (ino, bmp_vol); - ntfs_file_remove (vol, dt, dt_num); + if (1) ntfs_file_remove (vol, dt, dt_num); // remove name from index - ntfs_dir_truncate (vol, dir); + if (0) ntfs_dir_truncate (vol, dir); - //commit volume - utils_volume_commit (vol); + if (1) utils_volume_commit (vol); if (0) utils_volume_rollback (vol); @@ -4816,8 +4808,10 @@ int main (int argc, char *argv[]) if (0) result = ntfs_test_bmp (vol, inode); done: - ntfs_inode_close2 (inode); - ntfs_umount2 (vol, FALSE); + if (1) ntfs_inode_close2 (inode); + if (1) ntfs_umount2 (vol, FALSE); + + if (0) ntfs_binary_print (0, FALSE, FALSE); return result; } |
|
From: Yura P. <pak...@ip...> - 2005-06-22 23:38:32
|
On Wed, 2005-06-22 at 01:17 +0300, Szakacsits Szabolcs wrote:
> BTW, printf isn't signal-safe, it can't be used in signal handlers.
I'm sorry, but can you explain this problem more detailer? I read signal
man page and found nothing about it.
--
Best regards,
Yura
|
|
From: Szakacsits S. <sz...@si...> - 2005-06-21 22:18:09
|
On Tue, 21 Jun 2005, Yura Pakhuchiy wrote: > > I thought this patch was quite small and obvious. The length and complexity of the patches are irrelevant from the log message's point of view. Expressive log messages help readers better understand what's going on in the project even without looking or understanding the relevant code and also help peer developers to revise the patches. > OK, fixed message will look like: "ntfscp: SIGINT was handled, > but printf was about SIGTERM. Now handle both and print respective > message." Wonderful! :-) BTW, printf isn't signal-safe, it can't be used in signal handlers. Szaka |
|
From: Anton A. <ai...@ca...> - 2005-06-21 20:36:15
|
On Tue, 21 Jun 2005, Yura Pakhuchiy wrote: > On Tue, 2005-06-21 at 22:12 +0300, Szakacsits Szabolcs wrote: > > On Tue, 21 Jun 2005, Yura Pakhuchiy wrote: > > > Log Message: > > > ntfscp: Fix signal handling. > > > > [ ... once earlier .... ] > > > > > Update attribute definition handling. > > > > Please include in the log message what _exactly_ you fix, update. In itself > > these messages don't have really useful information. Additionally it's much > > easier and faster to check changes if we know what one really intend to fix > > or update. > > I thought this patch was quite small and obvious. If no, sorry, anyway I > didn't think that somebody watching for changes to ntfscp. OK, fixed > message will look like: "ntfscp: SIGINT was handled, but printf was > about SIGTERM. Now handle both and print respective message." > > About "Update attribute definition handling.": this commit was ported > from kernel driver, and commit message I cut-n-pasted from Anton's > commit message. Yes, my commit messages are not always very good. Sorry about that. )-: Best regards, Anton -- Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net WWW: http://linux-ntfs.sf.net/ & http://www-stu.christs.cam.ac.uk/~aia21/ |
|
From: Yura P. <pak...@ip...> - 2005-06-21 19:31:56
|
On Tue, 2005-06-21 at 22:12 +0300, Szakacsits Szabolcs wrote:
> On Tue, 21 Jun 2005, Yura Pakhuchiy wrote:
>
> > Log Message:
> > ntfscp: Fix signal handling.
>
> [ ... once earlier .... ]
>
> > Update attribute definition handling.
>
> Please include in the log message what _exactly_ you fix, update. In itself
> these messages don't have really useful information. Additionally it's much
> easier and faster to check changes if we know what one really intend to fix
> or update.
I thought this patch was quite small and obvious. If no, sorry, anyway I
didn't think that somebody watching for changes to ntfscp. OK, fixed
message will look like: "ntfscp: SIGINT was handled, but printf was
about SIGTERM. Now handle both and print respective message."
About "Update attribute definition handling.": this commit was ported
from kernel driver, and commit message I cut-n-pasted from Anton's
commit message.
--
Best regards,
Yura
|
|
From: Szakacsits S. <sz...@si...> - 2005-06-21 19:13:57
|
Hi, On Tue, 21 Jun 2005, Yura Pakhuchiy wrote: > Log Message: > ntfscp: Fix signal handling. [ ... once earlier .... ] > Update attribute definition handling. Please include in the log message what _exactly_ you fix, update. In itself these messages don't have really useful information. Additionally it's much easier and faster to check changes if we know what one really intend to fix or update. Thanks, Szaka |
|
From: Yura P. <cha...@us...> - 2005-06-21 18:54:26
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30226/ntfsprogs Modified Files: ntfscp.c Log Message: ntfscp: Fix signal handling. Index: ntfscp.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- ntfscp.c 20 Jun 2005 14:31:59 -0000 1.21 +++ ntfscp.c 21 Jun 2005 13:06:53 -0000 1.22 @@ -54,7 +54,7 @@ struct options { static const char *EXEC_NAME = "ntfscp"; static struct options opts; -static int caught_sigint = 0; +static int caught_terminate = 0; GEN_PRINTF (Eprintf, stderr, NULL, FALSE) GEN_PRINTF (Vprintf, stderr, &opts.verbose, TRUE) @@ -235,17 +235,18 @@ static int parse_options (int argc, char } /** - * sigint_handler - Handle SIGINT: abort write, sync and exit. + * signal_handler - Handle SIGINT and SIGTERM: abort write, sync and exit. */ -static void sigint_handler(int arg __attribute__((unused))) +static void signal_handler(int arg) { - caught_sigint++; - if (caught_sigint > 3) { - Eprintf("SIGTERM received more than 3 times. " + caught_terminate++; + if (caught_terminate > 3) { + Eprintf("SIGTERM or SIGINT received more than 3 times. " "Exit immediately.\n"); exit(2); } else - Eprintf("SIGTERM received. Aborting write.\n"); + Eprintf("%s received. Aborting write.\n", + (arg == SIGINT) ? "SIGINT" : "SIGTERM"); } /** @@ -277,10 +278,15 @@ int main (int argc, char *argv[]) utils_set_locale(); /* Set SIGINT handler. */ - if (signal(SIGINT, sigint_handler) == SIG_ERR) { + if (signal(SIGINT, signal_handler) == SIG_ERR) { perror("Failed to set SIGINT handler"); return 1; } + /* Set SIGTERM handler. */ + if (signal(SIGTERM, signal_handler) == SIG_ERR) { + perror("Failed to set SIGTERM handler"); + return 1; + } if (opts.noaction) flags = MS_RDONLY; @@ -401,7 +407,7 @@ int main (int argc, char *argv[]) Vprintf("Starting write.\n"); offset = 0; - while (!feof(in) && !caught_sigint) { + while (!feof(in) && !caught_terminate) { br = fread(buf, 1, NTFS_BUF_SIZE, in); if (!br) { if (!feof(in)) perror("ERROR: fread failed"); |
|
From: Anton A. <an...@us...> - 2005-06-21 09:57:48
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27248 Modified Files: ntfsdump_logfile.c ntfsrm.c Log Message: Fix compiler warnings under cygwin. Index: ntfsdump_logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- ntfsdump_logfile.c 19 Jun 2005 21:09:41 -0000 1.26 +++ ntfsdump_logfile.c 21 Jun 2005 09:57:22 -0000 1.27 @@ -1,7 +1,7 @@ /** * ntfsdump_logfile - Part of the Linux-NTFS project. * - * Copyright (c) 2000-2004 Anton Altaparmakov + * Copyright (c) 2000-2005 Anton Altaparmakov * * This utility will interpret the contents of the journal ($LogFile) of an * NTFS partition and display the results on stdout. Errors will be output to @@ -387,8 +387,8 @@ static void dump_restart_areas_area(REST le16_to_cpu(ra->log_page_data_offset), le16_to_cpu(ra->log_page_data_offset)); printf("restart_log_open_count = %u (0x%x)\n", - le32_to_cpu(ra->restart_log_open_count), - le32_to_cpu(ra->restart_log_open_count)); + (unsigned)le32_to_cpu(ra->restart_log_open_count), + (unsigned)le32_to_cpu(ra->restart_log_open_count)); lcr = (LOG_CLIENT_RECORD*)((u8*)ra + le16_to_cpu(ra->client_array_offset)); for (client = 0; client < le16_to_cpu(ra->log_clients); client++) { Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- ntfsrm.c 19 Jun 2005 21:09:41 -0000 1.33 +++ ntfsrm.c 21 Jun 2005 09:57:22 -0000 1.34 @@ -2,6 +2,7 @@ * ntfsrm - Part of the Linux-NTFS project. * * Copyright (c) 2004 Richard Russon + * Copyright (c) 2005 Anton Altaparmakov * * This utility will delete files from an NTFS volume. * @@ -4276,7 +4277,8 @@ static int ntfs_index_dump_alloc (ntfs_a break; } printf ("%.*s", indent, space_line); - printf ("fill = %u/%u\n", block->index.index_length, block->index.allocated_size); + printf ("fill = %u/%u\n", (unsigned)block->index.index_length, + (unsigned)block->index.allocated_size); return 0; } |
|
From: Anton A. <an...@us...> - 2005-06-21 09:55:25
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26832 Modified Files: attrib.c bootsect.c compress.c dir.c index.c runlist.c Log Message: Fix compiler warnings in libntfs when compiling under cygwin. Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.163 retrieving revision 1.164 diff -u -p -r1.163 -r1.164 --- attrib.c 20 Jun 2005 14:31:58 -0000 1.163 +++ attrib.c 21 Jun 2005 09:55:15 -0000 1.164 @@ -4033,8 +4033,9 @@ retry: */ if (finished_build) { Dprintf("%s(): Mark attr 0x%x for delete in inode " - "0x%llx.\n", __FUNCTION__, le32_to_cpu(a->type), - ctx->ntfs_ino->mft_no); + "0x%llx.\n", __FUNCTION__, + (unsigned)le32_to_cpu(a->type), + ctx->ntfs_ino->mft_no); a->highest_vcn = cpu_to_sle64(NTFS_VCN_DELETE_MARK); ntfs_inode_mark_dirty(ctx->ntfs_ino); continue; Index: bootsect.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bootsect.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- bootsect.c 18 Aug 2004 10:27:49 -0000 1.14 +++ bootsect.c 21 Jun 2005 09:55:15 -0000 1.15 @@ -1,7 +1,7 @@ /* * bootsect.c - Boot sector handling code. Part of the Linux-NTFS project. * - * Copyright (c) 2000-2004 Anton Altaparmakov + * Copyright (c) 2000-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -213,7 +213,7 @@ int ntfs_boot_sector_parse(ntfs_volume * * illegal, thus signed char is actually ok! */ c = bs->clusters_per_mft_record; - Dprintf("ClusterSize = 0x%x\n", vol->cluster_size); + Dprintf("ClusterSize = 0x%x\n", (unsigned)vol->cluster_size); Dprintf("ClusterSizeBits = %u\n", vol->cluster_size_bits); Dprintf("ClustersPerMftRecord = 0x%x\n", c); /* @@ -233,7 +233,7 @@ int ntfs_boot_sector_parse(ntfs_volume * return -1; } vol->mft_record_size_bits = ffs(vol->mft_record_size) - 1; - Dprintf("MftRecordSize = 0x%x\n", vol->mft_record_size); + Dprintf("MftRecordSize = 0x%x\n", (unsigned)vol->mft_record_size); Dprintf("MftRecordSizeBits = %u\n", vol->mft_record_size_bits); /* * Work out the size of the MFT mirror in number of mft records. If the Index: compress.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/compress.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- compress.c 11 May 2004 09:21:24 -0000 1.9 +++ compress.c 21 Jun 2005 09:55:15 -0000 1.10 @@ -2,7 +2,7 @@ * compress.c - Compressed attribute handling code. Part of the Linux-NTFS * project. * - * Copyright (c) 2004 Anton Altaparmakov + * Copyright (c) 2004-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -84,7 +84,7 @@ static int ntfs_decompress(u8 *dest, con u8 tag; /* Current tag. */ int token; /* Loop counter for the eight tokens in tag. */ - Dprintf("Entering, cb_size = 0x%x.\n", cb_size); + Dprintf("Entering, cb_size = 0x%x.\n", (unsigned)cb_size); do_next_sb: Dprintf("Beginning sub-block at offset = 0x%x in the cb.\n", cb - cb_start); Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- dir.c 12 Jun 2005 18:12:56 -0000 1.16 +++ dir.c 21 Jun 2005 09:55:15 -0000 1.17 @@ -1,7 +1,7 @@ /* * dir.c - Directory handling code. Part of the Linux-NTFS project. * - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -111,7 +111,8 @@ u64 ntfs_inode_lookup_by_name(ntfs_inode index_block_size = le32_to_cpu(ir->index_block_size); if (index_block_size < NTFS_BLOCK_SIZE || index_block_size & (index_block_size - 1)) { - Dprintf("Index block size %u is invalid.\n", index_block_size); + Dprintf("Index block size %u is invalid.\n", + (unsigned)index_block_size); goto put_err_out; } index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length); @@ -286,9 +287,9 @@ descend_into_child_node: Dprintf("Index buffer (VCN 0x%llx) of directory inode 0x%llx " "has a size (%u) differing from the directory " "specified size (%u).\n", (long long)vcn, - (unsigned long long)dir_ni->mft_no, + (unsigned long long)dir_ni->mft_no, (unsigned) le32_to_cpu(ia->index.allocated_size) + 0x18, - index_block_size); + (unsigned)index_block_size); errno = EIO; goto close_err_out; } @@ -806,7 +807,8 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64 index_block_size = le32_to_cpu(ir->index_block_size); if (index_block_size < NTFS_BLOCK_SIZE || index_block_size & (index_block_size - 1)) { - Dprintf("Index block size %u is invalid.\n", index_block_size); + Dprintf("Index block size %u is invalid.\n", + (unsigned)index_block_size); goto dir_err_out; } index_block_size_bits = ffs(index_block_size) - 1; @@ -963,9 +965,9 @@ find_next_index_buffer: "has a size (%u) differing from the directory " "specified size (%u).\n", (long long)ia_start >> index_vcn_size_bits, - (unsigned long long)dir_ni->mft_no, + (unsigned long long)dir_ni->mft_no, (unsigned) le32_to_cpu(ia->index.allocated_size) + 0x18, - index_block_size); + (unsigned)index_block_size); goto dir_err_out; } index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length); Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- index.c 19 Jun 2005 21:09:40 -0000 1.5 +++ index.c 21 Jun 2005 09:55:15 -0000 1.6 @@ -1,7 +1,7 @@ /* * index.c - NTFS index handling. Part of the Linux-NTFS project. * - * Copyright (c) 2004 Anton Altaparmakov + * Copyright (c) 2004-2005 Anton Altaparmakov * Copyright (c) 2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or @@ -172,7 +172,7 @@ int ntfs_index_lookup(const void *key, c cr = ir->collation_rule; if (!ntfs_is_collation_rule_supported(cr)) { ntfs_error(sb, "Index uses unsupported collation rule 0x%x. " - "Aborting lookup.", le32_to_cpu(cr)); + "Aborting lookup.", (unsigned)le32_to_cpu(cr)); err = EOPNOTSUPP; goto err_out; } @@ -295,9 +295,9 @@ descend_into_child_node: "a size (%u) differing from the index " "specified size (%u). Inode is corrupt or " "driver bug.", (unsigned long long)vcn, - ni->mft_no, + ni->mft_no, (unsigned) le32_to_cpu(ia->index.allocated_size) + 0x18, - ictx->block_size); + (unsigned)ictx->block_size); goto err_out; } index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length); Index: runlist.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- runlist.c 20 Jun 2005 14:23:50 -0000 1.50 +++ runlist.c 21 Jun 2005 09:55:15 -0000 1.51 @@ -1,7 +1,7 @@ /* * runlist.c - Run list handling code. Part of the Linux-NTFS project. * - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * Copyright (c) 2002 Richard Russon * Copyright (c) 2004 Yura Pakhuchiy * @@ -721,7 +721,7 @@ runlist_element *ntfs_mapping_pairs_deco u8 b; /* Current byte offset in buf. */ Dprintf("%s(): Entering for attr 0x%x.\n", __FUNCTION__, - le32_to_cpu(attr->type)); + (unsigned)le32_to_cpu(attr->type)); /* Make sure attr exists and is non-resident. */ if (!attr || !attr->non_resident || sle64_to_cpu(attr->lowest_vcn) < (VCN)0) { |
|
From: Anton A. <an...@us...> - 2005-06-20 14:44:54
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20901 Modified Files: TODO.include TODO.libntfs Log Message: Update todo files with usnjrnl stuff. Index: TODO.include =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/TODO.include,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- TODO.include 11 May 2004 09:21:24 -0000 1.4 +++ TODO.include 20 Jun 2005 14:44:45 -0000 1.5 @@ -2,6 +2,10 @@ Finish layout.h: in particular, add: - more about EFS and the EFS attribute. +Add usnjrnl.h: + +- describe the $UsnJrnl on disk structures + Finish logfile.h: in particular, add: - more about the $LogFile on disk structures Index: TODO.libntfs =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/TODO.libntfs,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- TODO.libntfs 4 Mar 2005 09:55:48 -0000 1.17 +++ TODO.libntfs 20 Jun 2005 14:44:45 -0000 1.18 @@ -19,6 +19,9 @@ - write ntfs_index_{rm_from,add_to,create,rm}() +- detect presence of usnjrnl and if present and mounting rw, re-stamp it (see + current ntfs wip driver) + ******************* * MEDIUM priority * ******************* |
|
From: Anton A. <an...@us...> - 2005-06-20 14:32:33
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11789/include/ntfs Modified Files: Makefile.in endians.h Log Message: Eeek. Someone did a commit just as I was about to commit so the commit message was lost! )-: Now again... Monster commit from me due to lack of time. Sorry about that. Features: - Version to 1.10.0 - Update readme, etc ready for release. - Update build system to suse linux 9.3 versions. - Fix warnings appearing for me on suse 9.3 with --enable-warnings --enable-debug. - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and fixup all callers apropriately. Thanks to FlatCap/Rich for pointing this out. - Determine endianness in ./configure and use that in addition to existing mechanisms for determining endianness. Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- Makefile.in 6 Jun 2005 14:31:42 -0000 1.20 +++ Makefile.in 20 Jun 2005 14:31:57 -0000 1.21 @@ -128,7 +128,6 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ Index: endians.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/endians.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- endians.h 19 Jun 2005 21:09:40 -0000 1.11 +++ endians.h 20 Jun 2005 14:31:57 -0000 1.12 @@ -2,7 +2,7 @@ * endians.h - Definitions related to handling of byte ordering. Part of the * Linux-NTFS project. * - * Copyright (c) 2000-2004 Anton Altaparmakov + * Copyright (c) 2000-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -65,11 +65,13 @@ # define __BYTE_ORDER __BYTE_ORDER__ # define __LITTLE_ENDIAN __LITTLE_ENDIAN__ # define __BIG_ENDIAN __BIG_ENDIAN__ -# elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) +# elif (defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)) || \ + defined(WORDS_LITTLEENDIAN) # define __BYTE_ORDER 1 # define __LITTLE_ENDIAN 1 # define __BIG_ENDIAN 0 -# elif !defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) +# elif (!defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)) || \ + defined(WORDS_BIGENDIAN) # define __BYTE_ORDER 0 # define __LITTLE_ENDIAN 1 # define __BIG_ENDIAN 0 |
|
From: Anton A. <an...@us...> - 2005-06-20 14:32:32
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11789/ntfsprogs Modified Files: Makefile.in ntfscp.c ntfsundelete.c utils.c Log Message: Eeek. Someone did a commit just as I was about to commit so the commit message was lost! )-: Now again... Monster commit from me due to lack of time. Sorry about that. Features: - Version to 1.10.0 - Update readme, etc ready for release. - Update build system to suse linux 9.3 versions. - Fix warnings appearing for me on suse 9.3 with --enable-warnings --enable-debug. - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and fixup all callers apropriately. Thanks to FlatCap/Rich for pointing this out. - Determine endianness in ./configure and use that in addition to existing mechanisms for determining endianness. Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- Makefile.in 6 Jun 2005 14:31:42 -0000 1.70 +++ Makefile.in 20 Jun 2005 14:31:59 -0000 1.71 @@ -225,7 +225,6 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ Index: ntfscp.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- ntfscp.c 19 Jun 2005 21:09:41 -0000 1.20 +++ ntfscp.c 20 Jun 2005 14:31:59 -0000 1.21 @@ -2,6 +2,7 @@ * ntfscp - Part of the Linux-NTFS project. * * Copyright (c) 2004-2005 Yura Pakhuchiy + * Copyright (c) 2005 Anton Altaparmakov * * This utility will overwrite files on ntfs volume * @@ -267,7 +268,7 @@ int main (int argc, char *argv[]) u64 offset; char *buf; s64 br, bw; - ntfschar *attr_name = NULL; + ntfschar *attr_name = AT_UNNAMED; int attr_name_len = 0; if (!parse_options(argc, argv)) Index: ntfsundelete.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- ntfsundelete.c 19 Jun 2005 21:09:41 -0000 1.39 +++ ntfsundelete.c 20 Jun 2005 14:31:59 -0000 1.40 @@ -3,6 +3,7 @@ * * Copyright (c) 2002-2005 Richard Russon * Copyright (c) 2004-2005 Holger Ohmacht + * Copyright (c) 2005 Anton Altaparmakov * * This utility will recover deleted files from an NTFS volume. * @@ -793,7 +794,7 @@ static void get_parent_name (struct file return; } - mft_data = ntfs_attr_open(vol->mft_ni, AT_DATA, NULL, 0); + mft_data = ntfs_attr_open(vol->mft_ni, AT_DATA, AT_UNNAMED, 0); if (!mft_data) { Eprintf ("ERROR: Couldn't open $MFT/$DATA: %s\n", strerror (errno)); } else { @@ -1025,7 +1026,7 @@ static struct ufile * read_record (ntfs_ return NULL; } - mft = ntfs_attr_open (vol->mft_ni, AT_DATA, NULL, 0); + mft = ntfs_attr_open (vol->mft_ni, AT_DATA, AT_UNNAMED, 0); if (!mft) { Eprintf ("ERROR: Couldn't open $MFT/$DATA: %s\n", strerror (errno)); free_file (file); @@ -1947,7 +1948,7 @@ static int copy_mft (ntfs_volume *vol, l return 1; } - mft = ntfs_attr_open (vol->mft_ni, AT_DATA, NULL, 0); + mft = ntfs_attr_open (vol->mft_ni, AT_DATA, AT_UNNAMED, 0); if (!mft) { Eprintf ("Couldn't open $MFT/$DATA: %s\n", strerror (errno)); goto free; Index: utils.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- utils.c 12 Jun 2005 18:12:56 -0000 1.34 +++ utils.c 20 Jun 2005 14:31:59 -0000 1.35 @@ -2,7 +2,7 @@ * utils.c - Part of the Linux-NTFS project. * * Copyright (c) 2002-2004 Richard Russon - * Copyright (c) 2003-2004 Anton Altaparmakov + * Copyright (c) 2003-2005 Anton Altaparmakov * Copyright (c) 2003 Lode Leroy * * A set of shared functions for ntfs utilities @@ -619,7 +619,7 @@ int utils_cluster_in_use (ntfs_volume *v /* Does lcn lie in the section of $Bitmap we already have cached? */ if ((lcn < bmplcn) || (lcn >= (bmplcn + (sizeof (buffer) << 3)))) { Dprintf ("Bit lies outside cache.\n"); - attr = ntfs_attr_open (vol->lcnbmp_ni, AT_DATA, NULL, 0); + attr = ntfs_attr_open (vol->lcnbmp_ni, AT_DATA, AT_UNNAMED, 0); if (!attr) { Eprintf ("Couldn't open $Bitmap: %s\n", strerror (errno)); return -1; @@ -967,7 +967,8 @@ int mft_next_record (struct mft_search_c return -1; } - mft = ntfs_attr_open (ctx->vol->mft_ni, AT_DATA, NULL, 0); + mft = ntfs_attr_open (ctx->vol->mft_ni, AT_DATA, + AT_UNNAMED, 0); if (!mft) { Eprintf ("Couldn't open $MFT/$DATA: %s\n", strerror (errno)); // free / close |
|
From: Anton A. <an...@us...> - 2005-06-20 14:32:31
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11789/doc Modified Files: Makefile.in Log Message: Eeek. Someone did a commit just as I was about to commit so the commit message was lost! )-: Now again... Monster commit from me due to lack of time. Sorry about that. Features: - Version to 1.10.0 - Update readme, etc ready for release. - Update build system to suse linux 9.3 versions. - Fix warnings appearing for me on suse 9.3 with --enable-warnings --enable-debug. - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and fixup all callers apropriately. Thanks to FlatCap/Rich for pointing this out. - Determine endianness in ./configure and use that in addition to existing mechanisms for determining endianness. Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/doc/Makefile.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- Makefile.in 6 Jun 2005 14:31:42 -0000 1.23 +++ Makefile.in 20 Jun 2005 14:31:49 -0000 1.24 @@ -115,7 +115,6 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ |
|
From: Anton A. <an...@us...> - 2005-06-20 14:32:31
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11789 Modified Files: AUTHORS ChangeLog Makefile.in NEWS README aclocal.m4 autogen.sh config.guess config.h.in config.sub configure configure.ac ltmain.sh Log Message: Eeek. Someone did a commit just as I was about to commit so the commit message was lost! )-: Now again... Monster commit from me due to lack of time. Sorry about that. Features: - Version to 1.10.0 - Update readme, etc ready for release. - Update build system to suse linux 9.3 versions. - Fix warnings appearing for me on suse 9.3 with --enable-warnings --enable-debug. - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and fixup all callers apropriately. Thanks to FlatCap/Rich for pointing this out. - Determine endianness in ./configure and use that in addition to existing mechanisms for determining endianness. Index: AUTHORS =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/AUTHORS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- AUTHORS 13 Jul 2004 13:01:42 -0000 1.11 +++ AUTHORS 20 Jun 2005 14:31:30 -0000 1.12 @@ -5,7 +5,6 @@ Current active developers on the project Anton Altaparmakov <ai...@ca...> Yuval Fledel (no email address on request) -Lode Leroy <lod...@ho...> -Leonard Norrgård <vi...@ni...> +Yura Pakhuchiy <pak...@gm...> Richard Russon <nt...@fl...> Szakacsits Szabolcs <sz...@si...> Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.229 retrieving revision 1.230 diff -u -p -r1.229 -r1.230 --- ChangeLog 12 Jun 2005 18:12:55 -0000 1.229 +++ ChangeLog 20 Jun 2005 14:31:30 -0000 1.230 @@ -1,4 +1,4 @@ -xx/xx/2005 - 2.0.0-WIP +20/06/2005 - 1.10.0 - Lots of new features, enhancements, and bug fixes. - Add start_vcn parameter to ntfs_get_size_for_mapping_pairs() and ntfs_mapping_pairs_build() and adapt all callers. @@ -162,6 +162,11 @@ xx/xx/2005 - 2.0.0-WIP - Move utils_pathname_to_inode from to library (dir.c), adapt it for the library, rename it to ntfs_pathname_to_inode, update all users. (Yura) + - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and + fixup all callers apropriately. Thanks to FlatCap/Rich for pointing + this out. (Anton) + - Determine endianness in ./configure and use that in addition to + existing mechanisms for determining endianness. (Anton) 04/09/2004 - 1.9.4 - Urgent bug fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/Makefile.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- Makefile.in 6 Jun 2005 14:31:37 -0000 1.30 +++ Makefile.in 20 Jun 2005 14:31:31 -0000 1.31 @@ -140,7 +140,6 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ Index: NEWS =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/NEWS,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- NEWS 6 Jun 2005 09:18:33 -0000 1.22 +++ NEWS 20 Jun 2005 14:31:39 -0000 1.23 @@ -9,7 +9,8 @@ Moved back from BitKeeper to CVS on SF.n ntfsprogs should now work completely on Windows 2000 and XP (Cygwin). mkntfs does not create bootable volumes when on Windows. Volumes are locked -when using a R/W utility in order to prevent data corruption. (Yuval Fledel) +when using a R/W utility in order to prevent data corruption. (Yuval Fledel, +Anton Altaparmakov) ntfsinfo has been extended and now provides much more detailed information as well as being able to resolve a path/filename instead of requiring the inode @@ -29,8 +30,7 @@ Linux. ntfsprogs ("make libs" only) now compiles on FreeBSD, NetBSD, Windows (Cygwin), and DOS (DJGPP). Thanks to Christophe Grenier for DOS and FreeBSD testing -and fixes and to Lode Leroy for Windows testing and fixes. Note, the Windows -version is read-only and has limited functionality at present. +and fixes and to Lode Leroy for Windows testing and fixes. Older news Index: README =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/README,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- README 19 May 2005 21:34:18 -0000 1.14 +++ README 20 Jun 2005 14:31:39 -0000 1.15 @@ -117,3 +117,5 @@ ntfsls - List information about files in partition. See man 8 ntfsls for details. ntfscat - Concatenate files and print their contents on the standard output. + +ntfscp - Overwrite files on an NTFS partition. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/aclocal.m4,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- aclocal.m4 6 Jun 2005 14:31:37 -0000 1.23 +++ aclocal.m4 20 Jun 2005 14:31:39 -0000 1.24 @@ -123,7 +123,7 @@ esac # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -191,7 +191,7 @@ if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi [...1071 lines suppressed...] + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. # Index: autogen.sh =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/autogen.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- autogen.sh 6 Jun 2005 14:31:39 -0000 1.8 +++ autogen.sh 20 Jun 2005 14:31:42 -0000 1.9 @@ -24,8 +24,8 @@ fi exit 1 } -echo Running autoreconf --verbose --install --warnings=all -autoreconf --force --verbose --install --warnings=all +echo Running autoreconf --verbose --install +autoreconf --force --verbose --install # This gets around the BitKeeper problem that it checks out files with the # current time stamp rather than the time stamp at check in time. Index: config.guess =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.guess,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- config.guess 6 Jun 2005 14:31:39 -0000 1.19 +++ config.guess 20 Jun 2005 14:31:42 -0000 1.20 @@ -136,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_MACHINE}" in + i?86) + test -z "$VENDOR" && VENDOR=pc + ;; + *) + test -z "$VENDOR" && VENDOR=unknown + ;; +esac +test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -825,25 +835,25 @@ EOF echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo cris-axis-linux exit 0 ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo crisv32-axis-linux exit 0 ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-${VENDOR}-linux exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build @@ -862,7 +872,7 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -881,13 +891,13 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-${VENDOR}-linux exit 0 ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-${VENDOR}-linux exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -900,34 +910,34 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-${VENDOR}-linux ;; + PA8*) echo hppa2.0-${VENDOR}-linux ;; + *) echo hppa-${VENDOR}-linux ;; esac exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-${VENDOR}-linux exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo x86_64-${VENDOR}-linux exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -942,18 +952,18 @@ EOF p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" + echo "${UNAME_MACHINE}-${VENDOR}-linuxaout" exit 0 ;; coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" + echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff" exit 0 ;; "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or + # Either a pre-BFD a.out linker (linuxoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld" exit 0 ;; esac # Determine whether the default compiler is a.out or elf @@ -982,7 +992,7 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) Index: config.h.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.h.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- config.h.in 6 Jun 2005 14:31:39 -0000 1.17 +++ config.h.in 20 Jun 2005 14:31:42 -0000 1.18 @@ -60,10 +60,6 @@ /* Define to 1 if you have the <locale.h> header file. */ #undef HAVE_LOCALE_H -/* Define to 1 if long double works and has more range or precision than - double. */ -#undef HAVE_LONG_DOUBLE - /* Define to 1 if you have the <machine/endian.h> header file. */ #undef HAVE_MACHINE_ENDIAN_H @@ -239,6 +235,14 @@ /* Version number of package */ #undef VERSION +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define to 1 if your processor stores words with the least significant byte + first (like Intel and VAX, unlike Motorola and SPARC). */ +#undef WORDS_LITTLEENDIAN + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS Index: config.sub =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.sub,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- config.sub 6 Jun 2005 14:31:39 -0000 1.19 +++ config.sub 20 Jun 2005 14:31:42 -0000 1.20 @@ -1172,7 +1172,7 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ @@ -1205,9 +1205,6 @@ case $os in -linux-dietlibc) os=-linux-dietlibc ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -sunos5*) os=`echo $os | sed -e 's|sunos5|solaris2|'` ;; Index: configure =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- configure 6 Jun 2005 14:31:39 -0000 1.80 +++ configure 20 Jun 2005 14:31:42 -0000 1.81 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for ntfsprogs 2.0.0-WIP. +# Generated by GNU Autoconf 2.59 for ntfsprogs 1.10.0. # # Report bugs to <lin...@li...>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ntfsprogs' PACKAGE_TARNAME='ntfsprogs' [...2510 lines suppressed...] generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23716,7 +23503,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ntfsprogs config.status 2.0.0-WIP +ntfsprogs config.status 1.10.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -24006,7 +23793,6 @@ s,@FFLAGS@,$FFLAGS,;t t s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@LIBNTFS_GNOMEVFS_CFLAGS@,$LIBNTFS_GNOMEVFS_CFLAGS,;t t s,@LIBNTFS_GNOMEVFS_LIBS@,$LIBNTFS_GNOMEVFS_LIBS,;t t s,@ENABLE_GNOME_VFS_TRUE@,$ENABLE_GNOME_VFS_TRUE,;t t Index: configure.ac =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- configure.ac 6 Jun 2005 14:31:42 -0000 1.57 +++ configure.ac 20 Jun 2005 14:31:47 -0000 1.58 @@ -2,7 +2,7 @@ # configure.ac - Source file to generate "./configure" to prepare package for # compilation. # -# Copyright (c) 2000-2004 Anton Altaparmakov +# Copyright (c) 2000-2005 Anton Altaparmakov # Copyright (c) 2003 Jan Kratochvil # # This program/include file is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ # AC_PREREQ(2.59) -AC_INIT([ntfsprogs],[2.0.0-WIP],[lin...@li...]) +AC_INIT([ntfsprogs],[1.10.0],[lin...@li...]) AC_CANONICAL_HOST([]) AC_CANONICAL_TARGET([]) AC_CONFIG_SRCDIR([config.h.in]) @@ -199,9 +199,13 @@ AC_CHECK_HEADERS([ctype.h fcntl.h libint # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL +AC_C_BIGENDIAN(, + [AC_DEFINE([WORDS_LITTLEENDIAN], 1, + [Define to 1 if your processor stores words with the least significant + byte first (like Intel and VAX, unlike Motorola and SPARC).])] + ,) AC_C_CONST AC_C_INLINE -AC_C_LONG_DOUBLE AC_TYPE_OFF_T AC_TYPE_SIZE_T AC_STRUCT_ST_BLOCKS Index: ltmain.sh =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ltmain.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ltmain.sh 6 Jun 2005 14:31:42 -0000 1.16 +++ ltmain.sh 20 Jun 2005 14:31:47 -0000 1.17 @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -43,8 +43,8 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.18 -TIMESTAMP=" (1.1220.2.246 2005/05/16 10:00:18)" +VERSION=1.5.14 +TIMESTAMP=" (1.1220.2.195 2005/02/12 12:12:33)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -112,9 +112,8 @@ if test "${LANG+set}" = set; then fi # Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" +: ${IFS=" +"} if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then $echo "$modename: not configured to build any kind of library" 1>&2 @@ -251,14 +250,37 @@ func_extract_an_archive () { f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" + f_ex_an_ar_lib=`$echo "X$f_ex_an_ar_oldlib" | $Xsed -e 's%^.*/%%'` $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $show "cp $f_ex_an_ar_oldlib $f_ex_an_ar_dir/$f_ex_an_ar_lib" + $run eval "cp \$f_ex_an_ar_oldlib \$f_ex_an_ar_dir/\$f_ex_an_ar_lib" + $AR t "$f_ex_an_ar_oldlib" | sort | uniq -c \ + | $EGREP -v '^[ ]*1[ ]' | while read count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$f_ex_an_ar_dir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_lib '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_lib '$name' && $mv '$name' '$name_to' && $AR -d \$f_ex_an_ar_lib '$name')" || exit $? + i=`expr $i + 1` + done + done + $show "$rm $f_ex_an_ar_dir/$f_ex_an_ar_lib" + $run eval "$rm \$f_ex_an_ar_dir/\$f_ex_an_ar_lib" fi } @@ -735,15 +757,6 @@ if test -z "$show_help"; then esac done - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") - qlibobj="\"$qlibobj\"" ;; - esac - if test "X$libobj" != "X$qlibobj"; then - $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - exit $EXIT_FAILURE - fi objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` if test "X$xdir" = "X$obj"; then @@ -816,17 +829,12 @@ compiler." $run $rm $removelist exit $EXIT_FAILURE fi - $echo "$srcfile" > "$lockfile" + $echo $srcfile > "$lockfile" fi if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") - qsrcfile="\"$qsrcfile\"" ;; - esac $run $rm "$libobj" "${libobj}T" @@ -848,10 +856,10 @@ EOF fbsd_hideous_sh_bug=$base_compile if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" else # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" fi if test ! -d "${xdir}$objdir"; then @@ -931,9 +939,9 @@ EOF if test "$build_old_libs" = yes; then if test "$pic_mode" != yes; then # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" else - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" fi if test "$compiler_c_o" = yes; then command="$command -o $obj" @@ -1357,8 +1365,6 @@ EOF ;; darwin_framework) compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" prev= continue ;; @@ -1423,8 +1429,6 @@ EOF -framework) prev=darwin_framework compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" continue ;; @@ -2848,13 +2852,13 @@ EOF *) continue ;; esac case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in *" $depdepl "*) ;; *) deplibs="$depdepl $deplibs" ;; esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$deplibs $path" ;; + esac done fi # link_all_deplibs != no fi # linkmode = lib @@ -3120,7 +3124,7 @@ EOF case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -3129,7 +3133,7 @@ EOF case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -3138,7 +3142,7 @@ EOF case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -4365,18 +4369,8 @@ extern \"C\" { export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "${SED} -e '1iEXPORTS'"' < "$export_symbols" > "$output_objdir/$outputname.def"' - ;; - esac else $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - case $host in - *cygwin* | *mingw* ) - $run eval "${SED} -e '1iEXPORTS'"' < "$output_objdir/$outputname.exp" > "$output_objdir/$outputname.def"' - ;; - esac $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi @@ -4499,25 +4493,12 @@ static const void *lt_preloaded_setup() $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. - #$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - #$run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" + $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" + $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - ;; - esac + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4546,9 +4527,8 @@ static const void *lt_preloaded_setup() # Delete the generated files. if test -n "$dlsyms"; then - #$show "$rm $output_objdir/${outputname}S.${objext}" - #$run $rm "$output_objdir/${outputname}S.${objext}" - : + $show "$rm $output_objdir/${outputname}S.${objext}" + $run $rm "$output_objdir/${outputname}S.${objext}" fi exit $status @@ -4691,9 +4671,8 @@ static const void *lt_preloaded_setup() esac case $host in *cygwin* | *mingw* ) - output_path=`dirname $output` - cwrappersource=`$echo ${output_path}/${objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output_path}/${outputname}.exe` + cwrappersource=`$echo ${objdir}/lt-${outputname}.c` + cwrapper=`$echo ${output}.exe` $rm $cwrappersource $cwrapper trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -4720,7 +4699,6 @@ EOF #include <malloc.h> #include <stdarg.h> #include <assert.h> -#include <sys/stat.h> #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4731,19 +4709,15 @@ EOF #endif #ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' +#define DIR_SEPARATOR '/' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif +#define HAVE_DOS_BASED_FILE_SYSTEM +#ifndef DIR_SEPARATOR_2 +#define DIR_SEPARATOR_2 '\\' +#endif #endif #ifndef DIR_SEPARATOR_2 @@ -4753,30 +4727,17 @@ EOF (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif - const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); char * basename (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); +char * fnqualify(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4787,8 +4748,6 @@ main (int argc, char *argv[]) int i; program_name = (char *) xstrdup ((char *) basename (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF @@ -4797,23 +4756,13 @@ EOF EOF cat >> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); + newargz[1] = fnqualify(argv[0]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; - - for (i=0; i<argc+1; i++) - { - DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); - ; - } - EOF cat >> $cwrappersource <<EOF @@ -4856,126 +4805,32 @@ basename (const char *name) base = name + 1; return (char *) base; } - -int -check_executable(const char * path) -{ - struct stat st; - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; - - if ((stat (path, &st) >= 0) && - (((st.st_mode & S_IXOTH) == S_IXOTH) || - ((st.st_mode & S_IXGRP) == S_IXGRP) || - ((st.st_mode & S_IXUSR) == S_IXUSR))) - return 1; - else - return 0; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ char * -find_executable (const char* wrapper) +fnqualify(const char *path) { - int has_slash = 0; - const char* p; - const char* p_next; - struct stat st; - /* static buffer for getcwd */ + size_t size; + char *p; char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; + assert(path != NULL); - /* Absolute path? */ + /* Is it qualified already? */ #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha (wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -} + if (isalpha (path[0]) && path[1] == ':') + return xstrdup (path); #endif + if (IS_DIR_SEPARATOR (path[0])) + return xstrdup (path); - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ + /* prepend the current directory */ + /* doesn't handle '~' */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; + size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ + p = XMALLOC(char, size); + sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); + return p; } char * @@ -5236,63 +5091,6 @@ fi\ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then cmds=$old_archive_from_new_cmds else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." - - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi - fi - - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - eval cmds=\"$old_archive_cmds\" if len=`expr "X$cmds" : ".*"` && @@ -5306,7 +5104,20 @@ fi\ objlist= concat_cmds= save_oldobjs=$oldobjs - + # GNU ar 2.10+ was changed to match POSIX; thus no paths are + # encoded into archives. This makes 'ar r' malfunction in + # this piecewise linking case whenever conflicting object + # names appear in distinct ar calls; check, warn and compensate. + if (for obj in $save_oldobjs + do + $echo "X$obj" | $Xsed -e 's%^.*/%%' + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 + $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 + AR_FLAGS=cq + fi # Is there a better way of finding the last object in the list? for obj in $save_oldobjs do @@ -6215,14 +6026,14 @@ relink_command=\"$relink_command\"" fi # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" + exec_cmd="\"\$cmd\"$args" else # Display what would be done. if test -n "$shlibpath_var"; then eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" $echo "export $shlibpath_var" fi - $echo "$cmd$args" + eval \$echo \"\$cmd\"$args exit $EXIT_SUCCESS fi ;; |
|
From: Anton A. <an...@us...> - 2005-06-20 14:32:09
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11789/libntfs Modified Files: Makefile.in attrib.c attrlist.c gnome-vfs-method.c inode.c logfile.c Log Message: Eeek. Someone did a commit just as I was about to commit so the commit message was lost! )-: Now again... Monster commit from me due to lack of time. Sorry about that. Features: - Version to 1.10.0 - Update readme, etc ready for release. - Update build system to suse linux 9.3 versions. - Fix warnings appearing for me on suse 9.3 with --enable-warnings --enable-debug. - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and fixup all callers apropriately. Thanks to FlatCap/Rich for pointing this out. - Determine endianness in ./configure and use that in addition to existing mechanisms for determining endianness. Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/Makefile.in,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- Makefile.in 6 Jun 2005 14:31:42 -0000 1.44 +++ Makefile.in 20 Jun 2005 14:31:58 -0000 1.45 @@ -190,7 +190,6 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.162 retrieving revision 1.163 diff -u -p -r1.162 -r1.163 --- attrib.c 20 Jun 2005 14:23:27 -0000 1.162 +++ attrib.c 20 Jun 2005 14:31:58 -0000 1.163 @@ -1,7 +1,7 @@ /* * attrib.c - Attribute handling code. Part of the Linux-NTFS project. * - * Copyright (c) 2000-2004 Anton Altaparmakov + * Copyright (c) 2000-2005 Anton Altaparmakov * Copyright (c) 2002 Richard Russon * Copyright (c) 2004-2005 Yura Pakhuchiy * @@ -252,13 +252,11 @@ static __inline__ void __ntfs_attr_init( na->rl = NULL; na->ni = ni; na->type = type; - if (name) { - na->name = name; + na->name = name; + if (name) na->name_len = name_len; - } else { - na->name = NULL; + else na->name_len = 0; - } } /** @@ -2693,8 +2691,8 @@ int ntfs_non_resident_attr_record_add(nt ntfs_inode_mark_dirty(ni); /* * Locate offset from start of the MFT record where new attribute is - * placed. We need relookup it, because record maybe moved during update - * of attribute list. + * placed. We need relookup it, because record maybe moved during + * update of attribute list. */ ntfs_attr_reinit_search_ctx(ctx); if (ntfs_attr_lookup(type, name, name_len, CASE_SENSITIVE, Index: attrlist.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrlist.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- attrlist.c 19 Jun 2005 21:09:40 -0000 1.23 +++ attrlist.c 20 Jun 2005 14:31:58 -0000 1.24 @@ -2,7 +2,7 @@ * attrlist.c - Attribute list attribute handling code. Part of the Linux-NTFS * project. * - * Copyright (c) 2004 Anton Altaparmakov + * Copyright (c) 2004-2005 Anton Altaparmakov * Copyright (c) 2004-2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or @@ -187,7 +187,7 @@ int ntfs_attrlist_entry_add(ntfs_inode * attr->name_length * sizeof(ntfschar)); /* Resize $ATTRIBUTE_LIST to new length. */ - na = ntfs_attr_open(ni, AT_ATTRIBUTE_LIST, NULL, 0); + na = ntfs_attr_open(ni, AT_ATTRIBUTE_LIST, AT_UNNAMED, 0); if (!na) { err = errno; Dprintf("%s(): Failed to open $ATTRIBUTE_LIST attribute.\n", @@ -272,7 +272,7 @@ int ntfs_attrlist_entry_rm(ntfs_attr_sea } /* Reisze $ATTRIBUTE_LIST to new length. */ - na = ntfs_attr_open(base_ni, AT_ATTRIBUTE_LIST, NULL, 0); + na = ntfs_attr_open(base_ni, AT_ATTRIBUTE_LIST, AT_UNNAMED, 0); if (!na) { err = errno; Dprintf("%s(): Failed to open $ATTRIBUTE_LIST attribute.\n", Index: gnome-vfs-method.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/gnome-vfs-method.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- gnome-vfs-method.c 19 Jun 2005 21:09:40 -0000 1.5 +++ gnome-vfs-method.c 20 Jun 2005 14:31:58 -0000 1.6 @@ -3,7 +3,7 @@ * libntfs. Part of the Linux-NTFS project. * * Copyright (c) 2003 Jan Kratochvil <pro...@ja...> - * Copyright (c) 2003 Anton Altaparmakov + * Copyright (c) 2003-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -393,8 +393,8 @@ static int libntfs_gnomevfs_read_directo attr = ntfs_attr_open(inode, /* ni */ AT_DATA, /* type */ - NULL, /* name */ - 0); /* name_len */ + AT_UNNAMED, /* name */ + 0); /* name_len */ /* FIXME: Check failed 'attr' open. */ if (attr) { /* FIXME: Is 'data_size' the right field? */ @@ -488,7 +488,7 @@ static GnomeVFSResult libntfs_open_attr( libntfs_file->attr = ntfs_attr_open( libntfs_file->inode, /* ni */ AT_DATA, /* type */ - NULL, /* name */ + AT_UNNAMED, /* name */ 0); /* name_len */ G_UNLOCK(libntfs); if (!libntfs_file->attr) Index: inode.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -p -r1.55 -r1.56 --- inode.c 19 Jun 2005 21:09:40 -0000 1.55 +++ inode.c 20 Jun 2005 14:31:58 -0000 1.56 @@ -1,7 +1,7 @@ /* * inode.c - Inode handling code. Part of the Linux-NTFS project. * - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * Copyright (c) 2004-2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or @@ -626,7 +626,7 @@ int ntfs_inode_sync(ntfs_inode *ni) NInoAttrListTestAndClearDirty(ni)) { ntfs_attr *na; - na = ntfs_attr_open(ni, AT_ATTRIBUTE_LIST, NULL, 0); + na = ntfs_attr_open(ni, AT_ATTRIBUTE_LIST, AT_UNNAMED, 0); if (!na) { if (!err || errno == EIO) { err = errno; @@ -845,7 +845,7 @@ int ntfs_inode_add_attrlist(ntfs_inode * } /* Resize it. */ - na = ntfs_attr_open(ni, AT_ATTRIBUTE_LIST, NULL, 0); + na = ntfs_attr_open(ni, AT_ATTRIBUTE_LIST, AT_UNNAMED, 0); if (!na) { err = errno; Dprintf("%s(): Failed to open just added $ATTRIBUTE_LIST.\n", Index: logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- logfile.c 19 Jun 2005 21:09:40 -0000 1.3 +++ logfile.c 20 Jun 2005 14:31:58 -0000 1.4 @@ -1,7 +1,7 @@ /* * logfile.c - NTFS journal handling. Part of the Linux-NTFS project. * - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * Copyright (c) 2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or @@ -162,7 +162,8 @@ static BOOL ntfs_check_restart_area(REST */ ca_ofs = le16_to_cpu(ra->client_array_offset); if (((ca_ofs + 7) & ~7) != ca_ofs || - ra_ofs + ca_ofs > NTFS_BLOCK_SIZE - sizeof(u16)) { + ra_ofs + ca_ofs > (u16)(NTFS_BLOCK_SIZE - + sizeof(u16))) { ntfs_error(vi->i_sb, "$LogFile restart area specifies " "inconsistent client array offset."); return FALSE; @@ -174,8 +175,8 @@ static BOOL ntfs_check_restart_area(REST */ ra_len = ca_ofs + le16_to_cpu(ra->log_clients) * sizeof(LOG_CLIENT_RECORD); - if (ra_ofs + ra_len > le32_to_cpu(rp->system_page_size) || - ra_ofs + le16_to_cpu(ra->restart_area_length) > + if ((u32)(ra_ofs + ra_len) > le32_to_cpu(rp->system_page_size) || + (u32)(ra_ofs + le16_to_cpu(ra->restart_area_length)) > le32_to_cpu(rp->system_page_size) || ra_len > le16_to_cpu(ra->restart_area_length)) { ntfs_error(vi->i_sb, "$LogFile restart area is out of bounds " |
|
From: Anton A. <an...@us...> - 2005-06-20 14:32:07
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11789/include Modified Files: Makefile.in Log Message: Eeek. Someone did a commit just as I was about to commit so the commit message was lost! )-: Now again... Monster commit from me due to lack of time. Sorry about that. Features: - Version to 1.10.0 - Update readme, etc ready for release. - Update build system to suse linux 9.3 versions. - Fix warnings appearing for me on suse 9.3 with --enable-warnings --enable-debug. - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and fixup all callers apropriately. Thanks to FlatCap/Rich for pointing this out. - Determine endianness in ./configure and use that in addition to existing mechanisms for determining endianness. Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/Makefile.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- Makefile.in 6 Jun 2005 14:31:42 -0000 1.29 +++ Makefile.in 20 Jun 2005 14:31:49 -0000 1.30 @@ -124,7 +124,6 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ |
|
From: Richard R. <fl...@us...> - 2005-06-20 14:25:02
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9664/ntfsprogs Modified Files: ntfscat.c ntfscat.8.in Log Message: ntfscat now works with attribute names ntfscat now removes fixup from: $MFT/$DATA $MFTMirr/$DATA anydir/$INDEX_ALLOCATION Index: ntfscat.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- ntfscat.c 19 Jun 2005 21:09:41 -0000 1.15 +++ ntfscat.c 20 Jun 2005 14:24:53 -0000 1.16 @@ -1,8 +1,8 @@ /** * ntfscat - Part of the Linux-NTFS project. * - * Copyright (c) 2003 Richard Russon - * Copyright (c) 2003 Anton Altaparmakov + * Copyright (c) 2003-2005 Richard Russon + * Copyright (c) 2003 Anton Altaparmakov * * This utility will concatenate files and print on the standard output. * @@ -70,7 +70,7 @@ static void version (void) static void usage (void) { Printf ("\nUsage: %s [options] device [file]\n\n" - " -a, --attribute num Display this attribute\n" + " -a, --attribute desc Display this attribute (name or number)\n" " -i, --inode num Display this inode\n\n" " -f --force Use less caution\n" " -h --help Print this help\n" @@ -85,6 +85,60 @@ static void usage (void) } /** + * parse_attribute - Read an attribute name, or number + * @value: String to be parsed + * @attr: Resulting attribute id (on success) + * + * Read a string representing an attribute. It may be a decimal, octal or + * hexadecimal number, or the attribute name in full. The leading $ sign is + * optional. + * + * Return: 1 Success, a valid attribute name or number + * 0 Error, not an attribute name or number + */ +static int parse_attribute (const char *value, ATTR_TYPES *attr) +{ + static const char *attr_name[] = { + "$STANDARD_INFORMATION", + "$ATTRIBUTE_LIST", + "$FILE_NAME", + "$OBJECT_ID", + "$SECURITY_DESCRIPTOR", + "$VOLUME_NAME", + "$VOLUME_INFORMATION", + "$DATA", + "$INDEX_ROOT", + "$INDEX_ALLOCATION", + "$BITMAP", + "$REPARSE_POINT", + "$EA_INFORMATION", + "$EA", + "$PROPERTY_SET", + "$LOGGED_UTILITY_STREAM", + NULL + }; + + int i; + long num; + + for (i = 0; attr_name[i]; i++) { + if ((strcmp (value, attr_name[i]) == 0) || + (strcmp (value, attr_name[i]+1) == 0)) { + *attr = (ATTR_TYPES) ((i+1)*16); + return 1; + } + } + + num = strtol (value, NULL, 0); + if ((num > 0) && (num < 257)) { + *attr = (ATTR_TYPES) num; + return 1; + } + + return 0; +} + +/** * parse_options - Read and validate the programs command line * * Read the command line, verify the syntax and parse the options. @@ -113,7 +167,7 @@ static int parse_options (int argc, char int err = 0; int ver = 0; int help = 0; - s64 attr; + ATTR_TYPES attr = AT_UNUSED; opterr = 0; /* We'll handle the errors, thank you. */ @@ -133,16 +187,16 @@ static int parse_options (int argc, char } break; case 'a': - if (opts.attr != (ATTR_TYPES)-1) + if (opts.attr != (ATTR_TYPES)-1) { Eprintf("You must specify exactly one attribute.\n"); - else if (utils_parse_size(optarg, &attr, FALSE)) { - opts.attr = (ATTR_TYPES)attr; + } else if (parse_attribute (optarg, &attr) > 0) { + opts.attr = attr; break; - } else - Eprintf("Couldn't parse attribute number.\n"); + } else { + Eprintf("Couldn't parse attribute.\n"); + } err++; break; - case 'f': opts.force++; break; @@ -208,18 +262,41 @@ static int parse_options (int argc, char } /** + * index_get_size - Find the INDX block size from the index root + * @inode: Inode of the directory to be checked + * + * Find the size of a directory's INDX block from the INDEX_ROOT attribute. + * + * Return: n Success, the INDX blocks are n bytes in size + * 0 Error, not a directory + */ +static int index_get_size (ntfs_inode *inode) +{ + ATTR_RECORD *attr90; + INDEX_ROOT *iroot; + + attr90 = find_first_attribute (AT_INDEX_ROOT, inode->mrec); + if (!attr90) + return 0; // not a directory + + iroot = (INDEX_ROOT*)((u8*)attr90 + le16_to_cpu(attr90->value_offset)); + + return iroot->index_block_size; +} + +/** * cat */ -static int cat (ntfs_volume *vol __attribute__((unused)), ntfs_inode *inode, - ATTR_TYPES type, ntfschar *name __attribute__((unused)), +static int cat (ntfs_volume *vol, ntfs_inode *inode, ATTR_TYPES type, + ntfschar *name __attribute__((unused)), int namelen __attribute__((unused))) { - /* increase 1024 only if you fix partial writes below */ - const int bufsize = 1024; + const int bufsize = 4096; char *buffer; ntfs_attr *attr; s64 bytes_read, written; s64 offset; + u32 block_size; buffer = malloc (bufsize); if (!buffer) @@ -227,14 +304,28 @@ static int cat (ntfs_volume *vol __attri attr = ntfs_attr_open (inode, type, NULL, 0); if (!attr) { - Eprintf ("Cannot cat a directory.\n"); + Eprintf ("Cannot find attribute type 0x%lx.\n", (long) type); free (buffer); return 1; } + if ((inode->mft_no < 2) && (attr->type == AT_DATA)) + block_size = vol->mft_record_size; + else if (attr->type == AT_INDEX_ALLOCATION) + block_size = index_get_size (inode); + else + block_size = 0; + offset = 0; for (;;) { - bytes_read = ntfs_attr_pread (attr, offset, bufsize, buffer); + if (block_size > 0) { + // These types have fixup + bytes_read = ntfs_attr_mst_pread(attr, offset, 1, block_size, buffer); + bytes_read *= block_size; + } else { + bytes_read = ntfs_attr_pread (attr, offset, bufsize, buffer); + } + //fprintf (stderr, "read %lld bytes\n", bytes_read); if (bytes_read == -1) { perror ("ERROR: Couldn't read file"); break; @@ -275,8 +366,6 @@ int main (int argc, char *argv[]) utils_set_locale(); - //XXX quieten errors, temporarily - vol = utils_mount_volume (opts.device, MS_RDONLY, opts.force); if (!vol) { perror("ERROR: couldn't mount volume"); @@ -301,12 +390,8 @@ int main (int argc, char *argv[]) ntfs_inode_close (inode); ntfs_umount (vol, FALSE); -#if 0 - if (result) - Printf ("failed\n"); - else - Printf ("success\n"); -#endif + return result; } + Index: ntfscat.8.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.8.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ntfscat.8.in 1 Jun 2004 20:07:35 -0000 1.7 +++ ntfscat.8.in 20 Jun 2005 14:24:53 -0000 1.8 @@ -32,13 +32,48 @@ is equivalent to .BR "\-f \-v" . Long named options can be abbreviated to any unique prefix of their name. .TP -.B \-f +.B "\-a " desc .br .ns .TP -.B \-\-force -This will override some sensible defaults, such as not working with a mounted -volume. Use this option with caution. +.B "\-\-attribute " desc +Display the contents of a particular attribute. By default, the unname $DATA +attribute will be shown. The attribute can be specified by number (in decimal +or hexadecimal), or by name. +.TS +lB lB lB +l l l. +Hex Decimal Name +0x10 16 "$STANDARD_INFORMATION", +0x20 32 "$ATTRIBUTE_LIST", +0x30 48 "$FILE_NAME", +0x40 64 "$OBJECT_ID", +0x50 80 "$SECURITY_DESCRIPTOR", +0x60 96 "$VOLUME_NAME", +0x70 112 "$VOLUME_INFORMATION", +0x80 128 "$DATA", +0x90 144 "$INDEX_ROOT", +0xA0 160 "$INDEX_ALLOCATION", +0xB0 176 "$BITMAP", +0xC0 192 "$REPARSE_POINT", +0xD0 208 "$EA_INFORMATION", +0xE0 224 "$EA", +0xF0 240 "$PROPERTY_SET", +0x100 256 "$LOGGED_UTILITY_STREAM", +.TE +.br +.B Notes +.br +The attribute names may be given without the leading $ symbol. +.br +If you use the $ symbol, you must escape it from the shell. +.TP +.B "\-i " num +.br +.ns +.TP +.B "\-\-inode " num +Specify a file by its inode number instead of its name. .TP .B \-h .br @@ -66,7 +101,7 @@ Show the version number, copyright and l .br .ns .TP -.B \-\-vebose +.B \-\-verbose Display more debug/warning/error messages. .SH EXAMPLES Display the contents of a file in the root of an NTFS volume. @@ -79,6 +114,14 @@ Display the contents of a file in a subd .RS .sp .B ntfscat /dev/hda1 /winnt/system32/drivers/etc/hosts +.RE +.sp +Display the contents of the $INDEX_ROOT attribute of the root directory (inode +5). +.RS +.sp +.B ntfscat /dev/hda1 \-a INDEX_ROOT \-i 5 | hexdump \-C +.RE .SH BUGS .B ntfscat was written in a short time, to get something "out there". It needs a lot more work. |
|
From: Richard R. <fl...@us...> - 2005-06-20 14:24:00
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9569/libntfs Modified Files: collate.c runlist.c Log Message: typos Index: collate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- collate.c 19 Jun 2005 21:09:40 -0000 1.5 +++ collate.c 20 Jun 2005 14:23:50 -0000 1.6 @@ -70,7 +70,8 @@ static int ntfs_collate_ntofs_ulong(ntfs static int ntfs_collate_file_name(ntfs_volume *vol, const void *data1, const int data1_len __attribute__((unused)), - const void *data2, const int data2_len __attribute__((unused))){ + const void *data2, const int data2_len __attribute__((unused))) +{ int rc; const FILE_NAME_ATTR *fn1, *fn2; @@ -127,7 +128,8 @@ static ntfs_collate_func_t ntfs_do_colla */ int ntfs_collate(ntfs_volume *vol, COLLATION_RULES cr, const void *data1, const int data1_len, - const void *data2, const int data2_len) { + const void *data2, const int data2_len) +{ int i; ntfs_debug("Entering."); Index: runlist.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- runlist.c 17 Feb 2005 17:03:50 -0000 1.49 +++ runlist.c 20 Jun 2005 14:23:50 -0000 1.50 @@ -1638,7 +1638,7 @@ int ntfs_rl_sparse(runlist *rl) runlist *rlc; if (!rl) { - Dprintf("%s(): Ivalid argument passed.\n", __FUNCTION__); + Dprintf("%s(): Invalid argument passed.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -1646,7 +1646,7 @@ int ntfs_rl_sparse(runlist *rl) for (rlc = rl; rlc->length; rlc++) if (rlc->lcn < 0) { if (rlc->lcn != LCN_HOLE) { - Dprintf("%s(): Recevied unmapped runlist.\n", + Dprintf("%s(): Received unmapped runlist.\n", __FUNCTION__); errno = EINVAL; return -1; @@ -1669,7 +1669,7 @@ s64 ntfs_rl_get_compressed_size(ntfs_vol s64 ret = 0; if (!rl) { - Dprintf("%s(): Ivalid argument passed.\n", __FUNCTION__); + Dprintf("%s(): Invalid argument passed.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -1677,7 +1677,7 @@ s64 ntfs_rl_get_compressed_size(ntfs_vol for (rlc = rl; rlc->length; rlc++) { if (rlc->lcn < 0) { if (rlc->lcn != LCN_HOLE) { - Dprintf("%s(): Recevied unmapped runlist.\n", + Dprintf("%s(): Received unmapped runlist.\n", __FUNCTION__); errno = EINVAL; return -1; |
|
From: Richard R. <fl...@us...> - 2005-06-20 14:23:38
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9344/libntfs Modified Files: attrib.c Log Message: probably a bug in __ntfs_attr_init Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.161 retrieving revision 1.162 diff -u -p -r1.161 -r1.162 --- attrib.c 19 Jun 2005 21:09:40 -0000 1.161 +++ attrib.c 20 Jun 2005 14:23:27 -0000 1.162 @@ -256,7 +256,7 @@ static __inline__ void __ntfs_attr_init( na->name = name; na->name_len = name_len; } else { - na->name = AT_UNNAMED; + na->name = NULL; na->name_len = 0; } } @@ -2728,7 +2728,8 @@ put_err_out: * EINVAL - Invalid argumets passed to function. * EIO - I/O error occured or damaged filesystem. */ -int ntfs_attr_record_rm(ntfs_attr_search_ctx *ctx) { +int ntfs_attr_record_rm(ntfs_attr_search_ctx *ctx) +{ ntfs_inode *base_ni, *ni; ATTR_TYPES type; int err; |
|
From: Richard R. <fl...@us...> - 2005-06-19 21:09:51
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2642/ntfsprogs Modified Files: mkntfs.c ntfscat.c ntfsclone.c ntfscluster.c ntfscluster.h ntfscp.c ntfsdump_logfile.c ntfsfix.c ntfsinfo.c ntfsmove.c ntfsresize.c ntfsrm.c ntfsrm.h ntfstruncate.c ntfsundelete.c ntfswipe.c sd.c Log Message: Tidy whitespace: trailing space; <space><tab> at the beginning of lines Fix warnings about sign differences Fix warnings about unused parameters Tidy a few functions that didn't have { on a new line Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- mkntfs.c 6 Jun 2005 14:29:47 -0000 1.57 +++ mkntfs.c 19 Jun 2005 21:09:41 -0000 1.58 @@ -135,8 +135,7 @@ switch if you want to be able to build t extern const unsigned char attrdef_ntfs12_array[2400]; extern const unsigned char boot_array[3429]; -extern void init_system_file_sd(int sys_file_no, char **sd_val, - int *sd_val_len); +extern void init_system_file_sd(int sys_file_no, u8 **sd_val, int *sd_val_len); extern void init_upcase_table(ntfschar *uc, u32 uc_len); /* Page size on ia32. Can change to 8192 on Alpha. */ @@ -145,13 +144,13 @@ extern void init_upcase_table(ntfschar * const char *EXEC_NAME = "mkntfs"; /* Need these global so mkntfs_exit can access them. */ -char *buf = NULL; -char *buf2 = NULL; +u8 *buf = NULL; +u8 *buf2 = NULL; int buf2_size = 0; int mft_bitmap_size, mft_bitmap_byte_size; -unsigned char *mft_bitmap = NULL; +u8 *mft_bitmap = NULL; int lcn_bitmap_byte_size; -unsigned char *lcn_bitmap = NULL; +u8 *lcn_bitmap = NULL; runlist *rl_mft = NULL, *rl_mft_bmp = NULL, *rl_mftmirr = NULL; runlist *rl_logfile = NULL, *rl_boot = NULL, *rl_bad = NULL, *rl_index; INDEX_ALLOCATION *index_block = NULL; @@ -174,7 +173,7 @@ struct { long long logfile_lcn; /* lcn of $LogFile, $DATA. */ int logfile_size; /* in bytes, determined from volume_size. */ - int mft_zone_multiplier; /* -z, value from 1 to 4. Default is + int mft_zone_multiplier; /* -z, value from 1 to 4. Default is 1. */ long long mft_zone_end; /* Determined from volume_size and mft_zone_multiplier, in clusters. */ @@ -251,7 +250,7 @@ GEN_PRINTF(Qprintf, stdout, &opts.quiet, /** * err_exit - error output and terminate; ignores quiet (-q) */ -static void err_exit(const char *fmt, ...) +static void err_exit(const char *fmt, ...) __attribute__((noreturn)) __attribute__((format(printf, 1, 2))); static void err_exit(const char *fmt, ...) @@ -520,7 +519,7 @@ static __inline__ long long mkntfs_write * Note: Might not return. */ static s64 ntfs_rlwrite(struct ntfs_device *dev, const runlist *rl, - const char *val, const s64 val_len, s64 *inited_size) + const u8 *val, const s64 val_len, s64 *inited_size) { s64 bytes_written, total, length, delta; int retry, i; @@ -1191,7 +1190,7 @@ err_end: static int insert_positioned_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type, const char *name, u32 name_len, const IGNORE_CASE_BOOL ic, const ATTR_FLAGS flags, - const runlist *rl, const char *val, const s64 val_len) + const runlist *rl, const u8 *val, const s64 val_len) { ntfs_attr_search_ctx *ctx; ATTR_RECORD *a; @@ -1376,7 +1375,7 @@ err_out: static int insert_non_resident_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type, const char *name, u32 name_len, const IGNORE_CASE_BOOL ic, const ATTR_FLAGS flags, - const char *val, const s64 val_len) + const u8 *val, const s64 val_len) { ntfs_attr_search_ctx *ctx; ATTR_RECORD *a; @@ -1568,7 +1567,7 @@ static int insert_resident_attr_in_mft_r const ATTR_TYPES type, const char *name, u32 name_len, const IGNORE_CASE_BOOL ic, const ATTR_FLAGS flags, const RESIDENT_ATTR_FLAGS res_flags, - const char *val, const u32 val_len) + const u8 *val, const u32 val_len) { ntfs_attr_search_ctx *ctx; ATTR_RECORD *a; @@ -1698,7 +1697,7 @@ static int add_attr_std_info(MFT_RECORD } /* NTFS 1.2: size of si = 48, NTFS 3.0: size of si = 72 */ err = insert_resident_attr_in_mft_record(m, AT_STANDARD_INFORMATION, - NULL, 0, 0, 0, 0, (char*)&si, + NULL, 0, 0, 0, 0, (u8*)&si, vol->major_ver < 3 ? 48 : 72); if (err < 0) Eprintf("add_attr_std_info failed: %s\n", strerror(-err)); @@ -1778,7 +1777,7 @@ static int add_attr_file_name(MFT_RECORD fn->file_name_length = i; fn_size = sizeof(FILE_NAME_ATTR) + i * sizeof(ntfschar); i = insert_resident_attr_in_mft_record(m, AT_FILE_NAME, NULL, 0, 0, - 0, RESIDENT_ATTR_IS_INDEXED, (char*)fn, fn_size); + 0, RESIDENT_ATTR_IS_INDEXED, (u8*)fn, fn_size); free(fn); if (i < 0) Eprintf("add_attr_file_name failed: %s\n", strerror(-i)); @@ -1792,7 +1791,7 @@ static int add_attr_file_name(MFT_RECORD * * Return 0 on success or -errno on error. */ -static int add_attr_sd(MFT_RECORD *m, const char *sd, const s64 sd_len) +static int add_attr_sd(MFT_RECORD *m, const u8 *sd, const s64 sd_len) { int err; @@ -1817,7 +1816,7 @@ static int add_attr_sd(MFT_RECORD *m, co */ static int add_attr_data(MFT_RECORD *m, const char *name, const u32 name_len, const IGNORE_CASE_BOOL ic, const ATTR_FLAGS flags, - const char *val, const s64 val_len) + const u8 *val, const s64 val_len) { int err; @@ -1857,7 +1856,7 @@ static int add_attr_data(MFT_RECORD *m, static int add_attr_data_positioned(MFT_RECORD *m, const char *name, const u32 name_len, const IGNORE_CASE_BOOL ic, const ATTR_FLAGS flags, const runlist *rl, - const char *val, const s64 val_len) + const u8 *val, const s64 val_len) { int err; @@ -1904,7 +1903,7 @@ static int add_attr_vol_name(MFT_RECORD len = 0; } i = insert_resident_attr_in_mft_record(m, AT_VOLUME_NAME, NULL, 0, 0, - 0, 0, (char*)uname, len); + 0, 0, (u8*)uname, len); if (uname) free(uname); if (i < 0) @@ -1927,7 +1926,7 @@ static int add_attr_vol_info(MFT_RECORD vi.minor_ver = minor_ver; vi.flags = flags & VOLUME_FLAGS_MASK; err = insert_resident_attr_in_mft_record(m, AT_VOLUME_INFORMATION, NULL, - 0, 0, 0, 0, (char*)&vi, sizeof(vi)); + 0, 0, 0, 0, (u8*)&vi, sizeof(vi)); if (err < 0) Eprintf("add_attr_vol_info failed: %s\n", strerror(-err)); return err; @@ -2006,7 +2005,7 @@ static int add_attr_index_root(MFT_RECOR e->flags = INDEX_ENTRY_END; e->reserved = cpu_to_le16(0); err = insert_resident_attr_in_mft_record(m, AT_INDEX_ROOT, name, - name_len, ic, 0, 0, (char*)r, val_len); + name_len, ic, 0, 0, (u8*)r, val_len); free(r); if (err < 0) Eprintf("add_attr_index_root failed: %s\n", strerror(-err)); @@ -2019,7 +2018,7 @@ static int add_attr_index_root(MFT_RECOR */ static int add_attr_index_alloc(MFT_RECORD *m, const char *name, const u32 name_len, const IGNORE_CASE_BOOL ic, - const char *index_alloc_val, const u32 index_alloc_val_len) + const u8 *index_alloc_val, const u32 index_alloc_val_len) { int err; @@ -2036,7 +2035,7 @@ static int add_attr_index_alloc(MFT_RECO * Return 0 on success or -errno on error. */ static int add_attr_bitmap(MFT_RECORD *m, const char *name, const u32 name_len, - const IGNORE_CASE_BOOL ic, const char *bitmap, + const IGNORE_CASE_BOOL ic, const u8 *bitmap, const u32 bitmap_len) { int err; @@ -2065,7 +2064,7 @@ static int add_attr_bitmap(MFT_RECORD *m */ static int add_attr_bitmap_positioned(MFT_RECORD *m, const char *name, const u32 name_len, const IGNORE_CASE_BOOL ic, - const runlist *rl, const char *bitmap, const u32 bitmap_len) + const runlist *rl, const u8 *bitmap, const u32 bitmap_len) { int err; @@ -2095,7 +2094,7 @@ static int upgrade_to_large_index(MFT_RE INDEX_ENTRY *re; INDEX_ALLOCATION *ia_val = NULL; ntfschar *uname; - char bmp[8]; + u8 bmp[8]; char *re_start, *re_end; int i, err, index_block_size; @@ -2147,7 +2146,7 @@ static int upgrade_to_large_index(MFT_RE memset(bmp, 0, sizeof(bmp)); ntfs_bit_set(bmp, 0ULL, 1); /* Bitmap has to be at least 8 bytes in size. */ - err = add_attr_bitmap(m, name, name_len, ic, (char*)&bmp, sizeof(bmp)); + err = add_attr_bitmap(m, name, name_len, ic, bmp, sizeof(bmp)); if (err) goto err_out; ia_val = calloc(1, index_block_size); @@ -2224,7 +2223,7 @@ static int upgrade_to_large_index(MFT_RE "upgrade_to_large_index.\n"); goto err_out; } - err = add_attr_index_alloc(m, name, name_len, ic, (char*)ia_val, + err = add_attr_index_alloc(m, name, name_len, ic, (u8*)ia_val, index_block_size); ntfs_mst_post_write_fixup((NTFS_RECORD*)ia_val); if (err) { @@ -2491,7 +2490,7 @@ static int create_hardlink(INDEX_BLOCK * m_file->link_count = cpu_to_le16(i + 1); /* Add the file_name to @m_file. */ i = insert_resident_attr_in_mft_record(m_file, AT_FILE_NAME, NULL, 0, 0, - 0, RESIDENT_ATTR_IS_INDEXED, (char*)fn, fn_size); + 0, RESIDENT_ATTR_IS_INDEXED, (u8*)fn, fn_size); if (i < 0) { Eprintf("create_hardlink failed adding file name attribute: " "%s\n", strerror(-i)); @@ -2883,7 +2882,7 @@ static void mkntfs_override_phys_params( static void mkntfs_initialize_bitmaps(void) { int i, j; - + /* Determine lcn bitmap byte size and allocate it. */ lcn_bitmap_byte_size = (opts.nr_clusters + 7) >> 3; /* Needs to be multiple of 8 bytes. */ @@ -2949,7 +2948,7 @@ static void mkntfs_initialize_bitmaps(vo static void mkntfs_initialize_rl_mft(void) { int i, j; - + /* If user didn't specify the mft lcn, determine it now. */ if (!opts.mft_lcn) { /* @@ -3224,7 +3223,7 @@ static void mkntfs_fill_device_with_zero static void create_file_volume(MFT_RECORD *m, MFT_REF root_ref, VOLUME_FLAGS fl) { int i, err; - char *sd; + u8 *sd; Vprintf("Creating $Volume (mft record 3)\n"); m = (MFT_RECORD*)(buf + 3 * vol->mft_record_size); @@ -3256,7 +3255,7 @@ static void create_file_volume(MFT_RECOR * * Return 0 on success or 1 if it couldn't be created. */ -static int create_backup_boot_sector(char *buff, int size) +static int create_backup_boot_sector(u8 *buff, int size) { ssize_t bw; int _e = errno; @@ -3304,7 +3303,7 @@ static void mkntfs_create_root_structure MFT_RECORD *m; MFT_REF root_ref; int i, j, err; - char *sd; + u8 *sd; VOLUME_FLAGS volume_flags = 0; Qprintf("Creating NTFS volume structures.\n"); @@ -3473,7 +3472,7 @@ static void mkntfs_create_root_structure buf2_size = 36000; else buf2_size = opts.attr_defs_len; - buf2 = (char*)calloc(1, buf2_size); + buf2 = calloc(1, buf2_size); if (!buf2) err_exit("Failed to allocate internal buffer: %s\n", strerror(errno)); @@ -3598,7 +3597,7 @@ static void mkntfs_create_root_structure } if (err < 0) err_exit("Couldn't create $Boot: %s\n", strerror(-err)); - + if (create_backup_boot_sector(buf2, i) != 0) { /* * Pre-2.6 kernels couldn't access the last sector @@ -3651,7 +3650,7 @@ static void mkntfs_create_root_structure //dump_mft_record(m); Vprintf("Creating $UpCase (mft record 0xa)\n"); m = (MFT_RECORD*)(buf + 0xa * vol->mft_record_size); - err = add_attr_data(m, NULL, 0, 0, 0, (char*)vol->upcase, + err = add_attr_data(m, NULL, 0, 0, 0, (u8*)vol->upcase, vol->upcase_len << 1); if (!err) err = create_hardlink(index_block, root_ref, m, @@ -3790,7 +3789,7 @@ int main(int argc, char **argv) if (err) err_exit("ntfs_mst_pre_write_fixup() failed while syncing " "root directory index block.\n"); - lw = ntfs_rlwrite(vol->dev, rl_index, (char*)index_block, i, NULL); + lw = ntfs_rlwrite(vol->dev, rl_index, (u8*)index_block, i, NULL); if (lw != i) err_exit("Error writing $INDEX_ALLOCATION.\n"); /* No more changes to @index_block below here so no need for fixup: */ Index: ntfscat.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- ntfscat.c 12 Jun 2005 18:12:56 -0000 1.14 +++ ntfscat.c 19 Jun 2005 21:09:41 -0000 1.15 @@ -215,7 +215,7 @@ static int cat (ntfs_volume *vol __attri int namelen __attribute__((unused))) { /* increase 1024 only if you fix partial writes below */ - const int bufsize = 1024; + const int bufsize = 1024; char *buffer; ntfs_attr *attr; s64 bytes_read, written; @@ -279,25 +279,25 @@ int main (int argc, char *argv[]) vol = utils_mount_volume (opts.device, MS_RDONLY, opts.force); if (!vol) { - perror("ERROR: couldn't mount volume"); + perror("ERROR: couldn't mount volume"); return 1; } - if (opts.inode != -1) - inode = ntfs_inode_open (vol, opts.inode); - else - inode = ntfs_pathname_to_inode (vol, NULL, opts.file); + if (opts.inode != -1) + inode = ntfs_inode_open (vol, opts.inode); + else + inode = ntfs_pathname_to_inode (vol, NULL, opts.file); if (!inode) { - perror("ERROR: Couldn't open inode"); + perror("ERROR: Couldn't open inode"); return 1; } - attr = AT_DATA; - if (opts.attr != (ATTR_TYPES)-1) - attr = opts.attr; - - result = cat (vol, inode, attr, NULL, 0); + attr = AT_DATA; + if (opts.attr != (ATTR_TYPES)-1) + attr = opts.attr; + + result = cat (vol, inode, attr, NULL, 0); ntfs_inode_close (inode); ntfs_umount (vol, FALSE); Index: ntfsclone.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- ntfsclone.c 12 Jun 2005 14:35:57 -0000 1.44 +++ ntfsclone.c 19 Jun 2005 21:09:41 -0000 1.45 @@ -60,7 +60,7 @@ struct { int force; int overwrite; int std_out; - int blkdev_out; /* output file is block device */ + int blkdev_out; /* output file is block device */ int metadata_only; int ignore_fs_check; int rescue; @@ -300,7 +300,7 @@ static void parse_options(int argc, char usage(); } } - + if (opt.output == NULL) { err_printf("You must specify an output file.\n"); usage(); @@ -321,7 +321,7 @@ static void parse_options(int argc, char if (opt.metadata_only && opt.restore_image) err_exit("Restoring only metadata from an image is not " "supported!\n"); - + if (opt.metadata_only && opt.std_out) err_exit("Cloning only metadata to stdout isn't supported!\n"); @@ -332,13 +332,13 @@ static void parse_options(int argc, char if (opt.save_image && opt.restore_image) err_exit("Saving and restoring an image at the same time " "is not supported!\n"); - + if (!opt.std_out) { struct stat st; - + if (stat(opt.output, &st) == -1) { if (errno != ENOENT) - perr_exit("Couldn't access '%s'", opt.output); + perr_exit("Couldn't access '%s'", opt.output); } else { if (!opt.overwrite) err_exit("Output file '%s' already exists.\n" @@ -352,16 +352,16 @@ static void parse_options(int argc, char "block device isn't supported!\n"); } } - } - + } + msg_out = stdout; - + /* FIXME: this is a workaround for loosing debug info if stdout != stderr and for the uncontrollable verbose messages in libntfs. Ughhh. */ if (opt.std_out) msg_out = stderr; else if (opt.debug) - stderr = stdout; + stderr = stdout; else if (!(stderr = fopen("/dev/null", "rw"))) perr_exit("Couldn't open /dev/null"); @@ -413,7 +413,7 @@ static s64 is_critical_metadata(ntfs_wal s64 inode = image->ni->mft_no; if (inode <= LAST_METADATA_INODE) { - + /* Don't save bad sectors (both $Bad and unnamed are ignored */ if (inode == FILE_BadClus && image->ctx->attr->type == AT_DATA) return 0; @@ -434,7 +434,7 @@ static s64 is_critical_metadata(ntfs_wal return 0; } } - + if (image->ctx->attr->type != AT_DATA) return rl->length; @@ -446,7 +446,7 @@ static int io_all(void *fd, void *buf, i { int i; struct ntfs_device *dev = fd; - + while (count > 0) { if (do_write) i = write(*(int *)fd, buf, count); @@ -494,7 +494,7 @@ static void copy_cluster(int rescue, off /* vol is NULL if opt.restore_image is set */ u32 csize = image_hdr.cluster_size; void *fd = (void *)&fd_in; - + if (!opt.restore_image) { csize = vol->cluster_size; fd = vol->dev; @@ -516,7 +516,7 @@ static void copy_cluster(int rescue, off if (write_all(&fd_out, &cmd, sizeof(cmd)) == -1) perr_exit("write_all"); } - + if (write_all(&fd_out, buff, csize) == -1) { int err = errno; perr_printf("Write failed"); @@ -532,9 +532,9 @@ static void copy_cluster(int rescue, off static void lseek_to_cluster(s64 lcn) { off_t pos; - + pos = (off_t)(lcn * vol->cluster_size); - + if (vol->dev->d_ops->seek(vol->dev, pos, SEEK_SET) == (off_t)-1) perr_exit("lseek input"); @@ -552,7 +552,7 @@ static void image_skip_clusters(s64 coun buff[0] = 0; memcpy(buff + 1, &count, sizeof(count)); - + if (write_all(&fd_out, buff, sizeof(buff)) == -1) perr_exit("write_all"); } @@ -561,15 +561,15 @@ static void image_skip_clusters(s64 coun static void dump_clusters(ntfs_walk_clusters_ctx *image, runlist *rl) { s64 i, len; /* number of clusters to copy */ - + if (opt.std_out || !opt.metadata_only) return; - + if (!(len = is_critical_metadata(image, rl))) return; - + lseek_to_cluster(rl->lcn); - + /* FIXME: this could give pretty suboptimal performance */ for (i = 0; i < len; i++) copy_cluster(opt.rescue, rl->lcn + i); @@ -597,19 +597,19 @@ static void clone_ntfs(u64 nr_clusters) if (write_all(&fd_out, &image_hdr, sizeof(image_hdr)) == -1) perr_exit("write_all"); } - + for (last_cl = cl = 0; cl < (u64)vol->nr_clusters; cl++) { - + if (ntfs_bit_get(lcn_bitmap.bm, cl)) { progress_update(&progress, ++p_counter); lseek_to_cluster(cl); image_skip_clusters(cl - last_cl - 1); - + copy_cluster(opt.rescue, cl); last_cl = cl; continue; } - + if (opt.std_out && !opt.save_image) { progress_update(&progress, ++p_counter); if (write_all(&fd_out, buf, csize) == -1) @@ -624,7 +624,7 @@ static void write_empty_clusters(s32 csi { s64 i; char buff[NTFS_MAX_CLUSTER_SIZE]; - + memset(buff, 0, csize); for (i = 0; i < count; i++) { @@ -689,14 +689,14 @@ do { \ static void wipe_timestamps(ntfs_walk_clusters_ctx *image) { ATTR_RECORD *a = image->ctx->attr; - + if (image->ni->mft_no <= LAST_METADATA_INODE) return; - if (a->type == AT_FILE_NAME) + if (a->type == AT_FILE_NAME) WIPE_TIMESTAMPS(FILE_NAME_ATTR, a); - else if (a->type == AT_STANDARD_INFORMATION) + else if (a->type == AT_STANDARD_INFORMATION) WIPE_TIMESTAMPS(STANDARD_INFORMATION, a); } @@ -709,27 +709,27 @@ static void wipe_resident_data(ntfs_walk a = image->ctx->attr; p = (u8*)a + le16_to_cpu(a->value_offset); - + if (image->ni->mft_no <= LAST_METADATA_INODE) return; - + if (a->type != AT_DATA) return; - + for (i = 0; i < le32_to_cpu(a->value_length); i++) { if (p[i]) { p[i] = 0; n++; - } - } - + } + } + wiped_resident_data += n; } static void clone_logfile_parts(ntfs_walk_clusters_ctx *image, runlist *rl) { s64 offset = 0, lcn, vcn; - + while (1) { vcn = offset / image->ni->vol->cluster_size; @@ -781,10 +781,10 @@ static void walk_runs(struct ntfs_walk_c "%llx length %llx\n", ctx->ntfs_ino->mft_no, (unsigned int)le32_to_cpu(a->type), lcn, lcn_length); - + if (!wipe) dump_clusters(walk->image, rl + i); - + for (j = 0; j < lcn_length; j++) { u64 k = (u64)lcn + j; if (ntfs_bit_get_and_set(lcn_bitmap.bm, k, 1)) @@ -799,7 +799,7 @@ static void walk_runs(struct ntfs_walk_c walk->image->ni->mft_no == FILE_LogFile && walk->image->ctx->attr->type == AT_DATA) clone_logfile_parts(walk->image, rl); - + free(rl); } @@ -847,7 +847,7 @@ static void compare_bitmaps(struct bitma } for (i = 0; i < count; i++, pos++) { - s64 cl; /* current cluster */ + s64 cl; /* current cluster */ if (a->bm[pos] == bm[i]) continue; @@ -858,7 +858,7 @@ static void compare_bitmaps(struct bitma bit = ntfs_bit_get(a->bm, cl); if (bit == ntfs_bit_get(bm, i * 8 + cl % 8)) continue; - + if (opt.ignore_fs_check) { lseek_to_cluster(cl); copy_cluster(opt.rescue, cl); @@ -892,13 +892,13 @@ static void compare_bitmaps(struct bitma static int wipe_data(char *p, int pos, int len) { int wiped = 0; - + for (p += pos; --len >= 0;) { if (p[len]) { p[len] = 0; wiped++; - } - } + } + } return wiped; } @@ -907,11 +907,11 @@ static void wipe_unused_mft_data(ntfs_in { int unused; MFT_RECORD *m = ni->mrec; - + /* FIXME: broken MFTMirr update was fixed in libntfs, check if OK now */ if (ni->mft_no <= LAST_METADATA_INODE) return; - + unused = le32_to_cpu(m->bytes_allocated) - le32_to_cpu(m->bytes_in_use); wiped_unused_mft_data += wipe_data((char *)m, le32_to_cpu(m->bytes_in_use), unused); @@ -921,11 +921,11 @@ static void wipe_unused_mft(ntfs_inode * { int unused; MFT_RECORD *m = ni->mrec; - + /* FIXME: broken MFTMirr update was fixed in libntfs, check if OK now */ if (ni->mft_no <= LAST_METADATA_INODE) return; - + unused = le32_to_cpu(m->bytes_in_use) - sizeof(MFT_RECORD); wiped_unused_mft += wipe_data((char *)m, sizeof(MFT_RECORD), unused); } @@ -945,7 +945,7 @@ static int walk_clusters(ntfs_volume *vo progress_init(&progress, inode, last_mft_rec, 100); for (; inode <= last_mft_rec; inode++) { - + int err, deleted_inode; MFT_REF mref = (MFT_REF)inode; @@ -956,14 +956,14 @@ static int walk_clusters(ntfs_volume *vo ni = (ntfs_inode*)calloc(1, sizeof(ntfs_inode)); if (!ni) perr_exit("walk_clusters"); - + ni->vol = volume; err = ntfs_file_record_read(volume, mref, &ni->mrec, NULL); if (err == -1) { free(ni); continue; - } + } deleted_inode = !(ni->mrec->flags & MFT_RECORD_IN_USE); @@ -975,16 +975,16 @@ static int walk_clusters(ntfs_volume *vo wipe_unused_mft_data(ni); if (ntfs_mft_record_write(volume, ni->mft_no, ni->mrec)) perr_exit("ntfs_mft_record_write"); - } + } } if (ni->mrec) free(ni->mrec); free(ni); - if (deleted_inode) + if (deleted_inode) continue; - + if ((ni = ntfs_inode_open(volume, mref)) == NULL) { /* FIXME: continue only if it make sense, e.g. MFT record not in use based on $MFT bitmap */ @@ -1001,17 +1001,17 @@ static int walk_clusters(ntfs_volume *vo walk->image->ni = ni; walk_attributes(walk); -out: +out: if (wipe) { wipe_unused_mft_data(ni); if (ntfs_mft_record_write(volume, ni->mft_no, ni->mrec)) perr_exit("ntfs_mft_record_write"); - } + } if (ntfs_inode_close(ni)) perr_exit("ntfs_inode_close for inode %lld", inode); } - + return 0; } @@ -1088,7 +1088,7 @@ static void print_image_info(void) static void check_if_mounted(const char *device, unsigned long new_mntflag) { unsigned long mntflag; - + if (ntfs_check_if_mounted(device, &mntflag)) perr_exit("Failed to check '%s' mount state", device); @@ -1110,7 +1110,7 @@ static void check_if_mounted(const char static void mount_volume(unsigned long new_mntflag) { check_if_mounted(opt.volume, new_mntflag); - + if (!(vol = ntfs_mount(opt.volume, new_mntflag))) { int err = errno; @@ -1129,7 +1129,7 @@ static void mount_volume(unsigned long n if (opt.force-- <= 0) err_exit("Volume is dirty. Run chkdsk and " "please try again (or see -f option).\n"); - + if (NTFS_MAX_CLUSTER_SIZE < vol->cluster_size) err_exit("Cluster size %u is too large!\n", (unsigned int)vol->cluster_size); @@ -1144,7 +1144,7 @@ static void mount_volume(unsigned long n volume_size(vol, vol->nr_clusters)); } -struct ntfs_walk_cluster backup_clusters = { NULL, NULL }; +struct ntfs_walk_cluster backup_clusters = { NULL, NULL }; static int device_offset_valid(int fd, s64 ofs) { @@ -1163,7 +1163,7 @@ static s64 device_size_get(int fd) if (ioctl(fd, BLKGETSIZE64, &size) >= 0) { Dprintf("BLKGETSIZE64 nr bytes = %llu (0x%llx)\n", - (unsigned long long)size, + (unsigned long long)size, (unsigned long long)size); return (s64)size; } @@ -1250,7 +1250,7 @@ static void set_filesize(s64 filesize) static s64 open_image(void) { if (strcmp(opt.volume, "-") == 0) { - if ((fd_in = fileno(stdin)) == -1) + if ((fd_in = fileno(stdin)) == -1) perr_exit("fileno for stdout failed"); } else { if ((fd_in = open(opt.volume, O_RDONLY)) == -1) @@ -1269,15 +1269,15 @@ static s64 open_image(void) static s64 open_volume(void) { s64 device_size; - + mount_volume(MS_RDONLY); - + device_size = ntfs_device_size_get(vol->dev, 1); if (device_size <= 0) err_exit("Couldn't get device size (%lld)!\n", device_size); - + print_volume_size("Current device size", device_size); - + if (device_size < vol->nr_clusters * vol->cluster_size) err_exit("Current NTFS volume size is bigger than the device " "size (%lld)!\nCorrupt partition table or incorrect " @@ -1304,7 +1304,7 @@ static void check_output_device(s64 inpu if (dest_size < input_size) err_exit("Output device is too small (%lld) to fit the " "NTFS image (%lld).\n", dest_size, input_size); - + check_if_mounted(opt.output, 0); } else set_filesize(input_size); @@ -1331,7 +1331,7 @@ static int str2unicode(const char *aname *ustr = AT_UNNAMED; *len = 0; } - + return 0; } @@ -1348,10 +1348,10 @@ static ntfs_attr_search_ctx *lookup_data if ((ctx = attr_get_search_ctx(ni, NULL)) == NULL) return NULL; - + if (str2unicode(aname, &ustr, &len) == -1) goto error_out; - + if (ntfs_attr_lookup(AT_DATA, ustr, len, 0, 0, NULL, 0, ctx)) { perr_printf("ntfs_attr_lookup"); goto error_out; @@ -1364,14 +1364,14 @@ error_out: ntfs_attr_put_search_ctx(ctx); return NULL; } - + static void ignore_bad_clusters(ntfs_walk_clusters_ctx *image) { ntfs_inode *ni; ntfs_attr_search_ctx *ctx = NULL; runlist *rl; s64 nr_bad_clusters = 0; - + if (!(ni = ntfs_inode_open(vol, FILE_BadClus))) perr_exit("ntfs_open_inode"); @@ -1380,10 +1380,10 @@ static void ignore_bad_clusters(ntfs_wal if (!(rl = ntfs_mapping_pairs_decompress(vol, ctx->attr, NULL))) perr_exit("ntfs_mapping_pairs_decompress"); - + for (; rl->length; rl++) { s64 lcn = rl->lcn; - + if (lcn == LCN_HOLE || lcn < 0) continue; @@ -1413,7 +1413,7 @@ int main(int argc, char **argv) msg_out = stderr; parse_options(argc, argv); - + utils_set_locale(); if (opt.restore_image) { @@ -1426,19 +1426,19 @@ int main(int argc, char **argv) ntfs_size += 512; /* add backup boot sector */ if (opt.std_out) { - if ((fd_out = fileno(stdout)) == -1) + if ((fd_out = fileno(stdout)) == -1) perr_exit("fileno for stdout failed"); } else { /* device_size_get() might need to read() */ int flags = O_RDWR; - + if (!opt.blkdev_out) { flags |= O_CREAT | O_TRUNC; if (!opt.overwrite) flags |= O_EXCL; } - if ((fd_out = open(opt.output, flags, S_IRWXU)) == -1) + if ((fd_out = open(opt.output, flags, S_IRWXU)) == -1) perr_exit("Opening file '%s' failed", opt.output); if (!opt.save_image) @@ -1451,20 +1451,20 @@ int main(int argc, char **argv) fsync_clone(fd_out); exit(0); } - + setup_lcn_bitmap(); memset(&image, 0, sizeof(image)); - backup_clusters.image = ℑ + backup_clusters.image = ℑ walk_clusters(vol, &backup_clusters); compare_bitmaps(&lcn_bitmap); print_disk_usage(vol->cluster_size, vol->nr_clusters, image.inuse); - + ignore_bad_clusters(&image); if (opt.save_image) initialise_image_hdr(device_size, image.inuse); - + /* FIXME: save backup boot sector */ if (opt.std_out || !opt.metadata_only) { @@ -1477,9 +1477,9 @@ int main(int argc, char **argv) exit(0); } - wipe = 1; + wipe = 1; opt.volume = opt.output; - /* 'force' again mount for dirty volumes (e.g. after resize). + /* 'force' again mount for dirty volumes (e.g. after resize). FIXME: use mount flags to avoid potential side-effects in future */ opt.force++; mount_volume(0); @@ -1487,26 +1487,26 @@ int main(int argc, char **argv) free(lcn_bitmap.bm); setup_lcn_bitmap(); memset(&image, 0, sizeof(image)); - backup_clusters.image = ℑ + backup_clusters.image = ℑ walk_clusters(vol, &backup_clusters); - + Printf("Num of MFT records = %10lld\n", (long long)vol->mft_na->initialized_size >> - vol->mft_record_size_bits); - Printf("Num of used MFT records = %10u\n", nr_used_mft_records); - - Printf("Wiped unused MFT data = %10u\n", wiped_unused_mft_data); - Printf("Wiped deleted MFT data = %10u\n", wiped_unused_mft); + vol->mft_record_size_bits); + Printf("Num of used MFT records = %10u\n", nr_used_mft_records); + + Printf("Wiped unused MFT data = %10u\n", wiped_unused_mft_data); + Printf("Wiped deleted MFT data = %10u\n", wiped_unused_mft); Printf("Wiped resident user data = %10u\n", wiped_resident_data); Printf("Wiped timestamp data = %10u\n", wiped_timestamp_data); - + wiped_total += wiped_unused_mft_data; wiped_total += wiped_unused_mft; wiped_total += wiped_resident_data; wiped_total += wiped_timestamp_data; Printf("Wiped totally = %10u\n", wiped_total); - + fsync_clone(fd_out); exit(0); } Index: ntfscluster.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- ntfscluster.c 12 Jun 2005 18:12:56 -0000 1.24 +++ ntfscluster.c 19 Jun 2005 21:09:41 -0000 1.25 @@ -357,7 +357,7 @@ static int info (ntfs_volume *vol) */ static int dump_file (ntfs_volume *vol, ntfs_inode *ino) { - u8 buffer[1024]; + char buffer[1024]; ntfs_attr_search_ctx *ctx; ATTR_RECORD *rec; int i; Index: ntfscluster.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- ntfscluster.h 20 Aug 2004 12:01:17 -0000 1.9 +++ ntfscluster.h 19 Jun 2005 21:09:41 -0000 1.10 @@ -46,8 +46,8 @@ struct options { int force; /* Override common sense */ char *filename; /* File to examine */ u64 inode; /* Inode to examine */ - u64 range_begin; /* Look for objects in this range */ - u64 range_end; + s64 range_begin; /* Look for objects in this range */ + s64 range_end; }; struct match { Index: ntfscp.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- ntfscp.c 12 Jun 2005 18:12:56 -0000 1.19 +++ ntfscp.c 19 Jun 2005 21:09:41 -0000 1.20 @@ -115,7 +115,7 @@ static int parse_options (int argc, char { "inode", no_argument, NULL, 'i' }, { "force", no_argument, NULL, 'f' }, { "help", no_argument, NULL, 'h' }, - { "attr-name", required_argument, NULL, 'N' }, + { "attr-name", required_argument, NULL, 'N' }, { "no-action", no_argument, NULL, 'n' }, { "quiet", no_argument, NULL, 'q' }, { "version", no_argument, NULL, 'V' }, @@ -129,7 +129,7 @@ static int parse_options (int argc, char int ver = 0; int help = 0; s64 attr; - + opts.device = NULL; opts.src_file = NULL; opts.dest_file = NULL; @@ -182,7 +182,7 @@ static int parse_options (int argc, char Eprintf("You can specify only one attribute " "name.\n"); err++; - } else + } else opts.attr_name = argv[optind - 1]; break; case 'n': @@ -286,7 +286,7 @@ int main (int argc, char *argv[]) vol = utils_mount_volume(opts.device, flags, opts.force); if (!vol) { - perror("ERROR: couldn't mount volume"); + perror("ERROR: couldn't mount volume"); return 1; } @@ -322,7 +322,7 @@ int main (int argc, char *argv[]) } else out = ntfs_pathname_to_inode(vol, NULL, opts.dest_file); if (!out) { - perror("ERROR: Couldn't open destination file"); + perror("ERROR: Couldn't open destination file"); goto close_src; } if ((le16_to_cpu(out->mrec->flags) & MFT_RECORD_IS_DIRECTORY) && @@ -362,7 +362,7 @@ int main (int argc, char *argv[]) } } - if (opts.attr_name) { + if (opts.attr_name) { attr_name_len = ntfs_mbstoucs(opts.attr_name, &attr_name, 0); if (attr_name_len == -1) { perror("ERROR: Failed to parse attribute name"); Index: ntfsdump_logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- ntfsdump_logfile.c 13 Jan 2005 15:55:15 -0000 1.25 +++ ntfsdump_logfile.c 19 Jun 2005 21:09:41 -0000 1.26 @@ -505,7 +505,7 @@ skip_rstr_pass: ++pass; goto rstr_pass_loc; } - + return rstr; } @@ -714,7 +714,7 @@ int main(int argc, char **argv) puts("$LogFile is not initialized."); return 0; } - + /* * First, verify the restart page header for consistency. */ @@ -739,7 +739,7 @@ int main(int argc, char **argv) */ rcrd = (RECORD_PAGE_HEADER*)dump_restart_areas(rstr, buf, page_size); printf("\n\nFinished with restart pages. " - "Beginning with log pages.\n"); + "Beginning with log pages.\n"); /* * Dump the log areas. Index: ntfsfix.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ntfsfix.c 1 Mar 2005 23:11:20 -0000 1.13 +++ ntfsfix.c 19 Jun 2005 21:09:41 -0000 1.14 @@ -91,7 +91,7 @@ static int usage(void) " -h, --help Display this help\n" " -V, --version Display version information\n" "\n" - "For example: %s /dev/hda6\n\n", + "For example: %s /dev/hda6\n\n", EXEC_NAME, VERSION, EXEC_NAME, EXEC_NAME); printf("%s%s", ntfs_bugs, ntfs_home); exit(1); @@ -139,7 +139,7 @@ static void parse_options(int argc, char usage(); } } - + if (opt.volume == NULL) { printf("ERROR: You must specify a device.\n"); usage(); Index: ntfsinfo.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -p -r1.64 -r1.65 --- ntfsinfo.c 12 Jun 2005 18:12:56 -0000 1.64 +++ ntfsinfo.c 19 Jun 2005 21:09:41 -0000 1.65 @@ -300,7 +300,7 @@ static char *ntfs_attr_get_name(ATTR_REC ntfschar *ucs_attr_name; char *mbs_attr_name = NULL; int mbs_attr_name_size; - + /* calculate name position */ ucs_attr_name = (ntfschar *)((char *)attr + le16_to_cpu(attr->name_offset)); /* convert unicode to printable format */ @@ -330,7 +330,7 @@ static void ntfs_dump_volume(ntfs_volume printf("\tCluster Size: %u\n", (unsigned int)vol->cluster_size); printf("\tVolume Size in Clusters: %lld\n", (long long)vol->nr_clusters); - + printf("MFT Information \n"); printf("\tMFT Record Size: %u\n", (unsigned int)vol->mft_record_size); printf("\tMFT Zone Multiplier: %u\n", vol->mft_zone_multiplier); @@ -349,7 +349,7 @@ static void ntfs_dump_volume(ntfs_volume (long long)vol->mftmirr_lcn); printf("\tSize of Attribute Definition Table: %d\n", (int)vol->attrdef_len); - + printf("FILE_Bitmap Information \n"); printf("\tFILE_Bitmap MFT Record Number: %llu\n", (unsigned long long)vol->lcnbmp_ni->mft_no); @@ -361,7 +361,7 @@ static void ntfs_dump_volume(ntfs_volume (int)vol->lcnbmp_ni->nr_extents); /* FIXME: need to add code for the union if nr_extens != 0, but i dont know if it will ever != 0 with FILE_Bitmap */ - + printf("FILE_Bitmap Data Attribute Information\n"); printf("\tDecompressed Runlist: not done yet\n"); printf("\tBase Inode: %llu\n", @@ -385,7 +385,7 @@ static void ntfs_dump_volume(ntfs_volume vol->lcnbmp_na->compression_block_size_bits); printf("\tCompression Block Clusters: %u\n", vol->lcnbmp_na->compression_block_clusters); - + //TODO: Still need to add a few more attributes } @@ -501,7 +501,7 @@ static void ntfs_dump_attr_standard_info le16_to_cpu(attr->value_offset)); printf("Dumping attribute $STANDARD_INFORMATION (0x10)\n"); - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); /* let's start with mandatory? fields */ @@ -509,18 +509,18 @@ static void ntfs_dump_attr_standard_info /* time conversion stuff */ if (!opts.notime) { char *ntfs_time_str = NULL; - + ntfs_time_str = ntfsinfo_time_to_str(standard_attr->creation_time); printf("\tFile Creation Time:\t %s",ntfs_time_str); - + ntfs_time_str = ntfsinfo_time_to_str( standard_attr->last_data_change_time); printf("\tFile Altered Time:\t %s",ntfs_time_str); - + ntfs_time_str = ntfsinfo_time_to_str( standard_attr->last_mft_change_time); printf("\tMFT Changed Time:\t %s",ntfs_time_str); - + ntfs_time_str = ntfsinfo_time_to_str(standard_attr->last_access_time); printf("\tLast Accessed Time:\t %s",ntfs_time_str); } @@ -532,7 +532,7 @@ static void ntfs_dump_attr_standard_info (unsigned int)le32_to_cpu(standard_attr->version_number)); printf("\tClass ID:\t\t %u \n", (unsigned int)le32_to_cpu(standard_attr->class_id)); - + value_length = le32_to_cpu(attr->value_length); if (value_length == 48) { /* printf("\t$STANDARD_INFORMATION fields owner_id, security_id, quota \n" @@ -559,7 +559,7 @@ static void ntfs_dump_attr_list(ATTR_REC s64 l; printf("Dumping attribute AT_ATTRIBUTE_LIST (0x20)\n"); - + /* Dump list's name */ if (attr->name_length) { char *stream_name = NULL; @@ -576,7 +576,7 @@ static void ntfs_dump_attr_list(ATTR_REC } else { printf("\tList name:\t\t unnamed\n"); } - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); /* Dump list's size */ @@ -592,10 +592,10 @@ static void ntfs_dump_attr_list(ATTR_REC printf("\tList's size:\t\t %u bytes\n", (unsigned int)le32_to_cpu(attr->value_length)); } - + if (!opts.verbose) return; - + l = ntfs_get_attribute_value_length(attr); if (!l) { perror("ntfs_get_attribute_value_length failed"); @@ -659,7 +659,7 @@ static void ntfs_dump_attr_file_name(ATT le16_to_cpu(attr->value_offset)); printf("Dumping attribute $FILE_NAME (0x30)\n"); - + /* let's start with the obvious - file name */ if (file_name_attr->file_name_length>0) { @@ -688,7 +688,7 @@ static void ntfs_dump_attr_file_name(ATT ntfs_dump_namespace(file_name_attr->file_name_type); printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); - + /* other basic stuff about the file */ printf("\tAllocated File Size:\t %lld\n", (long long)sle64_to_cpu(file_name_attr->allocated_size)); @@ -701,7 +701,7 @@ static void ntfs_dump_attr_file_name(ATT /* time stuff stuff */ if (!opts.notime) { char *ntfs_time_str; - + ntfs_time_str = ntfsinfo_time_to_str(file_name_attr->creation_time); printf("\tFile Creation Time:\t %s",ntfs_time_str); @@ -731,7 +731,7 @@ static void ntfs_dump_attr_object_id(ATT le16_to_cpu(attr->value_offset)); printf("Dumping attribute $OBJECT_ID (0x40)\n"); - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); if (vol->major_ver >= 3.0) { @@ -786,7 +786,7 @@ static void ntfs_dump_acl(const char *pr unsigned int i; u16 ace_count; ACCESS_ALLOWED_ACE *ace; - + printf("%sRevision\t %u\n",prefix,acl->revision); /* don't recalc le16_to_cpu every iteration (minor speedup on big-endians */ @@ -799,7 +799,7 @@ static void ntfs_dump_acl(const char *pr for (i=0;i<acl->ace_count;i++) { const char *ace_type; char *sid; - + /* set ace_type. */ switch (ace->type) { case ACCESS_ALLOWED_ACE_TYPE: @@ -815,7 +815,7 @@ static void ntfs_dump_acl(const char *pr ace_type = "unknown"; break; } - + printf("%sACE:\t\t type:%s flags:0x%x access:0x%x\n",prefix,ace_type, (unsigned int)le16_to_cpu(ace->flags),(unsigned int)le32_to_cpu(ace->mask)); /* get a SID string */ @@ -823,7 +823,7 @@ static void ntfs_dump_acl(const char *pr printf("%s\t\t SID: %s\n",prefix,sid); if (sid) free(sid); - + /* proceed to next ACE */ ace = (ACCESS_ALLOWED_ACE *)(((char *)ace) + le32_to_cpu(ace->size)); } @@ -838,9 +838,9 @@ static void ntfs_dump_attr_security_desc { SECURITY_DESCRIPTOR_ATTR *sec_desc_attr; char *sid; - + printf("Dumping attribute $SECURITY_DESCRIPTOR (0x50)\n"); - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); if (attr->non_resident) { @@ -895,7 +895,7 @@ static void ntfs_dump_attr_security_desc } else { printf("missing\n"); } - + printf("\tDiscretionary ACL:\t\t "); if (sec_desc_attr->control & SE_DACL_PRESENT) { if (sec_desc_attr->control & SE_SACL_DEFAULTED) { @@ -907,7 +907,7 @@ static void ntfs_dump_attr_security_desc } else { printf("missing\n"); } - + if (attr->non_resident) free(sec_desc_attr); } @@ -921,7 +921,7 @@ static void ntfs_dump_attr_volume_name(A ntfschar *ucs_vol_name = NULL; printf("Dumping attribute $VOLUME_NAME (0x60)\n"); - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); if (attr->value_length>0) { @@ -958,12 +958,12 @@ static void ntfs_dump_attr_volume_name(A static void ntfs_dump_attr_volume_information(ATTR_RECORD *attr) { VOLUME_INFORMATION *vol_information = NULL; - + vol_information = (VOLUME_INFORMATION*)((char *)attr+ le16_to_cpu(attr->value_offset)); printf("Dumping attribute $VOLUME_INFORMATION (0x70)\n"); - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); printf("\tVolume Version:\t %d.%d\n", vol_information->major_ver, @@ -1018,12 +1018,12 @@ static void ntfs_dump_attr_data(ATTR_REC } else { printf("\tStream name:\t\t unnamed\n"); } - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); /* TODO: parse the flags */ printf("\tFlags:\t\t\t 0x%04hx\n",le16_to_cpu(attr->flags)); - + /* fork by residence */ if (attr->non_resident) { /* VCN lowest_vcn; Lowest valid virtual cluster number @@ -1079,7 +1079,7 @@ static int ntfs_dump_index_entries(INDEX { int numb_entries = 1; char *name = NULL; - + Vprintf("\tDumping index entries:"); while(1) { if (!opts.verbose) { @@ -1099,7 +1099,7 @@ static int ntfs_dump_index_entries(INDEX if (entry->flags & INDEX_ENTRY_END) break; - + switch(type) { case(AT_FILE_NAME): Vprintf("\t\tFILE record number:\t %llu\n", @@ -1154,16 +1154,16 @@ static void ntfs_dump_attr_index_root(AT unsigned int type; INDEX_ROOT *index_root = NULL; INDEX_ENTRY *entry; - + index_root = (INDEX_ROOT*)((u8*)attr + le16_to_cpu(attr->value_offset)); - + printf("Dumping attribute $INDEX_ROOT (0x90)\n"); - + /* Dump index name */ if (attr->name_length) { char *index_name = NULL; index_name = ntfs_attr_get_name(attr); - + if (index_name) { printf("\tIndex name:\t\t '%s'\n",index_name); free(index_name); @@ -1175,7 +1175,7 @@ static void ntfs_dump_attr_index_root(AT } else { printf("\tIndex name:\t\t unnamed\n"); } - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); /* attr_type dumping */ @@ -1206,7 +1206,7 @@ static void ntfs_dump_attr_index_root(AT (unsigned int)le32_to_cpu(index_root->index_block_size)); printf("\tClusters Per Block:\t %u\n", index_root->clusters_per_index_block); - + /* index header starts here */ printf("\tAllocated Size:\t\t %u\n", (unsigned int)le32_to_cpu(index_root->index.allocated_size)); @@ -1233,14 +1233,14 @@ static int get_type_and_size_of_indx(ntf ntfs_attr_search_ctx *ctx; ntfschar *name = 0; INDEX_ROOT *root; - + if (attr->name_length) { name = malloc(attr->name_length * sizeof(ntfschar)); if (!name) { perror("malloc failed"); return -1; } - memcpy(name, (u8 *)attr + attr->name_offset, + memcpy(name, (u8 *)attr + attr->name_offset, attr->name_length * sizeof(ntfschar)); } ctx = ntfs_attr_get_search_ctx(ni, 0); @@ -1256,7 +1256,7 @@ static int get_type_and_size_of_indx(ntf free(name); return -1; } - + root = (INDEX_ROOT*)((u8*)ctx->attr + le16_to_cpu(ctx->attr->value_offset)); *size = le32_to_cpu(root->index_block_size); @@ -1305,7 +1305,7 @@ static void ntfs_dump_index_allocation(A } ntfs_attr_close(na); byte = bitmap; - + na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, name, attr->name_length); if (!na) { perror("ntfs_attr_open failed"); @@ -1327,7 +1327,7 @@ static void ntfs_dump_index_allocation(A } ntfs_attr_close(na); tmp_alloc = allocation; - + bit = 0; while((u8 *)tmp_alloc < (u8 *)allocation + na->data_size) { if (*byte & (1 << bit)) { @@ -1369,7 +1369,7 @@ static void ntfs_dump_attr_index_allocat if (attr->name_length) { char *index_name = NULL; index_name = ntfs_attr_get_name(attr); - + if (index_name) { printf("\tIndex name:\t\t '%s'\n",index_name); free(index_name); @@ -1398,7 +1398,7 @@ static void ntfs_dump_attr_index_allocat Eprintf("Invalid $INDEX_ALLOCTION attribute. Should be be" " non-resident\n"); } - + ntfs_dump_index_allocation(attr, ni); } @@ -1415,7 +1415,7 @@ static void ntfs_dump_attr_bitmap(ATTR_R if (attr->name_length) { char *bitmap_name = NULL; bitmap_name = ntfs_attr_get_name(attr); - + if (bitmap_name) { printf("\tBitmap name:\t\t '%s'\n",bitmap_name); free(bitmap_name); @@ -1427,7 +1427,7 @@ static void ntfs_dump_attr_bitmap(ATTR_R } else { printf("\tBitmap name:\t\t unnamed\n"); } - + printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance)); /* dump bitmap size */ @@ -1518,12 +1518,12 @@ static void ntfs_hex_dump(void *buf,unsi unsigned char c = *((char *)buf + j); printf("%02hhX ",c); } - + /* realign */ for (;j<i+16;j++) { printf(" "); } - + /* char content */ for (j=i;(j<length) && (j<i+16);j++) { unsigned char c = *((char *)buf + j); @@ -1533,7 +1533,7 @@ static void ntfs_hex_dump(void *buf,unsi } printf("%c",c); } - + /* end line */ printf("\n"); i=j; @@ -1617,9 +1617,9 @@ static void ntfs_dump_attr_unknown(ATTR_ static void ntfs_dump_inode_general_info(ntfs_inode *inode) { u16 inode_flags = inode->mrec->flags; - + printf("Dumping Inode #%llu\n",(long long)inode->mft_no); - + printf("Update Sequence Array Count:\t %hu\n", le16_to_cpu(inode->mrec->usa_count)); printf("$LogFile seqNum for this Inode:\t 0x%llx\n", @@ -1649,7 +1649,7 @@ static void ntfs_dump_inode_general_info (unsigned int)le32_to_cpu(inode->mrec->bytes_in_use)); printf("Size - Allocated:\t\t %u bytes\n", (unsigned int)le32_to_cpu(inode->mrec->bytes_allocated)); - + if (inode->mrec->base_mft_record) { printf("base MFT record:\t\t %llu\n", MREF_LE(inode->mrec->base_mft_record)); @@ -1729,7 +1729,7 @@ static void ntfs_dump_file_attributes(nt ntfs_dump_attr_unknown(ctx->attr); } } - + /* if we exited the loop before we're done - notify the user */ if (errno != ENOENT) { fprintf(stderr, "ntfsinfo error: stopped before finished " @@ -1741,7 +1741,7 @@ static void ntfs_dump_file_attributes(nt /* close all data-structures we used */ ntfs_attr_put_search_ctx(ctx); ntfs_inode_close(inode); - + /* happily exit */ } Index: ntfsmove.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- ntfsmove.c 12 Jun 2005 18:12:56 -0000 1.11 +++ ntfsmove.c 19 Jun 2005 21:09:41 -0000 1.12 @@ -365,7 +365,8 @@ static void dump_runs (u8 *buffer, int l /** * find_unused */ -static runlist * find_unused (ntfs_volume *vol, s64 size, u64 loc, int flags) +static runlist * find_unused (ntfs_volume *vol, s64 size, u64 loc + __attribute__((unused)), int flags __attribute__((unused))) { const int bufsize = 8192; u8 *buffer; @@ -703,7 +704,7 @@ static s64 move_datarun (ntfs_volume *vo Eprintf ("!move_runlist\n"); return -1; } - + // wipe orig runs memset (((u8*)rec) +rec->mapping_pairs_offset, 0, need_to - rec->mapping_pairs_offset); Index: ntfsresize.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -p -r1.65 -r1.66 --- ntfsresize.c 12 Jun 2005 13:44:34 -0000 1.65 +++ ntfsresize.c 19 Jun 2005 21:09:41 -0000 1.66 @@ -116,7 +116,7 @@ struct progress_bar { struct llcn_t { s64 lcn; /* last used LCN for a "special" file/attr type */ s64 inode; /* inode using it */ -}; +}; #define NTFSCK_PROGBAR 0x0001 @@ -508,7 +508,7 @@ static int parse_options(int argc, char static void print_advise(ntfs_volume *vol, s64 supp_lcn) { s64 old_b, new_b, freed_b, old_mb, new_mb, freed_mb; - + old_b = vol->nr_clusters * vol->cluster_size; old_mb = rounded_up_division(old_b, NTFS_MBYTE); @@ -539,7 +539,7 @@ static void print_advise(ntfs_volume *vo else printf("%lld bytes", (long long)freed_b); printf(").\n"); - + printf("Please make a test run using both the -n and -s options " "before real resizing!\n"); } @@ -554,10 +554,10 @@ static void rl_set(runlist *rl, VCN vcn, static int rl_items(runlist *rl) { int i = 0; - + while (rl[i++].length) ; - + return i; } @@ -599,7 +599,7 @@ static int str2unicode(const char *aname *ustr = AT_UNNAMED; *len = 0; } - + return 0; } @@ -608,7 +608,7 @@ static int has_bad_sectors(ntfs_resize_t int len, ret = 0; ntfschar *ustr = NULL; ATTR_RECORD *a = resize->ctx->attr; - + if (resize->ni->mft_no != FILE_BadClus) return 0; @@ -617,13 +617,13 @@ static int has_bad_sectors(ntfs_resize_t if (ustr && ntfs_names_are_equal(ustr, len, (ntfschar*)((u8*)a + le16_to_cpu(a->name_offset)), - a->name_length, 0, NULL, 0)) + a->name_length, 0, NULL, 0)) ret = 1; - + if (ustr != AT_UNNAMED) free(ustr); - return ret; + return ret; } static void collect_resize_constraints(ntfs_resize_t *resize, runlist *rl) @@ -637,35 +637,35 @@ static void collect_resize_constraints(n inode = resize->ni->mft_no; flags = resize->ctx->attr->flags; - + if ((ret = has_bad_sectors(resize)) != 0) { if (ret == -1) perr_exit("Couldn't convert string to Unicode"); err_exit("Your disk has bad sectors (manufacturing faults or " "dying disk).\nThis situation isn't supported yet.\n"); - } + } if (NInoAttrList(resize->ni)) { llcn = &resize->last_multi_mft; if (inode != FILE_MFT && inode != FILE_MFTMirr) supported = 1; - + } else if (flags & ATTR_IS_SPARSE) { llcn = &resize->last_sparse; supported = 1; - + } else if (flags & ATTR_IS_COMPRESSED) { llcn = &resize->last_compressed; supported = 1; - + } else if (inode == FILE_MFT) { llcn = &resize->last_mft; /* First run of $MFT DATA attribute isn't supported yet */ if (resize->ctx->attr->type != AT_DATA || rl->vcn) supported = 1; - + } else if (inode == FILE_MFTMirr) { llcn = &resize->last_mftmir; supported = 1; @@ -678,11 +678,11 @@ static void collect_resize_constraints(n llcn = &resize->last_lcn; supported = 1; } - + if (llcn->lcn < last_lcn) { llcn->lcn = last_lcn; llcn->inode = inode; - } + } if (supported) return; @@ -696,12 +696,12 @@ static void collect_relocation_info(ntfs { s64 lcn, lcn_length, start, len, inode; s64 new_vol_size; /* (last LCN on the volume) + 1 */ - + lcn = rl->lcn; lcn_length = rl->length; inode = resize->ni->mft_no; new_vol_size = resize->new_volume_size; - + if (lcn + lcn_length <= new_vol_size) return; @@ -727,7 +727,7 @@ static void collect_relocation_info(ntfs if (!opt.info || !resize->new_volume_size) return; - + printf("Relocation needed for inode %8lld attr 0x%x LCN 0x%08llx " "length %6lld\n", (long long)inode, (unsigned int)le32_to_cpu(resize->ctx->attr->type), @@ -764,7 +764,7 @@ static void build_lcn_usage_bitmap(ntfs_ printf(corrupt_volume_msg); exit(1); } - + for (i = 0; rl[i].length; i++) { s64 lcn = rl[i].lcn; @@ -788,7 +788,7 @@ static void build_lcn_usage_bitmap(ntfs_ if (k >= (u64)vol->nr_clusters) { long long outsiders = lcn_length - j; - + fsck->outsider += outsiders; if (++fsck->show_outsider <= 10 || opt.verbose) @@ -802,7 +802,7 @@ static void build_lcn_usage_bitmap(ntfs_ if (ntfs_bit_get_and_set(lcn_bitmap->bm, k, 1)) { if (++fsck->multi_ref <= 10 || opt.verbose) printf("Cluster %lld is referenced " - "multiply times!\n", + "multiply times!\n", (long long)k); continue; } @@ -879,7 +879,7 @@ static void compare_bitmaps(ntfs_volume pos + count, a->size); for (i = 0; i < count; i++, pos++) { - s64 cl; /* current cluster */ + s64 cl; /* current cluster */ if (a->bm[pos] == bm[i]) continue; @@ -891,14 +891,14 @@ static void compare_bitmaps(ntfs_volume if (bit == ntfs_bit_get(bm, i * 8 + cl % 8)) continue; - if (!mismatch && !bit && !backup_boot && + if (!mismatch && !bit && !backup_boot && cl == vol->nr_clusters / 2) { /* FIXME: call also boot sector check */ backup_boot = 1; printf("Found backup boot sector in " "the middle of the volume.\n"); - continue; - } + continue; + } if (++mismatch > 10) continue; @@ -942,12 +942,12 @@ static void progress_init(struct progres static void progress_update(struct progress_bar *p, u64 current) { float percent; - + if (!(p->flags & NTFS_PROGBAR)) return; if (p->flags & NTFS_PROGBAR_SUPPRESS) return; - + /* WARNING: don't modify the texts, external tools grep for them */ percent = p->unit * current; if (current != p->stop) { @@ -1028,7 +1028,7 @@ static void build_resize_constrains(ntfs if (!resize->ctx->attr->non_resident) return; - if (!(rl = ntfs_mapping_pairs_decompress(resize->vol, + if (!(rl = ntfs_mapping_pairs_decompress(resize->vol, resize->ctx->attr, NULL))) perr_exit("ntfs_decompress_mapping_pairs"); @@ -1036,7 +1036,7 @@ static void build_resize_constrains(ntfs /* CHECKME: LCN_RL_NOT_MAPPED check isn't needed */ if (rl[i].lcn == LCN_HOLE || rl[i].lcn == LCN_RL_NOT_MAPPED) continue; - + collect_resize_constraints(resize, rl + i); if (resize->shrink) collect_relocation_info(resize, rl + i); @@ -1117,19 +1117,19 @@ static void rl_fixup(runlist **rl) } } -static void replace_attribute_runlist(ntfs_volume *vol, - ntfs_attr_search_ctx *ctx, +static void replace_attribute_runlist(ntfs_volume *vol, + ntfs_attr_search_ctx *ctx, runlist *rl) { int mp_size, l; void *mp; ATTR_RECORD *a = ctx->attr; - + rl_fixup(&rl); if ((mp_size = ntfs_get_size_for_mapping_pairs(vol, rl, 0)) == -1) perr_exit("ntfs_get_size_for_mapping_pairs"); - + if (a->name_length) { u16 name_offs = le16_to_cpu(a->name_offset); u16 mp_offs = le16_to_cpu(a->mapping_pairs_offset); @@ -1147,17 +1147,17 @@ static void replace_attribute_runlist(nt char *next_attr; Vprintf("Enlarging attribute header ...\n"); - + mp_size = (mp_size + 7) & ~7; - + Vprintf("Old mp size : %d\n", l); Vprintf("New mp size : %d\n", mp_size); Vprintf("Bytes in use : %u\n", (unsigned int) le32_to_cpu(ctx->mrec->bytes_in_use)); - + next_attr = (char *)a + le16_to_cpu(a->length); l = mp_size - l; - + Vprintf("Bytes in use new : %u\n", l + (unsigned int) le32_to_cpu(ctx->mrec->bytes_in_use)); Vprintf("Bytes allocated : %u\n", (unsigned int) @@ -1168,7 +1168,7 @@ static void replace_attribute_runlist(nt Vprintf("increase : %d\n", l); Vprintf("shift : %lld\n", (long long)remains_size); - + if (le32_to_cpu(ctx->mrec->bytes_in_use) + l > le32_to_cpu(ctx->mrec->bytes_allocated)) err_exit("Extended record needed (%u > %u), not yet " @@ -1221,9 +1221,9 @@ static void set_max_free_zone(s64 length } } -static int find_free_cluster(struct bitmap *bm, +static int find_free_cluster(struct bitmap *bm, runlist_element *rle, - s64 nr_vol_clusters, + s64 nr_vol_clusters, int hint) { /* FIXME: get rid of this 'static' variable */ @@ -1278,9 +1278,9 @@ static int find_free_cluster(struct bitm return 0; } -static runlist *alloc_cluster(struct bitmap *bm, - s64 items, - s64 nr_vol_clusters, +static runlist *alloc_cluster(struct bitmap *bm, + s64 items, + s64 nr_vol_clusters, int hint) { runlist_element rle; @@ -1300,7 +1300,7 @@ static runlist *alloc_cluster(struct bit rle.length = items; if (find_free_cluster(bm, &rle, nr_vol_clusters, hint) == -1) return NULL; - + rl_size = (runs + 2) * sizeof(runlist_element); if (!(rl = (runlist *)realloc(rl, rl_size))) return NULL; @@ -1313,7 +1313,7 @@ static runlist *alloc_cluster(struct bit } rl_set(rl + runs, vcn, -1LL, 0LL); - + if (runs > 1) { Vprintf("Multi-run allocation: \n"); dump_runlist(rl); @@ -1324,9 +1324,9 @@ static runlist *alloc_cluster(struct bit static int read_all(struct ntfs_device *dev, void *buf, int count) { int i; - + while (count > 0) { - + i = count; if (!NDevReadOnly(dev)) i = dev->d_ops->read(dev, buf, count); @@ -1346,7 +1346,7 @@ static int read_all(struct ntfs_device * static int write_all(struct ntfs_device *dev, void *buf, int count) { int i; - + while (count > 0) { i = count; @@ -1384,9 +1384,9 @@ static int write_mft_record(ntfs_volume static void lseek_to_cluster(ntfs_volume *vol, s64 lcn) { off_t pos; - + pos = (off_t)(lcn * vol->cluster_size); - + if (vol->dev->d_ops->seek(vol->dev, pos, SEEK_SET) == (off_t)-1) perr_exit("seek failed to position %lld", lcn); } @@ -1400,15 +1400,15 @@ static void copy_clusters(ntfs_resize_t for (i = 0; i < len; i++) { lseek_to_cluster(vol, src + i); - + if (read_all(vol->dev, buff, vol->cluster_size) == -1) perr_exit("read_all"); - + lseek_to_cluster(vol, dest + i); - + if (write_all(vol->dev, buff, vol->cluster_size) == -1) perr_exit("write_all"); - + resize->relocations++; progress_update(&resize->progress, resize->relocations); } @@ -1429,13 +1429,13 @@ static void relocate_clusters(ntfs_resiz for (; dest_rl->length; src_lcn += dest_rl->length, dest_rl++) copy_clusters(r, dest_rl->lcn, src_lcn, dest_rl->length); } - + static void rl_split_run(runlist **rl, int run, s64 pos) { runlist *rl_new, *rle_new, *rle; int items, new_size, size_head, size_tail; s64 len_head, len_tail; - + items = rl_items(*rl); new_size = (items + 1) * sizeof(runlist_element); size_head = run * sizeof(runlist_element); @@ -1452,10 +1452,10 @@ static void rl_split_run(runlist **rl, i len_tail = rle->length - (pos - rle->lcn); len_head = rle->length - len_tail; - + rl_set(rle_new, rle->vcn, rle->lcn, len_head); rl_set(rle_new + 1, rle->vcn + len_head, rle->lcn + len_head, len_tail); - + Vprintf("Splitting run at cluster %lld:\n", (long long)pos); dump_run(rle); dump_run(rle_new); dump_run(rle_new + 1); @@ -1503,7 +1503,7 @@ static void relocate_run(ntfs_resize_t * lcn = (*rl + run)->lcn; lcn_length = (*rl + run)->length; new_vol_size = resize->new_volume_size; - + if (lcn + lcn_length <= new_vol_size) return; @@ -1513,11 +1513,11 @@ static void relocate_run(ntfs_resize_t * } hint = (resize->mref == FILE_MFTMirr) ? 1 : 0; - if (!(relocate_rl = alloc_cluster(&resize->lcn_bitmap, lcn_length, + if (!(relocate_rl = alloc_cluster(&resize->lcn_bitmap, lcn_length, new_vol_size, hint))) perr_exit("Cluster allocation failed for %llu:%lld", resize->mref, lcn_length); - + /* FIXME: check $MFTMirr DATA isn't multi-run (or support it) */ Vprintf("Relocate inode %7llu:0x%x:%08lld:0x%08llx --> 0x%08llx\n", (unsigned long long)resize->mref, @@... [truncated message content] |
|
From: Richard R. <fl...@us...> - 2005-06-19 21:09:50
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2642/libntfs Modified Files: attrib.c attrlist.c collate.c gnome-vfs-method.c gnome-vfs-module.c index.c inode.c lcnalloc.c logfile.c mft.c security.c volume.c win32_io.c Log Message: Tidy whitespace: trailing space; <space><tab> at the beginning of lines Fix warnings about sign differences Fix warnings about unused parameters Tidy a few functions that didn't have { on a new line Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.160 retrieving revision 1.161 diff -u -p -r1.160 -r1.161 --- attrib.c 12 Jun 2005 15:23:25 -0000 1.160 +++ attrib.c 19 Jun 2005 21:09:40 -0000 1.161 @@ -428,7 +428,7 @@ int ntfs_attr_map_runlist(ntfs_attr *na, Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x, vcn 0x%llx.\n", __FUNCTION__, (unsigned long long)na->ni->mft_no, na->type, (long long)vcn); - + lcn = ntfs_rl_vcn_to_lcn(na->rl, vcn); if (lcn >= 0 || lcn == LCN_HOLE || lcn == LCN_ENOENT) return 0; @@ -490,7 +490,7 @@ int ntfs_attr_map_whole_runlist(ntfs_att a = NULL; while (1) { runlist_element *rl; - + int not_mapped = 0; if (ntfs_rl_vcn_to_lcn(na->rl, next_vcn) == LCN_RL_NOT_MAPPED) not_mapped = 1; @@ -1219,7 +1219,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons free(buf); } if (rl->vcn < cur_vcn) { - /* + /* * Clusters that replaced hole are merged with * previous run, so we need to update offset. */ @@ -2423,7 +2423,7 @@ int ntfs_attr_can_be_resident(const ntfs int ntfs_make_room_for_attr(MFT_RECORD *m, u8 *pos, u32 size) { u32 biu; - + Dprintf("%s(): Entering for pos 0x%d, size %u.\n", __FUNCTION__, (int)(pos - (u8*)m), (unsigned) size); @@ -2705,7 +2705,7 @@ int ntfs_non_resident_attr_record_add(nt ntfs_attr_put_search_ctx(ctx); errno = err; return -1; - + } offset = (u8*)ctx->attr - (u8*)ctx->mrec; ntfs_attr_put_search_ctx(ctx); @@ -2867,7 +2867,7 @@ int ntfs_attr_record_rm(ntfs_attr_search * added transparently to caller. So, this function should not be called with * @type == AT_ATTRIBUTE_LIST, if you really need to add attribute list call * ntfs_inode_add_attrlist instead. - * + * * On success return opened new ntfs attribute. On error return NULL with errno * set to the error code. */ @@ -2878,7 +2878,7 @@ ntfs_attr *ntfs_attr_add(ntfs_inode *ni, int err, i, offset; ntfs_inode *attr_ni; ntfs_attr *na; - + if (!ni || size < 0 || type == AT_ATTRIBUTE_LIST) { Dprintf("%s(): Invalid arguments passed.\n", __FUNCTION__); errno = EINVAL; @@ -2908,7 +2908,7 @@ ntfs_attr *ntfs_attr_add(ntfs_inode *ni, } /* - * Determine resident or not will be new attribute. We add 8 to size in + * Determine resident or not will be new attribute. We add 8 to size in * non resident case for mapping pairs. */ if (ntfs_attr_can_be_resident(ni->vol, type)) { @@ -3056,7 +3056,7 @@ int ntfs_attr_rm(ntfs_attr *na) { ntfs_attr_search_ctx *ctx; int ret = 0; - + if (!na) { Dprintf("%s(): Invalid arguments passed.\n", __FUNCTION__); errno = EINVAL; @@ -3262,7 +3262,7 @@ int ntfs_attr_record_move_to(ntfs_attr_s } /* Make space and move attribute. */ - if (ntfs_make_room_for_attr(ni->mrec, (u8*) nctx->attr, + if (ntfs_make_room_for_attr(ni->mrec, (u8*) nctx->attr, le32_to_cpu(a->length))) { err = errno; Dprintf("%s(): Couldn't make space for attribute.\n", @@ -3298,7 +3298,7 @@ put_err_out: * * New attribute record holder must have free @extra bytes after moving * attribute record to it. - * + * * If this function succeed, user should reinit search context if he/she wants * use it anymore. * @@ -3319,7 +3319,7 @@ int ntfs_attr_record_move_away(ntfs_attr Dprintf("%s(): Entering for attr 0x%x, inode 0x%llx.\n", __FUNCTION__, (unsigned) le32_to_cpu(ctx->attr->type), (long long) ctx->ntfs_ino->mft_no); - + if (ctx->ntfs_ino->nr_extents == -1) base_ni = ctx->base_ntfs_ino; else @@ -3356,7 +3356,7 @@ int ntfs_attr_record_move_away(ntfs_attr return 0; } - /* + /* * Failed to move attribute to one of the current extents, so allocate * new extent and move attribute to it. */ @@ -3467,7 +3467,7 @@ static int ntfs_attr_make_non_resident(n NAttrClearSparse(na); NAttrClearEncrypted(na); - if (rl) { + if (rl) { /* Now copy the attribute value to the allocated cluster(s). */ bw = ntfs_attr_pwrite(na, 0, le32_to_cpu(a->value_length), (u8*)a + le16_to_cpu(a->value_offset)); @@ -3736,14 +3736,14 @@ static int ntfs_resident_attr_resize(ntf err = ENOSPC; goto put_err_out; } - + /* Add attribute list if not present. */ if (na->ni->nr_extents == -1) ni = na->ni->base_ni; else ni = na->ni; if (!NInoAttrList(ni)) { - ntfs_attr_put_search_ctx(ctx); + ntfs_attr_put_search_ctx(ctx); if (ntfs_inode_add_attrlist(ni)) return -1; return ntfs_resident_attr_resize(na, newsize); @@ -4004,8 +4004,8 @@ retry: Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x.\n", __FUNCTION__, (unsigned long long)na->ni->mft_no, na->type); - - if (na->ni->nr_extents == -1) + + if (na->ni->nr_extents == -1) base_ni = na->ni->base_ni; else base_ni = na->ni; @@ -4058,7 +4058,7 @@ retry: /* If we in the first extent, then set/clean sparse bit. */ if (!a->lowest_vcn) { int sparse; - + sparse = ntfs_rl_sparse(na->rl); if (sparse == -1) { Dprintf("%s(): Bad runlist.\n", __FUNCTION__); @@ -4163,7 +4163,7 @@ retry: * Determine maximum possible length of mapping pairs, * if we shall *not* expand space for mapping pairs. */ - cur_max_mp_size = le32_to_cpu(a->length) - + cur_max_mp_size = le32_to_cpu(a->length) - le16_to_cpu(a->mapping_pairs_offset); /* * Determine maximum possible length of mapping pairs in the @@ -4270,7 +4270,7 @@ retry: Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__); goto put_err_out; } - + /* Deallocate not used attribute extents and return with success. */ if (finished_build) { ntfs_attr_reinit_search_ctx(ctx); @@ -4446,7 +4446,7 @@ static int ntfs_non_resident_attr_shrink errno = err; return -1; } - + /* Truncate the runlist itself. */ if (ntfs_rl_truncate(&na->rl, first_free_vcn)) { err = errno; @@ -4461,7 +4461,7 @@ static int ntfs_non_resident_attr_shrink errno = err; return -1; } - + /* Write mapping pairs for new runlist. */ if (ntfs_attr_update_mapping_pairs(na)) { err = errno; @@ -4472,7 +4472,7 @@ static int ntfs_non_resident_attr_shrink return -1; } } - + /* Get the first attribute record. */ ctx = ntfs_attr_get_search_ctx(na->ni, NULL); if (!ctx) { @@ -4497,7 +4497,7 @@ static int ntfs_non_resident_attr_shrink goto put_err_out; } a = ctx->attr; - + /* Update allocated size only if it is changed. */ if ((na->allocated_size >> vol->cluster_size_bits) != first_free_vcn) { na->allocated_size = first_free_vcn << vol->cluster_size_bits; @@ -4822,7 +4822,7 @@ int ntfs_attr_truncate(ntfs_attr *na, co errno = EINVAL; return -1; } - + if (na->data_size == newsize) return 0; /* Index: attrlist.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrlist.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- attrlist.c 28 Jan 2005 13:48:19 -0000 1.22 +++ attrlist.c 19 Jun 2005 21:09:40 -0000 1.23 @@ -65,7 +65,7 @@ int ntfs_attrlist_need(ntfs_inode *ni) errno = EINVAL; return -1; } - + if (!ni->attr_list) { Dprintf("%s(): Corrput in-memory struct.\n", __FUNCTION__); errno = EINVAL; @@ -255,7 +255,7 @@ int ntfs_attrlist_entry_rm(ntfs_attr_sea "%lld.\n", __FUNCTION__, (long long) ctx->ntfs_ino->mft_no, (unsigned) le32_to_cpu(ctx->al_entry->type), (long long) le64_to_cpu(ctx->al_entry->lowest_vcn)); - + if (!NInoAttrList(base_ni)) { Dprintf("%s(): Attribute list isn't present.\n", __FUNCTION__); errno = ENOENT; @@ -270,7 +270,7 @@ int ntfs_attrlist_entry_rm(ntfs_attr_sea errno = ENOMEM; return -1; } - + /* Reisze $ATTRIBUTE_LIST to new length. */ na = ntfs_attr_open(base_ni, AT_ATTRIBUTE_LIST, NULL, 0); if (!na) { Index: collate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- collate.c 6 Jun 2005 04:26:28 -0000 1.4 +++ collate.c 19 Jun 2005 21:09:40 -0000 1.5 @@ -73,7 +73,7 @@ static int ntfs_collate_file_name(ntfs_v const void *data2, const int data2_len __attribute__((unused))){ int rc; const FILE_NAME_ATTR *fn1, *fn2; - + ntfs_debug("Entering."); fn1 = (const FILE_NAME_ATTR *)data1; fn2 = (const FILE_NAME_ATTR *)data2; Index: gnome-vfs-method.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/gnome-vfs-method.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- gnome-vfs-method.c 9 Sep 2004 07:54:06 -0000 1.4 +++ gnome-vfs-method.c 19 Jun 2005 21:09:40 -0000 1.5 @@ -4,7 +4,7 @@ * * Copyright (c) 2003 Jan Kratochvil <pro...@ja...> * Copyright (c) 2003 Anton Altaparmakov - * + * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2 of the License, or Index: gnome-vfs-module.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/gnome-vfs-module.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- gnome-vfs-module.c 9 Sep 2004 07:54:06 -0000 1.3 +++ gnome-vfs-module.c 19 Jun 2005 21:09:40 -0000 1.4 @@ -4,7 +4,7 @@ * * Copyright (c) 2003 Jan Kratochvil <pro...@ja...> * Copyright (c) 2003 Anton Altaparmakov - * + * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2 of the License, or Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- index.c 5 Jun 2005 23:48:55 -0000 1.4 +++ index.c 19 Jun 2005 21:09:40 -0000 1.5 @@ -269,7 +269,7 @@ done: descend_into_child_node: ntfs_debug("Descend into node with VCN %lld.", vcn); /* Read index allocation block. */ - if (ntfs_attr_mst_pread(na, vcn << vol->cluster_size_bits, 1, + if (ntfs_attr_mst_pread(na, vcn << vol->cluster_size_bits, 1, ictx->block_size, ia) != 1) { ntfs_error(, "Failed to read index allocation."); goto err_out; Index: inode.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- inode.c 8 Jun 2005 18:02:29 -0000 1.54 +++ inode.c 19 Jun 2005 21:09:40 -0000 1.55 @@ -389,7 +389,7 @@ int ntfs_inode_attach_all_extents(ntfs_i /* Inode haven't got attribute list, thus nothing to attach. */ if (!NInoAttrList(ni)) return 0; - + if (!ni->attr_list) { Dprintf("%s(): Corrput in-memory struct.\n", __FUNCTION__); errno = EINVAL; @@ -681,7 +681,7 @@ int ntfs_inode_sync(ntfs_inode *ni) for (i = 0; i < ni->nr_extents; ++i) { ntfs_inode *eni; - + eni = ni->extent_nis[i]; if (NInoTestAndClearDirty(eni)) { if (ntfs_mft_record_write(eni->vol, eni->mft_no, @@ -740,7 +740,7 @@ int ntfs_inode_add_attrlist(ntfs_inode * errno = EEXIST; return -1; } - + al_allocated = 0x40; al_len = 0; al = malloc(al_allocated); @@ -750,7 +750,7 @@ int ntfs_inode_add_attrlist(ntfs_inode * errno = ENOMEM; return -1; } - + /* Form attribute list. */ ctx = ntfs_attr_get_search_ctx(ni, NULL); if (!ctx) { @@ -937,10 +937,10 @@ int ntfs_inode_free_space(ntfs_inode *ni errno = EINVAL; return -1; } - + Dprintf("%s(): Entering for inode 0x%llx, size %d.\n", __FUNCTION__, (long long) ni->mft_no, size); - + freed = (le32_to_cpu(ni->mrec->bytes_allocated) - le32_to_cpu(ni->mrec->bytes_in_use)); Index: lcnalloc.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/lcnalloc.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- lcnalloc.c 5 Nov 2004 20:02:16 -0000 1.30 +++ lcnalloc.c 19 Jun 2005 21:09:40 -0000 1.31 @@ -111,7 +111,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume errno = EINVAL; return NULL; } - + /* Return empty runlist if @count == 0 */ if (!count) { rl = malloc(0x1000); Index: logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- logfile.c 25 Jan 2005 21:41:25 -0000 1.2 +++ logfile.c 19 Jun 2005 21:09:40 -0000 1.3 @@ -504,7 +504,7 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n * Check the restart page for consistency and get a copy of the * complete multi sector transfer deprotected restart page. */ - if (!ntfs_check_and_load_restart_page(log_na, + if (!ntfs_check_and_load_restart_page(log_na, (RESTART_PAGE_HEADER*)buf, pos, !pos ? &rstr1_ph : &rstr2_ph)) { /* Error output already done inside the function. */ Index: mft.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- mft.c 11 Jan 2005 20:28:28 -0000 1.29 +++ mft.c 19 Jun 2005 21:09:40 -0000 1.30 @@ -1472,7 +1472,7 @@ int ntfs_mft_record_free(ntfs_volume *vo u64 mft_no; int err; u16 seq_no, old_seq_no; - + Dprintf("%s(): Entering for inode 0x%llx.\n", __FUNCTION__, (long long) ni->mft_no); Index: security.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/security.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- security.c 23 Apr 2004 10:54:57 -0000 1.6 +++ security.c 19 Jun 2005 21:09:40 -0000 1.7 @@ -92,7 +92,7 @@ char *ntfs_guid_to_mbs(const GUID *guid, return _guid_str; if (!guid_str) free(_guid_str); - errno = EINVAL; + errno = EINVAL; return NULL; } Index: volume.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- volume.c 10 May 2005 16:53:48 -0000 1.44 +++ volume.c 19 Jun 2005 21:09:40 -0000 1.45 @@ -563,7 +563,7 @@ static int ntfs_volume_check_logfile(ntf ntfs_inode *ni; ntfs_attr *na = NULL; int ret, err = 0; - + if ((ni = ntfs_inode_open(vol, FILE_LogFile)) == NULL) { Dprintf("Failed to open inode FILE_LogFile.\n"); errno = EIO; @@ -610,13 +610,13 @@ static ntfs_inode *ntfs_hiberfile_open(n errno = EINVAL; return NULL; } - + ni_root = ntfs_inode_open(vol, FILE_root); if (!ni_root) { Dprintf("Couldn't open the root directory.\n"); return NULL; } - + unicode_len = ntfs_mbstoucs(hiberfile, &unicode, 0); if (unicode_len < 0) { Dperror("Couldn't convert 'hiberfil.sys' to Unicode"); @@ -659,7 +659,7 @@ static int ntfs_volume_check_hiberfile(n ntfs_attr *na = NULL; int i, bytes_read, ret = -1; char *buf = NULL; - + ni = ntfs_hiberfile_open(vol); if (!ni) { if (errno == ENOENT) Index: win32_io.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- win32_io.c 6 Jun 2005 14:51:09 -0000 1.35 +++ win32_io.c 19 Jun 2005 21:09:40 -0000 1.36 @@ -165,7 +165,7 @@ static BOOL WINAPI libntfs_SetFilePointe * * The Find*Volume and SetFilePointerEx functions exist only on win2k+, as such * we cannot just staticly import them. - * + * * This function initializes the imports if the functions do exist and in the * SetFilePointerEx case, we emulate the function ourselves if it is not * present. @@ -257,11 +257,11 @@ static int ntfs_device_win32_simple_open *handle = CreateFile(filename, ntfs_device_unix_status_flags_to_win32(flags), locking ? 0 : (FILE_SHARE_WRITE | FILE_SHARE_READ), - NULL, OPEN_EXISTING, 0, NULL); + NULL, OPEN_EXISTING, 0, NULL); if (*handle == INVALID_HANDLE_VALUE) { errno = ntfs_w32error_to_errno(GetLastError()); Dprintf("CreateFile(%s) failed.\n", filename); - return -1; + return -1; } return 0; } @@ -512,7 +512,7 @@ static __inline__ int ntfs_device_win32_ if (ntfs_device_win32_simple_open_file(filename, &handle, flags, FALSE)) { /* open error */ - return -1; + return -1; } /* fill fd */ fd->handle = handle; @@ -545,7 +545,7 @@ static __inline__ int ntfs_device_win32_ if ((err = ntfs_device_win32_simple_open_file(filename, &handle, flags, TRUE))) { /* open error */ - return err; + return err; } /* store the drive geometry */ ntfs_device_win32_getgeo(handle, fd); @@ -798,7 +798,7 @@ static int ntfs_device_win32_open_partit drive_id); CloseHandle(handle); errno = ENODEV; - return -1; + return -1; } } @@ -1257,7 +1257,7 @@ static s64 ntfs_device_win32_write(struc } } /* Copy the data to be written into @alignedbuffer. */ - memcpy(alignedbuffer + ofs, b, count); + memcpy(alignedbuffer + ofs, b, count); } if (fd->vol_handle != INVALID_HANDLE_VALUE && old_pos < fd->geo_size) { s64 vol_to_write = fd->geo_size - old_pos; @@ -1379,8 +1379,8 @@ static __inline__ int ntfs_win32_blksszg DWORD bytesReturned; DISK_GEOMETRY dg; - if (DeviceIoControl(fd->handle, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, - &dg, sizeof(DISK_GEOMETRY), &bytesReturned, NULL)) { + if (DeviceIoControl(fd->handle, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, + &dg, sizeof(DISK_GEOMETRY), &bytesReturned, NULL)) { /* success */ *argp = dg.BytesPerSector; return 0; |
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2642/include/ntfs Modified Files: attrib.h attrlist.h collate.h endians.h gnome-vfs-method.h gnome-vfs-module.h index.h inode.h layout.h Log Message: Tidy whitespace: trailing space; <space><tab> at the beginning of lines Fix warnings about sign differences Fix warnings about unused parameters Tidy a few functions that didn't have { on a new line Index: attrib.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrib.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- attrib.h 22 Dec 2004 16:34:02 -0000 1.16 +++ attrib.h 19 Jun 2005 21:09:40 -0000 1.17 @@ -286,7 +286,7 @@ extern int ntfs_attr_can_be_non_resident const ATTR_TYPES type); extern int ntfs_attr_can_be_resident(const ntfs_volume *vol, const ATTR_TYPES type); - + extern int ntfs_make_room_for_attr(MFT_RECORD *m, u8 *pos, u32 size); extern int ntfs_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type, @@ -304,7 +304,7 @@ extern int ntfs_attr_record_resize(MFT_R extern int ntfs_resident_attr_value_resize(MFT_RECORD *m, ATTR_RECORD *a, const u32 newsize); - + extern int ntfs_attr_record_move_to(ntfs_attr_search_ctx *ctx, ntfs_inode *ni); extern int ntfs_attr_record_move_away(ntfs_attr_search_ctx *ctx, int extra); Index: attrlist.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrlist.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- attrlist.h 17 Oct 2004 15:56:39 -0000 1.9 +++ attrlist.h 19 Jun 2005 21:09:40 -0000 1.10 @@ -40,7 +40,8 @@ extern int ntfs_attrlist_entry_rm(ntfs_a * * This function cannot fail. */ -static __inline__ void ntfs_attrlist_mark_dirty(ntfs_inode *ni) { +static __inline__ void ntfs_attrlist_mark_dirty(ntfs_inode *ni) +{ if (ni->nr_extents == -1) NInoAttrListSetDirty(ni->base_ni); else Index: collate.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/collate.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- collate.h 4 Jun 2005 00:58:01 -0000 1.1 +++ collate.h 19 Jun 2005 21:09:40 -0000 1.2 @@ -29,7 +29,8 @@ #define NTFS_COLLATION_ERROR -2 -static inline BOOL ntfs_is_collation_rule_supported(COLLATION_RULES cr) { +static inline BOOL ntfs_is_collation_rule_supported(COLLATION_RULES cr) +{ int i; /* Index: endians.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/endians.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- endians.h 30 Sep 2004 15:00:31 -0000 1.10 +++ endians.h 19 Jun 2005 21:09:40 -0000 1.11 @@ -154,9 +154,9 @@ #define le32_to_cpu(x) (u32)__le32_to_cpu((u32)(x)) #define le64_to_cpu(x) (u64)__le64_to_cpu((u64)(x)) -#define le16_to_cpup(x) (u16)__le16_to_cpu(*(u16*)(x)) -#define le32_to_cpup(x) (u32)__le32_to_cpu(*(u32*)(x)) -#define le64_to_cpup(x) (u64)__le64_to_cpu(*(u64*)(x)) +#define le16_to_cpup(x) (u16)__le16_to_cpu(*(const u16*)(x)) +#define le32_to_cpup(x) (u32)__le32_to_cpu(*(const u32*)(x)) +#define le64_to_cpup(x) (u64)__le64_to_cpu(*(const u64*)(x)) /* Signed from LE to CPU conversion. */ Index: gnome-vfs-method.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/gnome-vfs-method.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- gnome-vfs-method.h 29 Feb 2004 14:09:45 -0000 1.3 +++ gnome-vfs-method.h 19 Jun 2005 21:09:40 -0000 1.4 @@ -4,7 +4,7 @@ * * Copyright (c) 2002-2003 Jan Kratochvil <pro...@ja...> * Copyright (c) 2000-2004 Anton Altaparmakov - * + * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2 of the License, or Index: gnome-vfs-module.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/gnome-vfs-module.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- gnome-vfs-module.h 29 Feb 2004 14:09:45 -0000 1.3 +++ gnome-vfs-module.h 19 Jun 2005 21:09:40 -0000 1.4 @@ -4,7 +4,7 @@ * * Copyright (c) 2003 Jan Kratochvil <pro...@ja...> * Copyright (c) 2000-2004 Anton Altaparmakov - * + * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2 of the License, or Index: index.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/index.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- index.h 4 Jun 2005 15:20:00 -0000 1.2 +++ index.h 19 Jun 2005 21:09:40 -0000 1.3 @@ -58,7 +58,7 @@ * If @is_in_root is FALSE, @entry is in the index allocation attribute and @ia * and @ia_vcn point to the index allocation block and VCN where it's placed, * respectively. @ir and @actx are NULL in this case. @ia_na is opened - * INDEX_ALLOCTAION attribute. @ia_dirty is TRUE if index block was changed and + * INDEX_ALLOCTAION attribute. @ia_dirty is TRUE if index block was changed and * FALSE otherwise. * * To obtain a context call ntfs_index_ctx_get(). Index: inode.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/inode.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- inode.h 5 Jun 2005 14:55:08 -0000 1.12 +++ inode.h 19 Jun 2005 21:09:40 -0000 1.13 @@ -152,7 +152,7 @@ extern int ntfs_inode_close(ntfs_inode * extern ntfs_inode *ntfs_extent_inode_open(ntfs_inode *base_ni, const MFT_REF mref); - + extern int ntfs_inode_attach_all_extents(ntfs_inode *ni); /** @@ -165,7 +165,8 @@ extern int ntfs_inode_attach_all_extents * * This function cannot fail. */ -static __inline__ void ntfs_inode_mark_dirty(ntfs_inode *ni) { +static __inline__ void ntfs_inode_mark_dirty(ntfs_inode *ni) +{ NInoSetDirty(ni); if (ni->nr_extents == -1) NInoSetDirty(ni->base_ni); Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- layout.h 12 Jun 2005 15:23:25 -0000 1.19 +++ layout.h 19 Jun 2005 21:09:40 -0000 1.20 @@ -2219,7 +2219,7 @@ typedef struct { // the key_length is zero, then the vcn immediately // follows the INDEX_ENTRY_HEADER. Regardless of // key_length, the address of the 8-byte boundary - // alligned vcn of INDEX_ENTRY{_HEADER} *ie is given by + // aligned vcn of INDEX_ENTRY{_HEADER} *ie is given by // (char*)ie + le16_to_cpu(ie*)->length) - sizeof(VCN), // where sizeof(VCN) can be hardcoded as 8 if wanted. */ } __attribute__ ((__packed__)) INDEX_ENTRY; |
|
From: Anton A. <an...@us...> - 2005-06-19 13:20:54
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv756/ntfsprogs Modified Files: .cvsignore Log Message: Add more things to .cvsignore files. Index: .cvsignore =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 9 Jun 2005 09:05:30 -0000 1.1 +++ .cvsignore 19 Jun 2005 13:20:40 -0000 1.2 @@ -1,4 +1,5 @@ .deps +.libs Makefile mkntfs ntfscat |
|
From: Anton A. <an...@us...> - 2005-06-19 13:20:54
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv756/libntfs Modified Files: .cvsignore Log Message: Add more things to .cvsignore files. Index: .cvsignore =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 9 Jun 2005 09:05:30 -0000 1.1 +++ .cvsignore 19 Jun 2005 13:20:41 -0000 1.2 @@ -2,6 +2,7 @@ .libs Makefile libntfs-gnomevfs.8 +libntfs-gnomevfs.la libntfs.conf libntfs.la *.lo |
