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: Anton A. <an...@us...> - 2001-03-06 02:09:19
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv12694/libntfs
Modified Files:
attrib.c volume.c
Log Message:
Allow variable length upcase table.
Progressing on find_next_attr().
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** attrib.c 2001/03/05 03:04:40 1.4
--- attrib.c 2001/03/06 02:10:55 1.5
***************
*** 137,174 ****
* @attr: last found attribute record inside mft record to search
* @type: attribute type to find
! * @name: attribute name to find (optional)
! * @ic: ignore case of @name (boolean)
* @val: attribute value to find (optional, resident attributes only)
! * @len: attribute value length (only present if @val present)
*
! * Decsription...
*
! * find_attr() takes an attribute record header @a as a parameter, which must
! * be the address of a pointer into an mft record. It specifies the attribute
! * at which to begin the search, i.e. it is useful as a search context in
! * attribute enumerations.
*/
ATTR_RECORD *find_next_attr(const ntfs_volume *vol, const ATTR_RECORD **attr,
const ATTR_TYPES type, const wchar_t *name,
! const __u8 ic, const __u8 *val, const __u32 len)
{
ATTR_RECORD a;
void *mft_rec;
- if (!vol || !attr || !*attr) {
#ifdef DEBUG
puts("Sanity checks failed in find_attr()!");
- #endif
return NULL;
}
a = *attr;
/*
* Calculate the beginning of the mft record, assuming that it is
* aligned on mft_record_size boundary. In the kernel, this is
! * guaranteed as it is either on a page (cache page) boundary (and a
* page is larger than an mft record in any case) or it is inside a
! * page (cache page) on an mft_record_size boundary (by definition).
*/
! mft_rec = (void*)(p2n(a) & (vol->mft_record_size - 1));
/*
* Iterate over attributes in mft record starting at @attr.
--- 137,189 ----
* @attr: last found attribute record inside mft record to search
* @type: attribute type to find
! * @name: attribute name to find (optional, i.e. NULL means don't care)
! * @ic: ignore case of @name (boolean, only present if @name present)
* @val: attribute value to find (optional, resident attributes only)
! * @val_len: attribute value length
*
! * find_next_attr() takes an attribute record @attr as a parameter, which must
! * be the address of a pointer into an mft record, and searches the mft record,
! * beginning at @attr, for an attribute of @type and optionally @name. If @ic
! * is TRUE, the @name comparisson is not case sensitive. It is case sensitive
! * if @ic is FALSE. Note: When @name is present, @val is ignored.
*
! * If @name is not present (NULL), no attribute name checking is performed at
! * all. Thus, to find an unnamed attribute, specify a @name pointing to a zero
! * length string. Then, the resident attribute value @val is looked for, if
! * present. Note: If @val is not present (NULL), @val_len is undefined.
! *
! * Warning: Never use @val when looking for attribute types which can be
! * non-resident as this most likely will result in a crash!
! *
! * In userspace consider passing in the MFT_RECORD* to do the checks,
! * as there is no way we can assume alignment on mft_record_size boundaries.
! * (Unless we write our own memory allocator, of course...)
! *
! * Note: This function's code paths are optimised to be shortest and most direct
! * for the most common cases of calling. Don't mess with it unless you find a
! * bug or actually do some profiling and prove a code path inefficient.
*/
ATTR_RECORD *find_next_attr(const ntfs_volume *vol, const ATTR_RECORD **attr,
const ATTR_TYPES type, const wchar_t *name,
! const __u8 ic, const __u8 *val, const __u32 val_len)
{
ATTR_RECORD a;
void *mft_rec;
#ifdef DEBUG
+ if (!vol || !attr || !*attr) {
puts("Sanity checks failed in find_attr()!");
return NULL;
}
+ #endif
a = *attr;
/*
* Calculate the beginning of the mft record, assuming that it is
* aligned on mft_record_size boundary. In the kernel, this is
! * guaranteed as it is either on a pagecache page boundary (and a
* page is larger than an mft record in any case) or it is inside a
! * pagecache page on an mft_record_size boundary (by definition).
*/
! mft_rec = p2n(a) & (vol->mft_record_size - 1);
/*
* Iterate over attributes in mft record starting at @attr.
***************
*** 176,250 ****
* code does not get indented out of the screen... (AIA)
*/
! search_loop:
*attr = a;
/* We catch $END with this more general check, too... */
if (le32_to_cpu(a->type) > le32_to_cpu(type))
goto not_found;
if (!a->length)
- goto file_corrupt;
- if (a->type == type)
- goto attr_type_matches;
- do_next:
- a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length));
- if (a < mft_rec || a > (char*)mft_rec + vol->mft_record_size)
goto file_corrupt;
! goto search_loop;
! attr_type_matches:
! /* If want an unnamed attribute, check if current one
! is unnamed and if so we have found it! */
! if (!n) {
! if (!a->name_length) {
! /* FIXME: Check the value first! */
! return a;
! }
! /* If we want a named attribute, check that the string
! length is equal and if so, compare the two strings
! and if they match, we have found it! */
! } else if (a->name_length && a->name_length == wcslen(n)) {
! /* Sanity check. */
! if (a->name_length * 2 + le16_to_cpu(a->name_offset)
! > le32_to_cpu(a->length)) {
! #ifdef DEBUG
! puts("Warning: Encountered out of "
! "bounds attribute name length in "
! "find_attr()!");
! #endif
! /* Even though this one is illegal,
! maybe it wasn't the right one, so
! continue with the search (i.e. don't
! return NULL).
! FIXME: Shouldn't we doing a hotfix
! here, i.e. truncate the name to the
! indicated size or change the
! indicated size, whichever makes more
! sense? */
! /* FIXME: Should we really be case sensitive?
! If not, use ntfs_wcsncasecmp(). */
! } else if (!ntfs_wcsncmp(n, (wchar_t*)((char*)a +
! le16_to_cpu(a->name_offset))),
! a->name_length) {
! /* FIXME: Check the value. */
return a;
}
}
not_found:
! #ifdef DEBUG
! if (name)
! printf("find_attr(): Named attribute 0x%x (\"%s\") not "
! "found.\n", type, name);
! else
! printf("find_attr(): Unnamed attribute 0x%x not found.\n",
! type);
! #endif
! return NULL;
file_corrupt:
#ifdef DEBUG
! printf(stderr, "find_attr(): File is corrupt. Run ntfsck or chkdsk.\n");
#endif
! return NULL;
}
-
-
-
/*
--- 191,271 ----
* code does not get indented out of the screen... (AIA)
*/
! goto search_loop;
! do_next:
! a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length));
! if (a < mft_rec || a > (char*)mft_rec + vol->mft_record_size)
! goto file_corrupt;
*attr = a;
+ search_loop:
/* We catch $END with this more general check, too... */
if (le32_to_cpu(a->type) > le32_to_cpu(type))
goto not_found;
if (!a->length)
goto file_corrupt;
! if (a->type != type)
! goto do_next;
! /* If no @name is specified, check for @val. */
! if (!name) {
! register int rv;
! /* If no @val specified, we are done. */
! if (!val) {
! found_it:
return a;
}
+ /*
+ * Compare the values. If they don't match, but the value we are
+ * looking for collates behind the current attribute's value,
+ * there might be another attribute of the same type, that does
+ * have a matching attribute value, so we continue searching.
+ */
+ rv = memcmp(val, (char*)a + le16_to_cpu(a->value_offset),
+ min(val_len, le32_to_cpu(a->value_length)));
+ if (!rv) {
+ register __u32 avl = le32_to_cpu(a->value_length);
+ if (val_len == avl)
+ goto found_it;
+ if (val_len > avl)
+ goto do_next;
+ } else if (rv > 0)
+ goto do_next;
+ goto not_found;
}
+ /*
+ * Compare the attribute names and if they match, we are finished.
+ * If they don't match, continue searching.
+ */
+ if (ic) { /* Case sensitive. */
+ if (!ntfs_wcsncmp(name, (wchar_t*)((char*)a +
+ le16_to_cpu(a->name_offset)),
+ a->name_length))
+ goto found_it;
+ } else { /* Ignore case. */
+ if (!ntfs_wcsncasecmp(name, (wchar_t*)((char*)a +
+ le16_to_cpu(a->name_offset)),
+ a->name_length, vol->upcase, vol->upcase_len))
+ goto found_it;
+ }
+ /* Attribute names didn't match on first try... */
+ /*
+ * Note: Attribute names are considered invalid if they contain any of the
+ * following characters: '"', '*', '<', '>', '?'. Or at least attribute name
+ * collation function will act on them.
+ */
+ // If case insensitive collation of names collates @name before a->name,
+ goto not_found;
+ // else if it returned that the strings are not equal
+ goto do_next;
+ // else if case sensitive collation of names doesn't collate @name
+ // before a->name
+ goto do_next;
not_found:
! return NULL;
file_corrupt:
#ifdef DEBUG
! printf(stderr,
! "find_next_attr(): File is corrupt. Run ntfsck or chkdsk.\n");
#endif
! goto not_found;
}
/*
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** volume.c 2001/03/05 03:04:40 1.5
--- volume.c 2001/03/06 02:10:55 1.6
***************
*** 372,388 ****
l = get_attribute_value_length(a);
if (!l) {
! puts(OK);
puts("Error: $DATA in $UpCase has zero length! T'is weird!");
errno = EIO;
goto error_exit;
}
! /* The upcase table has by definition to have a length equal to
! 65536 2-byte Unicode characters. */
! if (l != 65536 * 2) {
! puts(OK);
! puts("Error: Upcase table (in $UpCase) has incorrect length!");
errno = EINVAL;
goto error_exit;
}
vol->upcase = (__u16*)malloc(l);
if (!vol->upcase) {
--- 372,391 ----
l = get_attribute_value_length(a);
if (!l) {
! puts(FAILED);
puts("Error: $DATA in $UpCase has zero length! T'is weird!");
errno = EIO;
goto error_exit;
}
! /* Note: Normally, the upcase table has a length equal to 65536
! * 2-byte Unicode characters but allow for different cases, so no
! * checks done. Just check we don't overflow 32-bits worth of Unicode
! * characters. */
! if (l & ~0x1ffffffffULL) {
! puts(FAILED);
! puts("Error: Upcase table is too big (max 32-bit allowed).");
errno = EINVAL;
goto error_exit;
}
+ vol->upcase_len = l >> 1;
vol->upcase = (__u16*)malloc(l);
if (!vol->upcase) {
|
|
From: Anton A. <an...@us...> - 2001-03-06 02:09:19
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv12694/include Modified Files: volume.h Log Message: Allow variable length upcase table. Progressing on find_next_attr(). Index: volume.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** volume.h 2001/01/30 12:55:21 1.3 --- volume.h 2001/03/06 02:10:55 1.4 *************** *** 87,90 **** --- 87,92 ---- 2-byte Unicode characters. Obtained from FILE_$UpCase. */ + __u32 upcase_len; /* Length in Unicode characters of the + upcase table. */ __u8 mft_records_per_cluster; /* The number of mft records that fit into one cluster or 0 if clusters |
|
From: Anton A. <an...@us...> - 2001-03-05 03:35:47
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv11908 Modified Files: ntfs_unicode.h Log Message: Fixed include. Index: ntfs_unicode.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfs_unicode.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ntfs_unicode.h 2001/03/05 03:31:08 1.1 --- ntfs_unicode.h 2001/03/05 03:37:18 1.2 *************** *** 24,34 **** #define NTFS_UNICODE_H - #include "endians.h" - #include "wchar.h" /* ! * This would be defining wchar_t in the kernel, but stdio.h defines it for * userspace. */ /* #include <linux/nls.h> */ /** --- 24,36 ---- #define NTFS_UNICODE_H /* ! * nls.h would be defining wchar_t in the kernel, but stdio.h defines it for * userspace. */ /* #include <linux/nls.h> */ + #include <stdio.h> + #include <wchar.h> + + #include "endians.h" /** |
|
From: Anton A. <an...@us...> - 2001-03-05 03:29:35
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv11151/libntfs
Added Files:
ntfs_unicode.c
Log Message:
Added ntfs specific Unicode wcsncmp and wcsncasecmp functionality.
--- NEW FILE ---
/*
* ntfs_unicode.c - Unicode string handling. Part of the Linux-NTFS project.
*
* Copyright (c) 2000,2001 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
* (at your option) any later version.
*
* This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "ntfs_unicode.h"
/**
* ntfs_wcsncmp - compare two little endian Unicode strings
* @s1: first string
* @s2: second string
* @n: maximum unicode characters to compare
*
* Compare the first @n characters of the Unicode strings @s1 and @s2,
* The strings in little endian format and appropriate le16_to_cpu()
* conversion is performed on non-little endian machines.
*
* The function returns an integer less than, equal to, or greater than zero
* if @s1 (or the first @n Unicode characters thereof) is found, respectively,
* to be less than, to match, or be greater than @s2.
*/
int ntfs_wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n)
{
wchar_t c1, c2;
size_t i;
for (i = 0; i < n; ++i) {
c1 = le16_to_cpu( s1[i] );
c2 = le16_to_cpu( s2[i] );
if (c1 < c2)
return -1;
if (c1 > c2)
return 1;
if (!c1)
break;
}
return 0;
}
/**
* ntfs_wcsncasecmp - compare two little endian Unicode strings, ignoring case
* @s1: first string
* @s2: second string
* @n: maximum unicode characters to compare
* @upcase: upcase table
* @upcase_size: upcase table size in Unicode characters
*
* Compare the first @n characters of the Unicode strings @s1 and @s2,
* ignoring case. The strings in little endian format and appropriate
* le16_to_cpu() conversion is performed on non-little endian machines.
*
* Each character is uppercased using the @upcase table before the comparison.
*
* The function returns an integer less than, equal to, or greater than zero
* if @s1 (or the first @n Unicode characters thereof) is found, respectively,
* to be less than, to match, or be greater than @s2.
*/
int ntfs_wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n,
const wchar_t *upcase, const __u32 upcase_size)
{
wchar_t c1, c2;
size_t i;
#ifdef DEBUG
if (!s1 || !s2 || !upcase) {
printf(stderr, "ntfs_wcsncasecmp() received NULL pointer!\n");
exit(1);
}
#endif
for (i = 0; i < n; ++i) {
if ((c1 = le16_to_cpu(s1[i])) < upcase_size)
c1 = le16_to_cpu(upcase[c1]);
if ((c2 = le16_to_cpu(s2[i])) < upcase_size)
c2 = le16_to_cpu(upcase[c2]);
if (c1 < c2)
return -1;
if (c1 > c2)
return 1;
if (!c1)
break;
}
return 0;
}
#endif /* defined NTFS_UNICODE_H */
|
|
From: Anton A. <an...@us...> - 2001-03-05 03:29:35
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv11151/include Added Files: ntfs_unicode.h Log Message: Added ntfs specific Unicode wcsncmp and wcsncasecmp functionality. --- NEW FILE --- /* * ntfs_unicode.h - Exports for unicode string handling. Part of the * Linux-NTFS project. * * Copyright (c) 2000,2001 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 * (at your option) any later version. * * This program/include file is distributed in the hope that it will be * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program (in the main directory of the Linux-NTFS * distribution in the file COPYING); if not, write to the Free Software * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef NTFS_UNICODE_H #define NTFS_UNICODE_H #include "endians.h" #include "wchar.h" /* * This would be defining wchar_t in the kernel, but stdio.h defines it for * userspace. */ /* #include <linux/nls.h> */ /** * ntfs_wcsncmp - compare two little endian Unicode strings * @s1: first string * @s2: second string * @n: maximum unicode characters to compare * * Compare the first @n characters of the Unicode strings @s1 and @s2, * The strings in little endian format and appropriate le16_to_cpu() * conversion is performed on non-little endian machines. * * The function returns an integer less than, equal to, or greater than zero * if @s1 (or the first @n Unicode characters thereof) is found, respectively, * to be less than, to match, or be greater than @s2. */ int ntfs_wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n); /** * ntfs_wcsncasecmp - compare two little endian Unicode strings, ignoring case * @s1: first string * @s2: second string * @n: maximum unicode characters to compare * @upcase: upcase table * @upcase_size: upcase table size in Unicode characters * * Compare the first @n characters of the Unicode strings @s1 and @s2, * ignoring case. The strings in little endian format and appropriate * le16_to_cpu() conversion is performed on non-little endian machines. * * Each character is uppercased using the @upcase table before the comparison. * * The function returns an integer less than, equal to, or greater than zero * if @s1 (or the first @n Unicode characters thereof) is found, respectively, * to be less than, to match, or be greater than @s2. */ int ntfs_wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n, const wchar_t *upcase, const __u32 upcase_size); #endif /* defined NTFS_UNICODE_H */ |
|
From: Anton A. <an...@us...> - 2001-03-05 03:13:39
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv4746
Modified Files:
attrib.h logfile.h mft.h
Log Message:
Forgot a few...
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** attrib.h 2001/03/05 02:45:35 1.13
--- attrib.h 2001/03/05 03:15:08 1.14
***************
*** 103,108 ****
/*
* The flags (32-bit) describing attribute properties in the attribute
! * definition structure. FIXME: This information is not certain and probably
! * incomplete. (AIA)
*/
typedef enum {
--- 103,111 ----
/*
* The flags (32-bit) describing attribute properties in the attribute
! * definition structure. FIXME: This information is from Regis's information
! * and according to him it is not certain and probably incomplete.
! * Empirically, it would seem that 0x40 means that it must be resident,
! * 0x01 is never encountered on NT4/W2k, 0x2 would be indexable as only
! * $FILENAME has 0x2 set and no idea what 0x80 means. (AIA)
*/
typedef enum {
***************
*** 1378,1382 ****
*/
typedef struct {
! NTFS_RECORD_HEADER; /* Magic is "INDX". */
__s64 lsn; /* $LogFile sequence number of the last
modification of this index block. */
--- 1381,1385 ----
*/
typedef struct {
! NTFS_RECORD; /* Magic is "INDX". */
__s64 lsn; /* $LogFile sequence number of the last
modification of this index block. */
***************
*** 1737,1741 ****
* to find_next_attr_in_attr_list().
*/
! extern __inline__ ATTR_RECORD_HEADER *find_first_attr_in_attr_list(
const ntfs_volume *v,
const MFT_RECORD *m,
--- 1740,1744 ----
* to find_next_attr_in_attr_list().
*/
! extern __inline__ ATTR_RECORD *find_first_attr_in_attr_list(
const ntfs_volume *v,
const MFT_RECORD *m,
***************
*** 1772,1776 ****
* @ctx = NULL. This is in fact what find_first_attr_in_attr_list() does.
*/
! ATTR_RECORD_HEADER *find_next_attr_in_attr_list(
const ntfs_volume *v,
const MFT_RECORD *m,
--- 1775,1779 ----
* @ctx = NULL. This is in fact what find_first_attr_in_attr_list() does.
*/
! ATTR_RECORD *find_next_attr_in_attr_list(
const ntfs_volume *v,
const MFT_RECORD *m,
***************
*** 1806,1811 ****
* returned, no matter what it is.
*/
! extern __inline__ ATTR_RECORD_HEADER *find_first_attr(
! const ntfs_volume *v,
const MFT_RECORD *b,
const ATTR_TYPES t,
--- 1809,1813 ----
* returned, no matter what it is.
*/
! extern __inline__ ATTR_RECORD *find_first_attr(const ntfs_volume *v,
const MFT_RECORD *b,
const ATTR_TYPES t,
***************
*** 1847,1851 ****
* returned, no matter what it is.
*/
! ATTR_RECORD_HEADER *find_next_attr(const ntfs_volume *v,
const MFT_RECORD *b,
const ATTR_TYPES t,
--- 1849,1853 ----
* returned, no matter what it is.
*/
! ATTR_RECORD *find_next_attr(const ntfs_volume *v,
const MFT_RECORD *b,
const ATTR_TYPES t,
Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/logfile.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** logfile.h 2001/03/02 15:03:56 1.4
--- logfile.h 2001/03/05 03:15:08 1.5
***************
*** 56,60 ****
*/
typedef struct {
! NTFS_RECORD_HEADER ntfs;/* The magic is "RSTR". */
__u64 chkdsk_lsn; /* The check disk log file sequence number for
this restart page. Only used when the
--- 56,60 ----
*/
typedef struct {
! NTFS_RECORD; /* The magic is "RSTR". */
__u64 chkdsk_lsn; /* The check disk log file sequence number for
this restart page. Only used when the
***************
*** 162,166 ****
*/
typedef struct {
! NTFS_RECORD_HEADER ntfs; /* The magic is "RCRD". */
union {
__u64 last_lsn;
--- 162,166 ----
*/
typedef struct {
! NTFS_RECORD; /* The magic is "RCRD". */
union {
__u64 last_lsn;
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mft.h 2001/03/05 02:45:35 1.7
--- mft.h 2001/03/05 03:15:08 1.8
***************
*** 143,147 ****
typedef struct {
/*Ofs*/
! /* 0*/ NTFS_RECORD_HEADER ntfs;/* Usually the magic is "FILE". */
/* 8*/ __s64 lsn; /* $LogFile sequence number for this record.
Changed every time the record is modified. */
--- 143,147 ----
typedef struct {
/*Ofs*/
! /* 0*/ NTFS_RECORD; /* Usually the magic is "FILE". */
/* 8*/ __s64 lsn; /* $LogFile sequence number for this record.
Changed every time the record is modified. */
|
|
From: Anton A. <an...@us...> - 2001-03-05 03:03:09
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv28833
Modified Files:
attrib.c bootsect.c disk_io.c mft.c ntfs_rec.c volume.c
Log Message:
Corresponding changes to the library.
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** attrib.c 2001/03/02 15:05:53 1.3
--- attrib.c 2001/03/05 03:04:40 1.4
***************
*** 20,24 ****
*/
- #include <wchar.h>
#include <stddef.h>
#include <stdio.h>
--- 20,23 ----
***************
*** 28,38 ****
#include <stdlib.h>
- /*
- * This would be defining wchar_t in the kernel, but stdio.h defines it for
- * userspace. FIXME: I have been a bit slack and defining __u16 instead of
- * wchar_t in most places. This will need fixing at some point. (AIA)
- */
- /* #include <linux/nls.h> */
-
#include "attrib.h"
#include "mft.h"
--- 27,30 ----
***************
*** 40,43 ****
--- 32,36 ----
#include "disk_io.h"
#include "volume.h"
+ #include "ntfs_unicode.h"
/*
***************
*** 46,59 ****
#define p2n(p) ((ptrdiff_t)((ptrdiff_t*)(p)))
! ATTRIBUTE_RECORD_HEADER *find_next_attr_in_attr_list(
const ntfs_volume *v,
! const MFT_RECORD_HEADER *m,
! const ATTRIBUTE_RECORD_HEADER *al,
! const ATTRIBUTE_TYPE t,
const wchar_t *n,
FIND_ATTR_CTX_FLAGS *ctx)
{
__u64 alen;
! ATTRIBUTE_LIST_ENTRY *ale, *aend;
int got_there = 0;
--- 39,52 ----
#define p2n(p) ((ptrdiff_t)((ptrdiff_t*)(p)))
! ATTR_RECORD *find_next_attr_in_attr_list(
const ntfs_volume *v,
! const MFT_RECORD *m,
! const ATTR_RECORD *al,
! const ATTR_TYPES t,
const wchar_t *n,
FIND_ATTR_CTX_FLAGS *ctx)
{
__u64 alen;
! ATTR_LIST_ENTRY *ale, *aend;
int got_there = 0;
***************
*** 73,92 ****
alen = get_attribute_value_length(al);
if (!al->non_resident) {
! #define RA(a) ((RESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
! astart = (ATTRIBUTE_LIST_ENTRY*)((char*)al +
! le16_to_cpu(RA(al)->value_offset));
! #undef RA
} else {
! #define NA(a) ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
! if (!(astart = (ATTRIBUTE_LIST_ENTRY*)malloc(alen)))
goto ret_now;
if (get_attribute_value(v, al, astart) != alen)
goto error_ret;
- #undef NA
}
/* Set aend to first byte after the attribute list. */
! aend = (ATTRIBUTE_LIST_ENTRY*)((char*)astart + alen);
/* Iterate over all attribute list entries looking for the right one. */
! for (ale = astart; ale < aend; ale = (ATTRIBUTE_LIST_ENTRY*)
((char*)ale + le16_to_cpu(ale->length))) {
/* If we encounter lowest_vcn != 0 then instance is 0 and we
--- 66,81 ----
alen = get_attribute_value_length(al);
if (!al->non_resident) {
! astart = (ATTR_LIST_ENTRY*)((char*)al +
! le16_to_cpu(al->value_offset));
} else {
! if (!(astart = (ATTR_LIST_ENTRY*)malloc(alen)))
goto ret_now;
if (get_attribute_value(v, al, astart) != alen)
goto error_ret;
}
/* Set aend to first byte after the attribute list. */
! aend = (ATTR_LIST_ENTRY*)((char*)astart + alen);
/* Iterate over all attribute list entries looking for the right one. */
! for (ale = astart; ale < aend; ale = (ATTR_LIST_ENTRY*)
((char*)ale + le16_to_cpu(ale->length))) {
/* If we encounter lowest_vcn != 0 then instance is 0 and we
***************
*** 127,135 ****
}
! __inline__ ATTRIBUTE_RECORD_HEADER *find_first_attr_in_attr_list(
const ntfs_volume *v,
! const MFT_RECORD_HEADER *m,
! const ATTRIBUTE_RECORD_HEADER *al,
! const ATTRIBUTE_TYPE t,
const wchar_t *n,
FIND_ATTR_CTX_FLAGS *ctx)
--- 116,124 ----
}
! __inline__ ATTR_RECORD *find_first_attr_in_attr_list(
const ntfs_volume *v,
! const MFT_RECORD *m,
! const ATTR_RECORD *al,
! const ATTR_TYPES t,
const wchar_t *n,
FIND_ATTR_CTX_FLAGS *ctx)
***************
*** 142,153 ****
return find_next_attr_in_attr_list(v, m, al, t, n, ctx);
}
! ATTRIBUTE_RECORD_HEADER *find_next_attr(const ntfs_volume *v,
! const MFT_RECORD_HEADER *b,
! const ATTRIBUTE_TYPE t,
const wchar_t *n,
FIND_ATTR_CTX_FLAGS *ctx)
{
! ATTRIBUTE_RECORD_HEADER *a, *al = NULL;
int got_there = 0;
--- 131,279 ----
return find_next_attr_in_attr_list(v, m, al, t, n, ctx);
}
+
+ /**
+ * find_attr - find attribute in mft record
+ * @vol: volume on which @a resides (used to find the upcase table)
+ * @attr: last found attribute record inside mft record to search
+ * @type: attribute type to find
+ * @name: attribute name to find (optional)
+ * @ic: ignore case of @name (boolean)
+ * @val: attribute value to find (optional, resident attributes only)
+ * @len: attribute value length (only present if @val present)
+ *
+ * Decsription...
+ *
+ * find_attr() takes an attribute record header @a as a parameter, which must
+ * be the address of a pointer into an mft record. It specifies the attribute
+ * at which to begin the search, i.e. it is useful as a search context in
+ * attribute enumerations.
+ */
+ ATTR_RECORD *find_next_attr(const ntfs_volume *vol, const ATTR_RECORD **attr,
+ const ATTR_TYPES type, const wchar_t *name,
+ const __u8 ic, const __u8 *val, const __u32 len)
+ {
+ ATTR_RECORD a;
+ void *mft_rec;
+
+ if (!vol || !attr || !*attr) {
+ #ifdef DEBUG
+ puts("Sanity checks failed in find_attr()!");
+ #endif
+ return NULL;
+ }
+ a = *attr;
+ /*
+ * Calculate the beginning of the mft record, assuming that it is
+ * aligned on mft_record_size boundary. In the kernel, this is
+ * guaranteed as it is either on a page (cache page) boundary (and a
+ * page is larger than an mft record in any case) or it is inside a
+ * page (cache page) on an mft_record_size boundary (by definition).
+ */
+ mft_rec = (void*)(p2n(a) & (vol->mft_record_size - 1));
+ /*
+ * Iterate over attributes in mft record starting at @attr.
+ * Note: We do not use while/do/for loops so the comparison
+ * code does not get indented out of the screen... (AIA)
+ */
+ search_loop:
+ *attr = a;
+ /* We catch $END with this more general check, too... */
+ if (le32_to_cpu(a->type) > le32_to_cpu(type))
+ goto not_found;
+ if (!a->length)
+ goto file_corrupt;
+ if (a->type == type)
+ goto attr_type_matches;
+ do_next:
+ a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length));
+ if (a < mft_rec || a > (char*)mft_rec + vol->mft_record_size)
+ goto file_corrupt;
+ goto search_loop;
+ attr_type_matches:
+ /* If want an unnamed attribute, check if current one
+ is unnamed and if so we have found it! */
+ if (!n) {
+ if (!a->name_length) {
+ /* FIXME: Check the value first! */
+ return a;
+ }
+ /* If we want a named attribute, check that the string
+ length is equal and if so, compare the two strings
+ and if they match, we have found it! */
+ } else if (a->name_length && a->name_length == wcslen(n)) {
+ /* Sanity check. */
+ if (a->name_length * 2 + le16_to_cpu(a->name_offset)
+ > le32_to_cpu(a->length)) {
+ #ifdef DEBUG
+ puts("Warning: Encountered out of "
+ "bounds attribute name length in "
+ "find_attr()!");
+ #endif
+ /* Even though this one is illegal,
+ maybe it wasn't the right one, so
+ continue with the search (i.e. don't
+ return NULL).
+ FIXME: Shouldn't we doing a hotfix
+ here, i.e. truncate the name to the
+ indicated size or change the
+ indicated size, whichever makes more
+ sense? */
+ /* FIXME: Should we really be case sensitive?
+ If not, use ntfs_wcsncasecmp(). */
+ } else if (!ntfs_wcsncmp(n, (wchar_t*)((char*)a +
+ le16_to_cpu(a->name_offset))),
+ a->name_length) {
+ /* FIXME: Check the value. */
+ return a;
+ }
+ }
+ not_found:
+ #ifdef DEBUG
+ if (name)
+ printf("find_attr(): Named attribute 0x%x (\"%s\") not "
+ "found.\n", type, name);
+ else
+ printf("find_attr(): Unnamed attribute 0x%x not found.\n",
+ type);
+ #endif
+ return NULL;
+ file_corrupt:
+ #ifdef DEBUG
+ printf(stderr, "find_attr(): File is corrupt. Run ntfsck or chkdsk.\n");
+ #endif
+ return NULL;
+ }
!
!
!
! /*
! * The difference between lookup_attr and find_attr is that find_attr will only
! * look inside the mft record, ignoring attribute lists, while lookup_attr will
! * take the attribute list in consideration if present. If not, it just calls
! * find_attr. Also in kernel, lookup_attr takes and mft_reference as parameter,
! * while find_attr takes a pointer within a pinned/locked page cache page.
! *
! * v = volume
! * m = mft record to search, also consistency check the sequence number if not 0
! * (kernel), in user space @m is the buffer containing the mft record
! * type = attribute type to find (0 = find first attribute)
! * name = attribute name to find (NULL = unnamed)
! * ic = ignore case (true/false)
! * val = attribute value to find (resident attributes only, NULL = don't care)
! * len = length of attribute value to find (only valid if val != NULL)
! * lvcn = lowest_vcn to find (non-resident attributes only)
! *
! * return: memory location of attribute we are looking for. this will be
! * an offset into a (pinned/locked?) page cache page in the driver.
! * for userspace we just return a pointer into the mft record @m.
! */
! ATTR_RECORD *lookup_attr_in_mft_rec(const ntfs_volume *v,
! const MFT_RECORD *m,
! const ATTR_TYPES t,
const wchar_t *n,
FIND_ATTR_CTX_FLAGS *ctx)
{
! ATTR_RECORD *a, *al = NULL;
int got_there = 0;
***************
*** 166,170 ****
}
/* Position of the first attribute. */
! a = (ATTRIBUTE_RECORD_HEADER*)(le16_to_cpu(b->attributes_offset) +
(char*)b);
if (p2n(a) & 7) {
--- 292,296 ----
}
/* Position of the first attribute. */
! a = (ATTR_RECORD*)(le16_to_cpu(b->attributes_offset) +
(char*)b);
if (p2n(a) & 7) {
***************
*** 174,180 ****
return NULL;
}
! if (t == 0)
! goto found_it;
! /* Iterate over the attributes. */
while (a->type != $END) {
if (le32_to_cpu(a->length) + (char*)a >=
--- 300,306 ----
return NULL;
}
! /* Look for an attribute list and at the same time check for attributes
! * which collate before the attribute list (i.e. the standard
! * information attribute). */
while (a->type != $END) {
if (le32_to_cpu(a->length) + (char*)a >=
***************
*** 185,242 ****
#endif
return NULL;
- }
- if (a->type == t) {
- /* If this is not the first search, we need to find
- the attribute with instance *ctx & INSTANCE_MASK.
- We then need to return the first matching attribute
- following this one. */
- if (*ctx != FIRST_SEARCH && !got_there) {
- if (a->instance == *ctx & INSTANCE_MASK)
- got_there = 1;
- goto do_next_attr;
- }
- /* If want an unnamed attribute, check if current one
- is unnamed and if so we have found it! */
- if (!n) {
- if (!a->name_length) {
- found_it:
- *ctx = a->instance;
- return a;
- }
- /* If we want a named attribute, check that the string
- length is equal and if so, compare the two strings
- and if they match, we have found it! */
- } else if (a->name_length &&
- a->name_length == wcslen(n)) {
- /* Sanity check. */
- if (a->name_length * 2 +
- le16_to_cpu(a->name_offset)
- > le32_to_cpu(a->length)) {
- #ifdef DEBUG
- puts("Warning: Encountered out of "
- "bounds attribute name length in "
- "find_attribute()!");
- #endif
- /* Even though this one is illegal,
- maybe it wasn't the right one, so
- continue with the search (i.e. don't
- return NULL).
- FIXME: Shouldn't we be doing a hotfix
- here? */
- /* FIXME: Should we really be case sensitive?
- If not we should be using the $UpCase table,
- thus we need a custom function for
- comparisons. Can't just use strcasecmp(). */
- } else if (!wcscmp(n, (wchar_t*)((char*)a +
- le16_to_cpu(a->name_offset))))
- goto found_it;
- }
}
do_next_attr:
- /* If an attribute list is present, save it. */
- if (!al && a->type == $ATTRIBUTE_LIST)
- al = a;
/* Get next attribute. */
! a = (ATTRIBUTE_RECORD_HEADER*)((char *)a +
le32_to_cpu(a->length));
if (p2n(a) & 7) {
--- 311,326 ----
#endif
return NULL;
}
+ if (le32_to_cpu(a->type) > le32_to_cpu($ATTRIBUTE_LIST))
+ break;
+ if (a->type == t)
+ /* FIXME: This is wrong. */
+ return a;
+ /* If an attribute list is present, handle it first. */
+ if (a->type == $ATTRIBUTE_LIST)
+ goto attr_list_handling;
do_next_attr:
/* Get next attribute. */
! a = (ATTR_RECORD*)((char *)a +
le32_to_cpu(a->length));
if (p2n(a) & 7) {
***************
*** 247,256 ****
return NULL;
}
- /* Gone too far? - Make sure to at least go as far as the
- attribute list. */
- if (le32_to_cpu(a->type) > le32_to_cpu(t) &&
- le32_to_cpu(a->type) > le32_to_cpu($ATTRIBUTE_LIST))
- break;
}
/* We have not found the attribute in the mft record @b. If an
attribute_list was found, and we are not looking for it, search it
--- 331,345 ----
return NULL;
}
}
+ not_found:
+ /* The requested attribute is not present. */
+ return NULL;
+
+ attr_list_handling:
+ /* Looking for zero means we return the first attribute.
+ FIXME: The first attribute is in the attr list! (AIA)
+ Don't return the attr list itself but the attribute instead. */
+ if (t == 0)
+ goto found_it;
/* We have not found the attribute in the mft record @b. If an
attribute_list was found, and we are not looking for it, search it
***************
*** 258,271 ****
to search for a second attribute list, which, while braindamaged,
could screw us up badly. */
! if (al && t != $ATTRIBUTE_LIST)
! attr_list_handling:
! return find_next_attr_in_attr_list(v, b, al, t, n, ctx);
/* The requested attribute is not present. */
! return NULL;
}
! __inline__ ATTRIBUTE_RECORD_HEADER *find_first_attr(const ntfs_volume *v,
! const MFT_RECORD_HEADER *b,
! const ATTRIBUTE_TYPE t,
const wchar_t *n,
FIND_ATTR_CTX_FLAGS *ctx)
--- 347,359 ----
to search for a second attribute list, which, while braindamaged,
could screw us up badly. */
! //return find_next_attr_in_attr_list(v, b, al, t, n, ctx);
!
/* The requested attribute is not present. */
! goto not_found;
}
! __inline__ ATTR_RECORD *find_first_attr(const ntfs_volume *v,
! const MFT_RECORD *b,
! const ATTR_TYPES t,
const wchar_t *n,
FIND_ATTR_CTX_FLAGS *ctx)
***************
*** 280,287 ****
/* FIXME: Need to write the new flags to disk. */
! int set_ntfs_volume_flags(ntfs_volume *v, MFT_RECORD_HEADER *b,
const __u16 flags)
{
! RESIDENT_ATTRIBUTE_RECORD_HEADER *r;
VOLUME_INFORMATION *c;
--- 368,375 ----
/* FIXME: Need to write the new flags to disk. */
! int set_ntfs_volume_flags(ntfs_volume *v, MFT_RECORD *b,
const __u16 flags)
{
! ATTR_RECORD *r;
VOLUME_INFORMATION *c;
***************
*** 290,295 ****
return 0;
/* Get a pointer to the volume information attribute. */
! if (!(r = (RESIDENT_ATTRIBUTE_RECORD_HEADER*)find_first_attr(v, b,
! $VOLUME_INFORMATION, NULL))) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION was " \
"not found in $Volume!\n");
--- 378,382 ----
return 0;
/* Get a pointer to the volume information attribute. */
! if (!(r = find_first_attr(v, b, $VOLUME_INFORMATION, NULL))) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION was " \
"not found in $Volume!\n");
***************
*** 297,301 ****
}
/* Sanity check. */
! if (r->attribute.non_resident) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION must " \
"be resident (and it isn't)!\n");
--- 384,388 ----
}
/* Sanity check. */
! if (r->non_resident) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION must " \
"be resident (and it isn't)!\n");
***************
*** 308,312 ****
le16_to_cpu(b->bytes_in_use) + (char*)b ||
le16_to_cpu(r->value_offset) + le32_to_cpu(r->value_length) >
! le32_to_cpu(r->attribute.length)) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION in " \
"$Volume is corrupt!\n");
--- 395,399 ----
le16_to_cpu(b->bytes_in_use) + (char*)b ||
le16_to_cpu(r->value_offset) + le32_to_cpu(r->value_length) >
! le32_to_cpu(r->length)) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION in " \
"$Volume is corrupt!\n");
***************
*** 319,323 ****
}
! __s64 get_attribute_value_length(const ATTRIBUTE_RECORD_HEADER *a)
{
if (!a) {
--- 406,410 ----
}
! __s64 get_attribute_value_length(const ATTR_RECORD *a)
{
if (!a) {
***************
*** 327,341 ****
errno = 0;
if (a->non_resident)
! return sle64_to_cpu(((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! (a))->data_size);
else
! return (__s64)le32_to_cpu(((RESIDENT_ATTRIBUTE_RECORD_HEADER*)
! (a))->value_length);
errno = EINVAL;
return 0;
}
! __s64 get_attribute_value(const ntfs_volume *vol, const MFT_RECORD_HEADER *m,
! const ATTRIBUTE_RECORD_HEADER *a, __u8 *b)
{
/* Sanity checks. */
--- 414,426 ----
errno = 0;
if (a->non_resident)
! return sle64_to_cpu(a->data_size);
else
! return (__s64)le32_to_cpu(a->value_length);
errno = EINVAL;
return 0;
}
! __s64 get_attribute_value(const ntfs_volume *vol, const MFT_RECORD *m,
! const ATTR_RECORD *a, __u8 *b)
{
/* Sanity checks. */
***************
*** 352,368 ****
}
if (!a->non_resident) { /* Attribute is resident. */
- #define RA(a) ((RESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
/* Sanity check. */
! if (le32_to_cpu(RA(a)->value_length) +
! le16_to_cpu(RA(a)->value_offset) > le32_to_cpu(a->length)) {
return 0;
}
! memcpy(b, (char*)a + le16_to_cpu(RA(a)->value_offset),
! le32_to_cpu(RA(a)->value_length));
errno = 0;
! return (__s64)le32_to_cpu(RA(a)->value_length);
! #undef RA
} else { /* Attribute is not resident. */
- #define NA(a) ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
run_list rl;
__s64 total;
--- 437,450 ----
}
if (!a->non_resident) { /* Attribute is resident. */
/* Sanity check. */
! if (le32_to_cpu(a->value_length) +
! le16_to_cpu(a->value_offset) > le32_to_cpu(a->length)) {
return 0;
}
! memcpy(b, (char*)a + le16_to_cpu(a->value_offset),
! le32_to_cpu(a->value_length));
errno = 0;
! return (__s64)le32_to_cpu(a->value_length);
} else { /* Attribute is not resident. */
run_list rl;
__s64 total;
***************
*** 370,374 ****
/* If no data, return 0. */
! if (!(NA(a)->data_size)) {
errno = 0;
return 0;
--- 452,456 ----
/* If no data, return 0. */
! if (!(a->data_size)) {
errno = 0;
return 0;
***************
*** 378,382 ****
*/
/* Decompress the mapping pairs array into a run list. */
! rl = decompress_run_list(NA(a));
if (!rl) {
errno = EINVAL;
--- 460,464 ----
*/
/* Decompress the mapping pairs array into a run list. */
! rl = decompress_run_list(a);
if (!rl) {
errno = EINVAL;
***************
*** 495,499 ****
}
! int set_attribute_value(ntfs_volume *vol, ATTRIBUTE_RECORD_HEADER *a,
const __u8 *b, __s64 l)
{
--- 577,581 ----
}
! int set_attribute_value(ntfs_volume *vol, ATTR_RECORD *a,
const __u8 *b, __s64 l)
{
***************
*** 517,533 ****
}
if (!a->non_resident) { /* Attribute is resident. */
- #define RA(a) ((RESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
/* Sanity check. */
! if (le32_to_cpu(RA(a)->value_length) +
! le16_to_cpu(RA(a)->value_offset) > le32_to_cpu(a->length)) {
errno = EINVAL;
return 0;
}
! memcpy((char*)a + le16_to_cpu(RA(a)->value_offset), b, l);
errno = 0;
return 1;
- #undef RA
} else { /* Attribute is not resident. */
- #define NA(a) ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
run_list rl;
__s64 total;
--- 599,612 ----
}
if (!a->non_resident) { /* Attribute is resident. */
/* Sanity check. */
! if (le32_to_cpu(a->value_length) +
! le16_to_cpu(a->value_offset) > le32_to_cpu(a->length)) {
errno = EINVAL;
return 0;
}
! memcpy((char*)a + le16_to_cpu(a->value_offset), b, l);
errno = 0;
return 1;
} else { /* Attribute is not resident. */
run_list rl;
__s64 total;
***************
*** 536,545 ****
/* If no data return 1. FIXME: This needs to change when we can
cope with changes in length of the attribute. */
! if (!(NA(a)->data_size)) {
errno = 0;
return 1;
}
/* Decompress the mapping pairs array into a run list. */
! rl = decompress_run_list(NA(a));
/* Now write all clusters to disk from b. */
for (i = 0, total = 0; rl[i].length && (l > 0); i++) {
--- 615,624 ----
/* If no data return 1. FIXME: This needs to change when we can
cope with changes in length of the attribute. */
! if (!(a->data_size)) {
errno = 0;
return 1;
}
/* Decompress the mapping pairs array into a run list. */
! rl = decompress_run_list(a);
/* Now write all clusters to disk from b. */
for (i = 0, total = 0; rl[i].length && (l > 0); i++) {
***************
*** 587,591 ****
free(rl);
return 1;
- #undef NA
}
errno = EINVAL;
--- 666,669 ----
***************
*** 593,597 ****
}
! run_list decompress_run_list(const NONRESIDENT_ATTRIBUTE_RECORD_HEADER *attr)
{
__s64 vcn, lcn; /* Current vcn and lcn, respectively. */
--- 671,675 ----
}
! run_list decompress_run_list(const ATTR_RECORD *attr)
{
__s64 vcn, lcn; /* Current vcn and lcn, respectively. */
***************
*** 606,610 ****
/* Make sure attr exists and is non-resident. */
! if (!attr || !attr->attribute.non_resident)
return NULL;
/*
--- 684,688 ----
/* Make sure attr exists and is non-resident. */
! if (!attr || !attr->non_resident)
return NULL;
/*
Index: bootsect.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bootsect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** bootsect.c 2001/01/30 12:29:03 1.2
--- bootsect.c 2001/03/05 03:04:40 1.3
***************
*** 84,87 ****
--- 84,96 ----
puts("OK");
+ /* Check the sector size is not above 65536 bytes. */
+ if (!silent)
+ printf("Checking cluster size... ");
+ if ((__u32)le16_to_cpu(b->bpb.bytes_per_sector) *
+ b->bpb.sectors_per_cluster > 0x10000)
+ goto not_ntfs;
+ if (!silent)
+ puts("OK");
+
/* Check reserved/unused fields are really zero. */
if (!silent)
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** disk_io.c 2001/03/02 15:05:53 1.2
--- disk_io.c 2001/03/05 03:04:40 1.3
***************
*** 94,98 ****
}
/* Prepare data for writing. */
! pre_write_mst_fixup((NTFS_RECORD_HEADER*)b, count);
/* Write the prepared data. */
total = retry = 0;
--- 94,98 ----
}
/* Prepare data for writing. */
! pre_write_mst_fixup((NTFS_RECORD*)b, count);
/* Write the prepared data. */
total = retry = 0;
***************
*** 118,122 ****
finished:
/* Quickly deprotect the data again. */
! __post_read_mft_fixup((NTFS_RECORD_HEADER*)b, count);
error_end:
return error;
--- 118,122 ----
finished:
/* Quickly deprotect the data again. */
! __post_read_mft_fixup((NTFS_RECORD*)b, count);
error_end:
return error;
***************
*** 199,203 ****
made use of). */
for (i = 0; i < count; ++i)
! post_read_mst_fixup((NTFS_RECORD_HEADER*)(b +
(i << bksize_bits)), bksize);
/* Finally, return the number of blocks read. */
--- 199,203 ----
made use of). */
for (i = 0; i < count; ++i)
! post_read_mst_fixup((NTFS_RECORD*)(b +
(i << bksize_bits)), bksize);
/* Finally, return the number of blocks read. */
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mft.c 2001/01/25 22:25:43 1.1
--- mft.c 2001/03/05 03:04:40 1.2
***************
*** 25,29 ****
#include "endians.h"
! inline __u32 get_mft_record_data_size(const MFT_RECORD_HEADER *b)
{
if (!b || !is_mft_recordp(b))
--- 25,29 ----
#include "endians.h"
! inline __u32 get_mft_record_data_size(const MFT_RECORD *b)
{
if (!b || !is_mft_recordp(b))
Index: ntfs_rec.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfs_rec.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ntfs_rec.c 2001/03/02 15:05:54 1.2
--- ntfs_rec.c 2001/03/05 03:04:40 1.3
***************
*** 25,29 ****
#include "endians.h"
! __inline__ void __post_read_mst_fixup(NTFS_RECORD_HEADER *b, const __u32 size)
{
__u16 usa_ofs, usa_count;
--- 25,29 ----
#include "endians.h"
! __inline__ void __post_read_mst_fixup(NTFS_RECORD *b, const __u32 size)
{
__u16 usa_ofs, usa_count;
***************
*** 51,55 ****
}
! int post_read_mst_fixup(NTFS_RECORD_HEADER *b, const __u32 size)
{
__u16 usa_ofs, usa_count, usn;
--- 51,55 ----
}
! int post_read_mst_fixup(NTFS_RECORD *b, const __u32 size)
{
__u16 usa_ofs, usa_count, usn;
***************
*** 111,115 ****
}
! int pre_write_mst_fixup(NTFS_RECORD_HEADER *b, const __u32 size)
{
__u16 usa_ofs, usa_count, usn;
--- 111,115 ----
}
! int pre_write_mst_fixup(NTFS_RECORD *b, const __u32 size)
{
__u16 usa_ofs, usa_count, usn;
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** volume.c 2001/03/02 15:05:54 1.4
--- volume.c 2001/03/05 03:04:40 1.5
***************
*** 41,46 ****
ntfs_volume *vol = NULL;
NTFS_BOOT_SECTOR *bs = NULL;
! MFT_RECORD_HEADER *mb = NULL;
! ATTRIBUTE_RECORD_HEADER *a;
VOLUME_INFORMATION *vinf;
__u32 u;
--- 41,46 ----
ntfs_volume *vol = NULL;
NTFS_BOOT_SECTOR *bs = NULL;
! MFT_RECORD *mb = NULL;
! ATTR_RECORD *a;
VOLUME_INFORMATION *vinf;
__u32 u;
***************
*** 183,187 ****
/* Start with $Mft. */
printf("Loading $Mft... ");
! if (!(mb = (MFT_RECORD_HEADER *)malloc(vol->mft_record_size))) {
puts(FAILED);
perror("Error allocating memory for $Mft");
--- 183,187 ----
/* Start with $Mft. */
printf("Loading $Mft... ");
! if (!(mb = (MFT_RECORD *)malloc(vol->mft_record_size))) {
puts(FAILED);
perror("Error allocating memory for $Mft");
***************
*** 261,267 ****
}
/* Determine the number of mft records in $Mft. */
! vol->number_of_mft_records =
! ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)a)->data_size >>
! vol->mft_record_size_bits;
/* The $DATA attribute of the $Mft has to be non-resident. */
if (!a->non_resident) {
--- 261,265 ----
}
/* Determine the number of mft records in $Mft. */
! vol->number_of_mft_records = a->data_size >> vol->mft_record_size_bits;
/* The $DATA attribute of the $Mft has to be non-resident. */
if (!a->non_resident) {
***************
*** 272,277 ****
}
/* Get the run list. */
! vol->mft_runlist = decompress_run_list(
! (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)a);
if (!vol->mft_runlist) {
puts(FAILED);
--- 270,274 ----
}
/* Get the run list. */
! vol->mft_runlist = decompress_run_list(a);
if (!vol->mft_runlist) {
puts(FAILED);
***************
*** 445,456 ****
}
/* Get a pointer to the value of the attribute. */
! #define RA(x) ((RESIDENT_ATTRIBUTE_RECORD_HEADER*)(x))
! vinf = (VOLUME_INFORMATION*)(le16_to_cpu(RA(a)->value_offset) +
! (char*)a);
/* Sanity checks. */
! if ((char*)vinf + le32_to_cpu(RA(a)->value_length) >
le16_to_cpu(mb->bytes_in_use) + (char*)mb ||
! le16_to_cpu(RA(a)->value_offset) +
! le32_to_cpu(RA(a)->value_length) >
le32_to_cpu(a->length)) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION in " \
--- 442,451 ----
}
/* Get a pointer to the value of the attribute. */
! vinf = (VOLUME_INFORMATION*)(le16_to_cpu(a->value_offset) + (char*)a);
/* Sanity checks. */
! if ((char*)vinf + le32_to_cpu(a->value_length) >
le16_to_cpu(mb->bytes_in_use) + (char*)mb ||
! le16_to_cpu(a->value_offset) +
! le32_to_cpu(a->value_length) >
le32_to_cpu(a->length)) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION in " \
***************
*** 459,463 ****
goto error_exit;
}
- #undef RA
/* Setup vol from the volume information attribute value. */
vol->major_ver = vinf->major_ver;
--- 454,457 ----
|
|
From: Anton A. <an...@us...> - 2001-03-05 02:44:03
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv15469
Modified Files:
attrib.h mft.h ntfs_rec.h
Log Message:
Renamed things, broke everything. Should be stabilized now in the headers.
Still reworking find attribute stuff but at least I have an idea of how I want
to do it now.
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** attrib.h 2001/03/04 14:28:13 1.12
--- attrib.h 2001/03/05 02:45:35 1.13
***************
*** 54,58 ****
$FIRST_USER_DEFINED_ATTRIBUTE = cpu_to_le32( 0x1000),
$END = cpu_to_le32(0xffffffff),
! } ATTRIBUTE_TYPE;
/*
--- 54,58 ----
$FIRST_USER_DEFINED_ATTRIBUTE = cpu_to_le32( 0x1000),
$END = cpu_to_le32(0xffffffff),
! } ATTR_TYPES;
[...982 lines suppressed...]
--- 1880,1885 ----
* errno describes the error.
*/
! __s64 get_attribute_value(const ntfs_volume *vol, const ATTR_RECORD *a,
! __u8 *b);
/**
***************
*** 1916,1920 ****
* FIXME: Document possible errnos.
*/
! int set_attribute_value(ntfs_volume *vol, ATTRIBUTE_RECORD_HEADER *a,
const __u8 *b, __s64 l);
--- 1901,1905 ----
* FIXME: Document possible errnos.
*/
! int set_attribute_value(ntfs_volume *vol, ATTR_RECORD *a,
const __u8 *b, __s64 l);
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mft.h 2001/03/02 15:03:56 1.6
--- mft.h 2001/03/05 02:45:35 1.7
***************
*** 157,165 ****
check the link_count and if it is 1 we
delete the file. Otherwise we delete the
! FILENAME_ATTRIBUTE being referenced by the
directory entry from the mft record and
decrement the link_count.
FIXME: Careful with Win32 + DOS names! */
! /* 20*/ __u16 attributes_offset;/* Byte offset to the first attribute in this
mft record from the start of the mft record.
NOTE: Must be aligned to 8-byte boundary. */
--- 157,165 ----
check the link_count and if it is 1 we
delete the file. Otherwise we delete the
! FILENAME_ATTR being referenced by the
directory entry from the mft record and
decrement the link_count.
FIXME: Careful with Win32 + DOS names! */
! /* 20*/ __u16 attrs_offset; /* Byte offset to the first attribute in this
mft record from the start of the mft record.
NOTE: Must be aligned to 8-byte boundary. */
***************
*** 184,188 ****
potential extents, belonging to the non-base
mft record). */
! /* 40*/ __u16 next_attribute_instance; /* The instance number that will be
assigned to the next attribute added to this
mft record. NOTE: Incremented each time
--- 184,188 ----
potential extents, belonging to the non-base
mft record). */
! /* 40*/ __u16 next_attr_instance; /* The instance number that will be
assigned to the next attribute added to this
mft record. NOTE: Incremented each time
***************
*** 201,205 ****
* When reading we obviously use the data from the ntfs record header.
*/
! } __attribute__ ((__packed__)) MFT_RECORD_HEADER;
/**
--- 201,205 ----
* When reading we obviously use the data from the ntfs record header.
*/
! } __attribute__ ((__packed__)) MFT_RECORD;
/**
***************
*** 209,215 ****
* Takes the mft record @b and returns the number of bytes used in the record
* or 0 on error (i.e. b is not a valid mft record). Zero is not a valid size
! * for an mft record as it at least has to have the MFT_RECORD_HEADER thus
! * making the minumum size:
! * (sizeof(MFT_RECORD_HEADER) + 7) & ~7 + sizeof(ATTRIBUTE_TYPE) = 52 bytes
* Aside: The 8-byte alignment and the 4 bytes for the attribute type are needed
* as each mft record has to have a list of attributes even if it only contains
--- 209,215 ----
* Takes the mft record @b and returns the number of bytes used in the record
* or 0 on error (i.e. b is not a valid mft record). Zero is not a valid size
! * for an mft record as it at least has to have the MFT_RECORD, thus making the
! * minimum size:
! * (sizeof(MFT_RECORD) + 7) & ~7 + sizeof(ATTR_TYPES) = 52 bytes
* Aside: The 8-byte alignment and the 4 bytes for the attribute type are needed
* as each mft record has to have a list of attributes even if it only contains
***************
*** 219,223 ****
* wouldn't view this as corruption in itself though!).
*/
! inline __u32 get_mft_record_data_size(const MFT_RECORD_HEADER *b);
#endif /* defined MFT_H */
--- 219,223 ----
* wouldn't view this as corruption in itself though!).
*/
! inline __u32 get_mft_record_data_size(const MFT_RECORD *b);
#endif /* defined MFT_H */
Index: ntfs_rec.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfs_rec.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ntfs_rec.h 2001/03/02 15:03:56 1.3
--- ntfs_rec.h 2001/03/05 02:45:35 1.4
***************
*** 36,40 ****
magic_HOLE = cpu_to_le32(0x454c4f48), /* "HOLE" == ??? (NTFS 3.0+?) */
magic_INDX = cpu_to_le32(0x58444e49), /* "INDX" == index buffer */
! } NTFS_RECORD_TYPE;
/*
--- 36,40 ----
magic_HOLE = cpu_to_le32(0x454c4f48), /* "HOLE" == ??? (NTFS 3.0+?) */
magic_INDX = cpu_to_le32(0x58444e49), /* "INDX" == index buffer */
! } NTFS_RECORD_TYPES;
/*
***************
*** 83,88 ****
*/
typedef struct {
! NTFS_RECORD_TYPE magic; /* A four-byte magic identifying the record
! type and/or status. */
__u16 usa_ofs; /* Offset to the Update Sequence Array (usa)
from the start of the ntfs record. */
--- 83,88 ----
*/
typedef struct {
! NTFS_RECORD_TYPES magic; /* A four-byte magic identifying the
! record type and/or status. */
__u16 usa_ofs; /* Offset to the Update Sequence Array (usa)
from the start of the ntfs record. */
***************
*** 91,95 ****
thus the number of fixups is the usa_count
minus 1. */
! } __attribute__ ((__packed__)) NTFS_RECORD_HEADER;
/**
--- 91,95 ----
thus the number of fixups is the usa_count
minus 1. */
! } __attribute__ ((__packed__)) NTFS_RECORD;
/**
***************
*** 101,106 ****
* any errors. Defined inline for additional speed.
*/
! extern __inline__ void __post_read_mst_fixup(NTFS_RECORD_HEADER *b,
! const __u32 size);
/**
--- 101,105 ----
* any errors. Defined inline for additional speed.
*/
! extern __inline__ void __post_read_mst_fixup(NTFS_RECORD *b, const __u32 size);
/**
***************
*** 118,122 ****
* be fixed up. Thus, we return success and not failure in this case.
*/
! int post_read_mst_fixup(NTFS_RECORD_HEADER *b, const __u32 size);
/**
--- 117,121 ----
* be fixed up. Thus, we return success and not failure in this case.
*/
! int post_read_mst_fixup(NTFS_RECORD *b, const __u32 size);
/**
***************
*** 139,143 ****
* at that position at that time).
*/
! int pre_write_mst_fixup(NTFS_RECORD_HEADER *b, const __u32 size);
#endif /* defined NTFS_REC_H */
--- 138,142 ----
* at that position at that time).
*/
! int pre_write_mst_fixup(NTFS_RECORD *b, const __u32 size);
#endif /* defined NTFS_REC_H */
|
|
From: Anton A. <an...@us...> - 2001-03-04 14:26:45
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv16271
Modified Files:
attrib.h
Log Message:
Fixes.
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** attrib.h 2001/03/03 06:52:39 1.11
--- attrib.h 2001/03/04 14:28:13 1.12
***************
*** 964,970 ****
*/
typedef struct {
! ACE_HEADER header; /* The ACE_HEADER. */
ACCESS_MASK mask; /* Access mask associated with the ACE. */
! __u32 sid_offset; /* Offset to the SID associated with the ACE. */
} __attribute__ ((__packed__)) ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE,
SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE;
--- 964,970 ----
*/
typedef struct {
! ACE_HEADER header; /* The ACE header. */
ACCESS_MASK mask; /* Access mask associated with the ACE. */
! SID sid; /* The SID associated with the ACE. */
} __attribute__ ((__packed__)) ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE,
SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE;
***************
*** 984,988 ****
GUID object_type;
GUID inherited_object_type;
! __u32 sid_offset; /* Offset to the SID associated with the ACE. */
} __attribute__ ((__packed__)) ACCESS_ALLOWED_OBJECT_ACE,
ACCESS_DENIED_OBJECT_ACE,
--- 984,988 ----
GUID object_type;
GUID inherited_object_type;
! SID sid; /* The SID associated with the ACE. */
} __attribute__ ((__packed__)) ACCESS_ALLOWED_OBJECT_ACE,
ACCESS_DENIED_OBJECT_ACE,
***************
*** 1211,1224 ****
__u32 security_id; /* The security_id assigned to the descriptor. */
__u64 offset; /* Byte offset of this entry in the $SDS stream. */
! __u32 length; /* Size in bytes of this entry. */
} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_HEADER;
/*
! * The $SDS data stream contains the security descriptors, aligned on 32-bit
* boundaries, sorted by security_id in a B+ tree. Security descriptors cannot
* cross 256kib boundaries (this restriction is imposed by the Windows cache
* manager). Each security descriptor is contained in a SDS_ENTRY structure.
* Also, each security descriptor is stored twice in the $SDS stream with a
! * fixed offset of ??? bytes between them.
*/
typedef struct {
--- 1211,1227 ----
__u32 security_id; /* The security_id assigned to the descriptor. */
__u64 offset; /* Byte offset of this entry in the $SDS stream. */
! __u32 length; /* Size in bytes of this entry in $SDS stream. */
} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_HEADER;
/*
! * The $SDS data stream contains the security descriptors, aligned on 16-byte
* boundaries, sorted by security_id in a B+ tree. Security descriptors cannot
* cross 256kib boundaries (this restriction is imposed by the Windows cache
* manager). Each security descriptor is contained in a SDS_ENTRY structure.
* Also, each security descriptor is stored twice in the $SDS stream with a
! * fixed offset of 0x40000 bytes (256kib, the Windows cache manager's max size)
! * between them; i.e. if a SDS_ENTRY specifies an offset of 0x51d0, then the
! * the first copy of the security descriptor will be at offset 0x51d0 in the
! * $SDS data stream and the second copy will be at offset 0x451d0.
*/
typedef struct {
***************
*** 1351,1357 ****
*/
typedef struct {
! ATTRIBUTE_TYPE type; /* Type of the indexed attribute. */
COLLATION_RULE collation_rule; /* Collation rule used to sort the
! index entries. */
__u32 bytes_per_index_block; /* Byte size of each index block (in
the index allocation attribute). */
--- 1354,1364 ----
*/
typedef struct {
! ATTRIBUTE_TYPE type; /* Type of the indexed attribute. Is
! $FILENAME for directories, zero
! for view indexes. No other values
! allowed. */
COLLATION_RULE collation_rule; /* Collation rule used to sort the
! index entries. If type is $FILENAME,
! this must be COLLATION_FILENAME. */
__u32 bytes_per_index_block; /* Byte size of each index block (in
the index allocation attribute). */
***************
*** 1363,1367 ****
the mft record size and the index
record size found in the boot sector
! work). */
__u8 reserved[3]; /* Reserved/align to 8-byte boundary. */
INDEX_HEADER index; /* Index header describing the
--- 1370,1374 ----
the mft record size and the index
record size found in the boot sector
! work). Has to be a power of 2. */
__u8 reserved[3]; /* Reserved/align to 8-byte boundary. */
INDEX_HEADER index; /* Index header describing the
***************
*** 1599,1605 ****
} __attribute__ ((__packed__)) EA_INFORMATION;
! //typedef enum {
! // NEED_EA = ???;
! //} EA_FLAGS;
/*
--- 1606,1615 ----
} __attribute__ ((__packed__)) EA_INFORMATION;
! /*
! * Extended attribute flags (8-bit).
! */
! typedef enum {
! NEED_EA = 0x80;
! } __attribute__ ((__packed__)) EA_FLAGS;
/*
***************
*** 1613,1617 ****
typedef struct {
__u32 next_entry_offset; /* Offset to the next EA_ATTRIBUTE. */
! __u8 flags; /* Bit array of EA_FLAGS. */
__u8 ea_name_length; /* Length of the name of the extended
attribute in bytes. */
--- 1623,1627 ----
typedef struct {
__u32 next_entry_offset; /* Offset to the next EA_ATTRIBUTE. */
! EA_FLAGS flags; /* Flags describing the EA. */
__u8 ea_name_length; /* Length of the name of the extended
attribute in bytes. */
***************
*** 1629,1633 ****
*/
typedef struct {
! /* ??? */
} __attribute__ ((__packed__)) PROPERTY_SET;
--- 1639,1643 ----
*/
typedef struct {
! /* Irrelevant as feature unused. */
} __attribute__ ((__packed__)) PROPERTY_SET;
|
|
From: Anton A. <an...@us...> - 2001-03-03 06:51:13
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv21985
Modified Files:
attrib.h
Log Message:
Finished entering security related headers.
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** attrib.h 2001/03/03 00:11:17 1.10
--- attrib.h 2001/03/03 06:52:39 1.11
***************
*** 58,61 ****
--- 58,84 ----
/*
* The collation rules for sorting views/indexes/etc (32-bit).
+ *
+ * COLLATION_NTOFS_ULONG - Sorting is done according to ascending __u32 key
+ * values. E.g. used for $SII index in FILE_$Secure, which sorts by
+ * security_id (__u32).
+ * COLLATION_NTOFS_SID - Sorting is done according to ascending SID values.
+ * E.g. used for $O index in FILE_$Extend/$Quota.
+ * COLLATION_NTOFS_SECURITY_HASH - Sorting is done first by ascending hash
+ * values and second by ascending security_id values. E.g. used for $SDH
+ * index in FILE_$Secure.
+ * COLLATION_NTOFS_ULONGS - Sorting is done according to a sequence of ascending
+ * __u32 key values. E.g. used for $O index in FILE_$Extend/$ObjId, which
+ * sorts by object_id (16-byte), by splitting up the object_id in four
+ * __u32 values and using them as individual keys. E.g. take the following
+ * two security_ids, stored as follows on disk:
+ * 1st: a1 61 65 b7 65 7b d4 11 9e 3d 00 e0 81 10 42 59
+ * 2nd: 38 14 37 d2 d2 f3 d4 11 a5 21 c8 6b 79 b1 97 45
+ * To compare them, they are split into four __u32 values each, like so:
+ * 1st: 0xb76561a1 0x11d47b65 0xe0003d9e 0x59421081
+ * 2nd: 0xd2371438 0x11d4f3d2 0x6bc821a5 0x4597b179
+ * Now, it is apparent why the 2nd object_id collates after the 1st: the
+ * first __u32 value of the 1st object_id is less than the first __u32 of
+ * the 2nd object_id. If the first __u32 values of both object_ids were
+ * equal then the second __u32 values would be compared, etc.
*/
typedef enum {
***************
*** 72,85 ****
case value collates before
the lower case one. */
! COLLATION_NTOFS_ULONG = cpu_to_le32(16), /* ??? */
! COLLATION_NTOFS_SID = cpu_to_le32(17), /* ??? */
! COLLATION_NTOFS_SECURITY_HASH = cpu_to_le32(18), /* ??? */
! COLLATION_NTOFS_ULONGS = cpu_to_le32(19), /* ??? */
} COLLATION_RULE;
/*
* The flags (32-bit) describing attribute properties in the attribute
! * definition structure. This information is not certain and probably
! * incomplete.
*/
typedef enum {
--- 95,108 ----
case value collates before
the lower case one. */
! COLLATION_NTOFS_ULONG = cpu_to_le32(16),
! COLLATION_NTOFS_SID = cpu_to_le32(17),
! COLLATION_NTOFS_SECURITY_HASH = cpu_to_le32(18),
! COLLATION_NTOFS_ULONGS = cpu_to_le32(19),
} COLLATION_RULE;
/*
* The flags (32-bit) describing attribute properties in the attribute
! * definition structure. FIXME: This information is not certain and probably
! * incomplete. (AIA)
*/
typedef enum {
***************
*** 277,290 ****
/* 40*/ __s64 allocated_size; /* Byte size of disk space allocated to hold
the attribute value. Always is a multiple of
! the cluster size. */
/* 48*/ __s64 data_size; /* Byte size of the attribute value. Can be
larger than allocated_size if attribute
value is compressed or sparse. */
/* 56*/ __s64 initialized_size; /* Byte size of initialized portion of the
! attribute value. FIXME: Multiple of cluster
! size? (AIA) */
/* 64*/ __s64 compressed_size; /* Byte size of the attribute value after
compression. Only present when compressed.
! FIXME: Multiple of cluster size? (AIA) */
/* sizeof() = 72 bytes (when compressed, otherwise = 64 bytes) */
} __attribute__ ((__packed__)) NONRESIDENT_ATTRIBUTE_RECORD_HEADER;
--- 300,319 ----
/* 40*/ __s64 allocated_size; /* Byte size of disk space allocated to hold
the attribute value. Always is a multiple of
! the cluster size. When a file is compressed,
! this field is a multiple of the compression
! block size (2^compression_unit) and it
! represents the logically allocated space
! rather than the actual on disk usage. For
! this use the compressed_size (see below). */
/* 48*/ __s64 data_size; /* Byte size of the attribute value. Can be
larger than allocated_size if attribute
value is compressed or sparse. */
/* 56*/ __s64 initialized_size; /* Byte size of initialized portion of the
! attribute value. Usually equals data_size. */
/* 64*/ __s64 compressed_size; /* Byte size of the attribute value after
compression. Only present when compressed.
! Always is a multiple of the cluster size.
! Represents the actual amount of disk space
! being used on the disk. */
/* sizeof() = 72 bytes (when compressed, otherwise = 64 bytes) */
} __attribute__ ((__packed__)) NONRESIDENT_ATTRIBUTE_RECORD_HEADER;
***************
*** 317,323 ****
FILE_ATTRIBUTE_COMPRESSED = cpu_to_le32(0x00000800),
! FILE_ATTRIBUTE_OFFLINE = cpu_to_le32(0x00001000),
! FILE_ATTRIBUTE_NOT_CONTENT_INDEXED = cpu_to_le32(0x00002000),
! FILE_ATTRIBUTE_ENCRYPTED = cpu_to_le32(0x00004000),
FILE_ATTRIBUTE_VALID_FLAGS = cpu_to_le32(0x00007fb7),
--- 346,352 ----
FILE_ATTRIBUTE_COMPRESSED = cpu_to_le32(0x00000800),
! FILE_ATTRIBUTE_OFFLINE = cpu_to_le32(0x00001000),
! FILE_ATTRIBUTE_NOT_CONTENT_INDEXED = cpu_to_le32(0x00002000),
! FILE_ATTRIBUTE_ENCRYPTED = cpu_to_le32(0x00004000),
FILE_ATTRIBUTE_VALID_FLAGS = cpu_to_le32(0x00007fb7),
***************
*** 400,423 ****
/* 42*/ __u32 class_id; /* Class id from bidirectional class id
index (?). */
! /* 46*/ __u32 owner_id; /* Id for file owner, from bidir security
! index. This is also used to find the quota
! associated with this file, as an index into
! FILE_$Extend/$Quota. Is zero if quotas are
! disabled. */
! /* 50*/ __u32 security_id; /* Security id for the file. Translate via
$SII index and $SDS data stream in
FILE_$Secure to the security descriptor. */
/* 54*/ __u64 quota_charged; /* Byte size of the charge to the quota for
! all streams of the file. Is zero if quotas
! are disabled. */
/* 62*/ __u64 usn; /* Last update sequence number of the file. This
! is a direct index into the change (aka Usn)
! journal file. It is zero if the journal is
! disabled.
NOTE: To disable the journal need to delete
the journal file itself and to then walk the
whole mft and set all Usn entries in all mft
records to zero! (This can take a while!)
! The journal is /$Extend/UsnJrnl. Windows 2k
will recreate the journal and initiate
logging if necessary when mounting the
--- 429,452 ----
/* 42*/ __u32 class_id; /* Class id from bidirectional class id
index (?). */
! /* 46*/ __u32 owner_id; /* Owner_id of the user owning the file.
! Translate via $Q index in FILE_$Extend/
! $Quota to the quota control entry for the
! user owning the file. Note: Is zero if
! quotas are disabled. */
! /* 50*/ __u32 security_id; /* Security_id for the file. Translate via
$SII index and $SDS data stream in
FILE_$Secure to the security descriptor. */
/* 54*/ __u64 quota_charged; /* Byte size of the charge to the quota for
! all streams of the file. Note: Is zero if
! quotas are disabled. */
/* 62*/ __u64 usn; /* Last update sequence number of the file. This
! is a direct index into the change (aka usn)
! journal file. It is zero if the usn journal
! is disabled.
NOTE: To disable the journal need to delete
the journal file itself and to then walk the
whole mft and set all Usn entries in all mft
records to zero! (This can take a while!)
! The journal is FILE_$Extend/$UsnJrnl. Win2k
will recreate the journal and initiate
logging if necessary when mounting the
***************
*** 583,608 ****
} __attribute__ ((__packed__)) GUID;
/*
! * Attribute: Object id (0x40).
*
* NOTE: Always resident.
*/
typedef struct {
- //MFT_REFERENCE file_system_reference; /* Is it this structure or */
- //__u8 extended_info[48]; /* the one declared below?!? */
- //} __attribute__ ((__packed__)) OBJECT_ID_ATTRIBUTE;
- // It is the one below. The thing above is one of the keys in an index in the
- // FILE_$Secure. (?) (AIA)
GUID object_id; /* Unique id assigned to the
file.*/
union {
struct {
GUID birth_volume_id; /* Unique id of volume on which
! the file was first created.
! NOTE: Optional. */
GUID birth_object_id; /* Unique id of file when it was
! first created.
! NOTE: Optional. */
! GUID domain_id; /* Reserved. NOTE: Optional. */
} __attribute__ ((__packed__));
__u8 extended_info[48];
--- 612,660 ----
} __attribute__ ((__packed__)) GUID;
+ /*
+ * This is the index entry key of the $O index in FILE_$Extend/$ObjId.
+ */
+ typedef struct {
+ GUID object_id; /* The object_id assigned to the mft record. */
+ } __attribute__ ((__packed__)) OBJ_ID_INDEX_KEY;
+
/*
! * This is the index entry data part of the $O index in FILE_$Extend/$ObjId.
! */
! typedef struct {
! MFT_REFERENCE mft_reference; /* Mft record containing this object_id. */
! union {
! struct {
! GUID birth_volume_id; /* object_id of FILE_$Volume of
! the volume on which the file
! was first created. Optional
! (can be zero). */
! GUID birth_object_id; /* object_id of file when it was
! first created. Usually equals
! the object_id. Optional (can
! be zero). */
! GUID domain_id; /* Reserved (always zero). */
! } __attribute__ ((__packed__));
! __u8 extended_info[48];
! } __attribute__ ((__packed__));
! } __attribute__ ((__packed__)) O_INDEX_DATA;
!
! /*
! * Attribute: Object id (NTFS 3.0+) (0x40).
*
* NOTE: Always resident.
*/
typedef struct {
GUID object_id; /* Unique id assigned to the
file.*/
+ /* The following fields are optional. The object_id attribute value
+ size is 16 bytes, i.e. sizeof(GUID), if these are not present. */
union {
struct {
GUID birth_volume_id; /* Unique id of volume on which
! the file was first created.*/
GUID birth_object_id; /* Unique id of file when it was
! first created. */
! GUID domain_id; /* Reserved. */
} __attribute__ ((__packed__));
__u8 extended_info[48];
***************
*** 771,782 ****
* revision = 1,
* sub_authority_count = 2,
! * identifier_authority = 5, // SECURITY_NT_AUTHORITY
! * sub_authority[0] = 32, // SECURITY_BUILTIN_DOMAIN_RID
! * sub_authority[1] = 544 // DOMAIN_ALIAS_RID_ADMINS
*/
typedef struct {
__u8 revision;
__u8 sub_authority_count;
! SID_IDENTIFIER_AUTHORITY identifier_autority;
__u32 sub_authority[1]; /* At least one sub_authority. */
} __attribute__ ((__packed__)) SID;
--- 823,834 ----
* revision = 1,
* sub_authority_count = 2,
! * identifier_authority = {0,0,0,0,0,5}, // SECURITY_NT_AUTHORITY
! * sub_authority[0] = 32, // SECURITY_BUILTIN_DOMAIN_RID
! * sub_authority[1] = 544 // DOMAIN_ALIAS_RID_ADMINS
*/
typedef struct {
__u8 revision;
__u8 sub_authority_count;
! SID_IDENTIFIER_AUTHORITY identifier_authority;
__u32 sub_authority[1]; /* At least one sub_authority. */
} __attribute__ ((__packed__)) SID;
***************
*** 894,898 ****
* The generic mapping array. Used to denote the mapping of each generic
* access right to a specific access mask.
! * FIXME: WTH does this mean?!? (AIA)
*/
typedef struct {
--- 946,951 ----
* The generic mapping array. Used to denote the mapping of each generic
* access right to a specific access mask.
! *
! * FIXME: What exactly is this and what is it for? (AIA)
*/
typedef struct {
***************
*** 1050,1059 ****
SID is present in the descriptor. */
__u32 sacl; /* Byte offset to a system ACL. Only valid, if
! SE_DACL_PRESENT is set in the control field. If
! SE_DACL_PRESENT is set but sacl is NULL, a NULL ACL
is specified. */
__u32 dacl; /* Byte offset to a discretionary ACL. Only valid, if
! SE_SACL_PRESENT is set in the control field. If
! SE_SACL_PRESENT is set but dacl is NULL, a NULL ACL
(unconditionally granting access) is specified. */
} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_RELATIVE;
--- 1103,1112 ----
SID is present in the descriptor. */
__u32 sacl; /* Byte offset to a system ACL. Only valid, if
! SE_SACL_PRESENT is set in the control field. If
! SE_SACL_PRESENT is set but sacl is NULL, a NULL ACL
is specified. */
__u32 dacl; /* Byte offset to a discretionary ACL. Only valid, if
! SE_DACL_PRESENT is set in the control field. If
! SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL
(unconditionally granting access) is specified. */
} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_RELATIVE;
***************
*** 1078,1087 ****
present in the descriptor. */
ACL *sacl; /* Points to a system ACL. Only valid, if
! SE_DACL_PRESENT is set in the control field. If
! SE_DACL_PRESENT is set but sacl is NULL, a NULL ACL
is specified. */
ACL *dacl; /* Points to a discretionary ACL. Only valid, if
! SE_SACL_PRESENT is set in the control field. If
! SE_SACL_PRESENT is set but dacl is NULL, a NULL ACL
(unconditionally granting access) is specified. */
} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR;
--- 1131,1140 ----
present in the descriptor. */
ACL *sacl; /* Points to a system ACL. Only valid, if
! SE_SACL_PRESENT is set in the control field. If
! SE_SACL_PRESENT is set but sacl is NULL, a NULL ACL
is specified. */
ACL *dacl; /* Points to a discretionary ACL. Only valid, if
! SE_DACL_PRESENT is set in the control field. If
! SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL
(unconditionally granting access) is specified. */
} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR;
***************
*** 1167,1171 ****
* manager). Each security descriptor is contained in a SDS_ENTRY structure.
* Also, each security descriptor is stored twice in the $SDS stream with a
! * fixed offset of XYZ bytes between them.
*/
typedef struct {
--- 1220,1224 ----
* manager). Each security descriptor is contained in a SDS_ENTRY structure.
* Also, each security descriptor is stored twice in the $SDS stream with a
! * fixed offset of ??? bytes between them.
*/
typedef struct {
***************
*** 1176,1180 ****
/*
! * The index entry key used in the $SII index.
*/
typedef struct {
--- 1229,1234 ----
/*
! * The index entry key used in the $SII index. The collation type is
! * COLLATION_NTOFS_ULONG.
*/
typedef struct {
***************
*** 1183,1188 ****
/*
! * The index entry key used in the $SDH index. The keys are sorted by first by
! * hash and then by security_id.
*/
typedef struct {
--- 1237,1243 ----
/*
! * The index entry key used in the $SDH index. The keys are sorted first by
! * hash and then by security_id. The collation rule is
! * COLLATION_NTOFS_SECURITY_HASH.
*/
typedef struct {
***************
*** 1344,1347 ****
--- 1399,1494 ----
/*
+ * The system file FILE_$Extend/$Reparse contains an index named $R listing
+ * all reparse points on the volume. The index entry keys are as defined
+ * below. Note, that there is no index data associated with the index entries.
+ *
+ * The index entries are sorted by the index key file_id. The collation rule is
+ * COLLATION_NTOFS_ULONGS. FIXME: Verify whether the reparse_tag is not the
+ * primary key / is not a key at all. (AIA)
+ */
+ typedef struct {
+ __u32 reparse_tag; /* Reparse point type (inc. flags). */
+ MFT_REFERENCE file_id; /* Mft record of the file containing the
+ reparse point attribute. */
+ } __attribute__ ((__packed__)) REPARSE_INDEX_KEY;
+
+ /*
+ * The system file FILE_$Extend/$Quota contains two indexes $O and $Q. Quotas
+ * are on a per volume and per user basis.
+ *
+ * The $O index contains one entry for each user/group who has been assigned
+ * a quota on that volume. The index key holds the variable length SID of the
+ * user/group the entry belongs to. The collation rule is COLLATION_NTOFS_SID.
+ *
+ * The $O index entry data is the user_id of the user corresponding to the SID.
+ * The user_id is used as an index into $Q to find the quota control entry
+ * associated with the SID in the index key. The user_id is stored as the
+ * owner_id in the standard information attribute of each base mft record.
+ */
+ typedef struct {
+ SID sid; /* SID of the owner of the user_id. */
+ } __attribute__ ((__packed__)) QUOTA_O_INDEX_KEY;
+
+ /*
+ * Predefined user/owner_id values (32-bit).
+ */
+ typedef enum {
+ QUOTA_INVALID_ID = cpu_to_le32(0x00000000),
+ QUOTA_DEFAULTS_ID = cpu_to_le32(0x00000001),
+ QUOTA_FIRST_USER_ID = cpu_to_le32(0x00000100),
+ } PREDEFINED_OWNER_IDS;
+
+ /*
+ * Quota flags (32-bit).
+ */
+ typedef enum {
+ /* The user quota flags. Names explain meaning. */
+ QUOTA_FLAG_DEFAULT_LIMITS = cpu_to_le32(0x00000001),
+ QUOTA_FLAG_LIMIT_REACHED = cpu_to_le32(0x00000002),
+ QUOTA_FLAG_ID_DELETED = cpu_to_le32(0x00000004),
+
+ QUOTA_FLAG_USER_MASK = cpu_to_le32(0x00000007),
+ /* Bit mask for user quota flags. */
+
+ /* These flags are only present in the quota defaults index entry,
+ i.e. in the entry where owner_id = QUOTA_DEFAULTS_ID. */
+ QUOTA_FLAG_TRACKING_ENABLED = cpu_to_le32(0x00000010),
+ QUOTA_FLAG_ENFORCEMENT_ENABLED = cpu_to_le32(0x00000020),
+ QUOTA_FLAG_TRACKING_REQUESTED = cpu_to_le32(0x00000040),
+ QUOTA_FLAG_LOG_THRESHOLD = cpu_to_le32(0x00000080),
+ QUOTA_FLAG_LOG_LIMIT = cpu_to_le32(0x00000100),
+ QUOTA_FLAG_OUT_OF_DATE = cpu_to_le32(0x00000200),
+ QUOTA_FLAG_CORRUPT = cpu_to_le32(0x00000400),
+ QUOTA_FLAG_PENDING_DELETES = cpu_to_le32(0x00000800),
+ } QUOTA_FLAGS;
+
+ /*
+ * The $Q index in FILE_$Extend/$Quota contains one entry for each existing
+ * user/owner_id on the volume. The index key is the (32-bit) user/owner_id of
+ * the user/group to whom this quota control entry belongs (found in the
+ * standard information attribute). The collation rule is COLLATION_NTOFS_ULONG.
+ */
+ typedef union {
+ __u32 user_id;
+ __u32 owner_id;
+ } __attribute__ ((__packed__)) QUOTA_O_INDEX_KEY;
+
+ /*
+ * The $Q index entry data is defined as follows:
+ */
+ typedef struct {
+ __u32 version; /* Currently equals 2. */
+ QUOTA_FLAGS flags; /* Flags describing this quota entry. */
+ __u64 bytes_used; /* How many bytes of the quota are in use. */
+ __u64 change_time; /* Last time this quota entry was changed. */
+ __s64 threshold; /* Soft quota (-1 if not limited). */
+ __s64 limit; /* Hard quota (-1 if not limited). */
+ __u64 exceeded_time; /* How long the soft quota has been exceeded. */
+ SID sid; /* The SID of the user/object associated with
+ this quota entry. Equals zero for the quota
+ defaults entry. */
+ } __attribute__ ((__packed__)) QUOTA_CONTROL_ENTRY, QUOTA_INDEX_DATA;
+
+ /*
* Index entry flags (16-bit).
*/
***************
*** 1359,1373 ****
/*
- * The system file FILE_$Extend/$Reparse contains an index listing all reparse
- * points on the volume. The index entry keys are as defined below.
- * Note: There is no data associated with the index entries.
- */
- typedef struct {
- __u32 reparse_tag; /* Reparse point type (inc. flags). */
- MFT_REFERENCE file_id; /* Mft record of the file containing the
- reparse point attribute. */
- } __attribute__ ((__packed__)) REPARSE_INDEX_KEY;
-
- /*
* This is an index entry. A sequence of such entries follows each INDEX_HEADER
* structure. Together they make up a complete index. The index follows either
--- 1506,1509 ----
***************
*** 1383,1406 ****
indexes. */
struct { /* Used for views/indexes to find the entry's data. */
! __u16 data_offset; /* Data byte offset. */
__u16 data_length; /* Data length in bytes. */
__u32 reserved; /* Reserved (zero). */
} __attribute__ ((__packed__));
} __attribute__ ((__packed__));
! __u16 length; /* Byte size of this index entry. */
! __u16 attribute_length; /* Byte size of the attribute value,
! which is in the index entry. It
! starts just after reserved entry. */
! INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */
! __u16 reserved; /* Reserved/align to 8-byte boundary. */
union { /* The key of the indexed attribute. NOTE: Only present
if INDEX_ENTRY_END bit in flags is not set. NOTE: On
NTFS versions before 3.0 the only valid key is the
! FILENAME_ATTRIBUTE. */
! FILENAME_ATTRIBUTE filename; /* Used in directory indexes. */
! SII_INDEX_KEY sii; /* Used in $SII index. */
! SDH_INDEX_KEY sdh; /* Used in $SDH index. */
! REPARSE_INDEX_KEY reparse; /* Used in $Reparse index. */
} __attribute__ ((__packed__));
// __s64 vcn; /* If INDEX_ENTRY_NODE bit in flags is set, the last
// eight bytes of this index entry contain the virtual
--- 1519,1548 ----
indexes. */
struct { /* Used for views/indexes to find the entry's data. */
! __u16 data_offset; /* Data byte offset from this
! INDEX_ENTRY. Follows the
! index key. */
__u16 data_length; /* Data length in bytes. */
__u32 reserved; /* Reserved (zero). */
} __attribute__ ((__packed__));
} __attribute__ ((__packed__));
! __u16 length; /* Byte size of this index entry. */
! __u16 key_length; /* Byte size of the key value, which is in the
! index entry. It follows field reserved. */
! INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */
! __u16 reserved; /* Reserved/align to 8-byte boundary. */
union { /* The key of the indexed attribute. NOTE: Only present
if INDEX_ENTRY_END bit in flags is not set. NOTE: On
NTFS versions before 3.0 the only valid key is the
! FILENAME_ATTRIBUTE. On NTFS 3.0+ the following
! additional index keys are defined: */
! FILENAME_ATTRIBUTE filename; /* Directory indexes. */
! SII_INDEX_KEY sii; /* $SII index in $Secure. */
! SDH_INDEX_KEY sdh; /* $SDH index in $Secure. */
! OBJ_ID_INDEX_KEY obj_id; /* $O index in $ObjId. */
! REPARSE_INDEX_KEY reparse; /* $R index in $Reparse. */
! QUOTA_O_INDEX_KEY quota_o; /* $O index in $Quota. */
! QUOTA_Q_INDEX_KEY quota_q; /* $Q index in $Quota. */
} __attribute__ ((__packed__));
+ /* The (optional) index data is inserted here. */
// __s64 vcn; /* If INDEX_ENTRY_NODE bit in flags is set, the last
// eight bytes of this index entry contain the virtual
***************
*** 1432,1437 ****
* Attribute: Reparse point (0xc0).
*
! * FIXME: Describe more about reparse points here including the flags in the
! * ReparseTag.
*/
typedef struct {
--- 1574,1579 ----
* Attribute: Reparse point (0xc0).
*
! * FIXME: Describe more about reparse points here, including the flags in the
! * reparse_tag.
*/
typedef struct {
***************
*** 1494,1553 ****
*
* Operations on this attribute are logged to the journal ($LogFile) like
! * normal metadata changes. Used by the Encrypting File System (EFS).
*/
typedef struct {
/* Can be anything the creator chooses. */
! } __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM;
!
! /*
! * Predefined owner_ids (32-bit).
! */
! typedef enum {
! QUOTA_INVALID_ID = cpu_to_le32(0x00000000),
! QUOTA_DEFAULTS_ID = cpu_to_le32(0x00000001),
! QUOTA_FIRST_USER_ID = cpu_to_le32(0x00000100),
! } PREDEFINED_OWNER_ID;
!
! /*
! * Quota flags (32-bit).
! */
! typedef enum {
! /* The user quota flags. Names, explain meaning. */
! QUOTA_FLAG_DEFAULT_LIMITS = cpu_to_le32(0x00000001),
! QUOTA_FLAG_LIMIT_REACHED = cpu_to_le32(0x00000002),
! QUOTA_FLAG_ID_DELETED = cpu_to_le32(0x00000004),
!
! QUOTA_FLAG_USER_MASK = cpu_to_le32(0x00000007),
! /* Bit mask for user quota flags. */
!
! /* These flags are only present in the quota defaults index entry,
! i.e. in the entry where owner_id = QUOTA_DEFAULTS_ID. */
! QUOTA_FLAG_TRACKING_ENABLED = cpu_to_le32(0x00000010),
! QUOTA_FLAG_ENFORCEMENT_ENABLED = cpu_to_le32(0x00000020),
! QUOTA_FLAG_TRACKING_REQUESTED = cpu_to_le32(0x00000040),
! QUOTA_FLAG_LOG_THRESHOLD = cpu_to_le32(0x00000080),
! QUOTA_FLAG_LOG_LIMIT = cpu_to_le32(0x00000100),
! QUOTA_FLAG_OUT_OF_DATE = cpu_to_le32(0x00000200),
! QUOTA_FLAG_CORRUPT = cpu_to_le32(0x00000400),
! QUOTA_FLAG_PENDING_DELETES = cpu_to_le32(0x00000800),
! } QUOTA_FLAGS;
!
! /*
! * The system file FILE_$Extend/$Quota contains an index listing all quota
! * entries (one for each user/object being subject to a quota) for the volume.
! * The index entry data is defined as below and the key for the index entries
! * is the owner_id (found in the standard information attribute).
! */
! typedef struct {
! __u32 version; /* Currently equals 2. */
! QUOTA_FLAGS flags; /* Flags describing this quota entry. */
! __u64 bytes_used; /* How many bytes of the quota are in use. */
! __u64 change_time; /* Last time this quota entry was changed. */
! __u64 threshold; /* Soft quota. */
! __u64 limit; /* Hard quota. */
! __u64 exceeded_time; /* How long the soft quota has been exceeded. */
! SID sid; /* The SID of the user/object associated with
! this quota data. */
! } QUOTA_USER_DATA;
/* min macro used in attrib.c */
--- 1636,1649 ----
*
* Operations on this attribute are logged to the journal ($LogFile) like
! * normal metadata changes.
! *
! * Used by the Encrypting File System (EFS). All encrypted files have this
! * attribute with the name $EFS.
*/
typedef struct {
/* Can be anything the creator chooses. */
! /* EFS uses it as follows: */
! // FIXME: Type this info, verifying it along the way. (AIA)
! } __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTRIBUTE;
/* min macro used in attrib.c */
|
|
From: Anton A. <an...@us...> - 2001-03-03 00:10:07
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv10765
Modified Files:
attrib.h
Log Message:
Mostly finished adding the $Secure information.
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** attrib.h 2001/03/02 15:03:56 1.9
--- attrib.h 2001/03/03 00:11:17 1.10
***************
*** 406,411 ****
disabled. */
/* 50*/ __u32 security_id; /* Security id for the file. Translate via
! bidir index to granted access Acl. Is an
! index into FILE_$Secure. */
/* 54*/ __u64 quota_charged; /* Byte size of the charge to the quota for
all streams of the file. Is zero if quotas
--- 406,411 ----
disabled. */
/* 50*/ __u32 security_id; /* Security id for the file. Translate via
! $SII index and $SDS data stream in
! FILE_$Secure to the security descriptor. */
/* 54*/ __u64 quota_charged; /* Byte size of the charge to the quota for
all streams of the file. Is zero if quotas
***************
*** 1112,1115 ****
--- 1112,1195 ----
/*
+ * On NTFS 3.0+, all security descriptors are stored in FILE_$Secure. Only one
+ * referenced instance of each unique security descriptor is stored.
+ *
+ * FILE_$Secure contains no unnamed data attribute, i.e. it has zero length. It
+ * does, however, contain two indexes ($SDH and $SII) as well as a named data
+ * stream ($SDS).
+ *
+ * Every unique security descriptor is assigned a unique security identifier
+ * (security_id, not to be confused with a SID). The security_id is unique for
+ * the NTFS volume and is used as an index into the $SII index, which maps
+ * security_ids to the security descriptor's storage location within the $SDS
+ * data attribute. The $SII index is sorted by ascending security_id.
+ *
+ * A simple hash is computed from each security descriptor. This hash is used
+ * as an index into the $SDH index, which maps security descriptor hashes to
+ * the security descriptor's storage location within the $SDS data attribute.
+ * The $SDH index is sorted by security descriptor hash and is stored in a B+
+ * tree. When searching $SDH (with the intent of determining whether or not a
+ * new security descriptor is already present in the $SDS data stream), if a
+ * matching hash is found, but the security descriptors do not match, the
+ * search in the $SDH index is continued, searching for a next matching hash.
+ *
+ * When a precise match is found, the security_id coresponding to the security
+ * descriptor in the $SDS attribute is read from the found $SDH index entry and
+ * is stored in the $STANDARD_INFORMATION attribute of the file/directory to
+ * which the security descriptor is being applied. The $STANDARD_INFORMATION
+ * attribute is present in all base mft records (i.e. in all files and
+ * directories).
+ *
+ * If a match is not found, the security descriptor is assigned a new unique
+ * security_id and is added to the $SDS data attribute. Then, entries
+ * referencing the this security descriptor in the $SDS data attribute are
+ * added to the $SDH and $SII indexes.
+ *
+ * Note: Entries are never deleted from FILE_$Secure, even if nothing
+ * references an entry any more.
+ */
+
+ /*
+ * This header precedes each security descriptor in the $SDS data stream.
+ * This is also the index entry data part of both the $SII and $SDH indexes.
+ */
+ typedef struct {
+ __u32 hash; /* Hash of the security descriptor. */
+ __u32 security_id; /* The security_id assigned to the descriptor. */
+ __u64 offset; /* Byte offset of this entry in the $SDS stream. */
+ __u32 length; /* Size in bytes of this entry. */
+ } __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_HEADER;
+
+ /*
+ * The $SDS data stream contains the security descriptors, aligned on 32-bit
+ * boundaries, sorted by security_id in a B+ tree. Security descriptors cannot
+ * cross 256kib boundaries (this restriction is imposed by the Windows cache
+ * manager). Each security descriptor is contained in a SDS_ENTRY structure.
+ * Also, each security descriptor is stored twice in the $SDS stream with a
+ * fixed offset of XYZ bytes between them.
+ */
+ typedef struct {
+ SECURITY_DESCRIPTOR_HEADER; /* The security descriptor header. */
+ SECURITY_DESCRIPTOR_RELATIVE; /* The self-relative security
+ descriptor. */
+ } __attribute__ ((__packed__)) SDS_ENTRY;
+
+ /*
+ * The index entry key used in the $SII index.
+ */
+ typedef struct {
+ __u32 security_id; /* The security_id assigned to the descriptor. */
+ } __attribute__ ((__packed__)) SII_INDEX_KEY;
+
+ /*
+ * The index entry key used in the $SDH index. The keys are sorted by first by
+ * hash and then by security_id.
+ */
+ typedef struct {
+ __u32 hash; /* Hash of the security descriptor. */
+ __u32 security_id; /* The security_id assigned to the descriptor. */
+ } __attribute__ ((__packed__)) SDH_INDEX_KEY;
+
+ /*
* Attribute: Volume name (0x60).
*
***************
*** 1279,1282 ****
--- 1359,1373 ----
/*
+ * The system file FILE_$Extend/$Reparse contains an index listing all reparse
+ * points on the volume. The index entry keys are as defined below.
+ * Note: There is no data associated with the index entries.
+ */
+ typedef struct {
+ __u32 reparse_tag; /* Reparse point type (inc. flags). */
+ MFT_REFERENCE file_id; /* Mft record of the file containing the
+ reparse point attribute. */
+ } __attribute__ ((__packed__)) REPARSE_INDEX_KEY;
+
+ /*
* This is an index entry. A sequence of such entries follows each INDEX_HEADER
* structure. Together they make up a complete index. The index follows either
***************
*** 1291,1298 ****
entry. Used for directory
indexes. */
! struct { /* Used for view indexes. */
! __u16 data_offset; /* View data byte offset. */
! __u16 data_length; /* View data length in bytes. */
! __u32 reserved; /* Reserved. Set to zero. */
} __attribute__ ((__packed__));
} __attribute__ ((__packed__));
--- 1382,1389 ----
entry. Used for directory
indexes. */
! struct { /* Used for views/indexes to find the entry's data. */
! __u16 data_offset; /* Data byte offset. */
! __u16 data_length; /* Data length in bytes. */
! __u32 reserved; /* Reserved (zero). */
} __attribute__ ((__packed__));
} __attribute__ ((__packed__));
***************
*** 1303,1321 ****
INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */
__u16 reserved; /* Reserved/align to 8-byte boundary. */
! // FILENAME_ATTRIBUTE filename; /* The value of the indexed attribute.
! // On NTFS versions before 3.0 this is
! // always a FILENAME_ATTRIBUTE.
! // NOTE: Only present if bit in flags
! // INDEX_ENTRY_END is not set. */
! // __s64 vcn; /* If INDEX_ENTRY_NODE bit in flags is
! // set, the last eight bytes of this
! // index entry contain the virtual
! // cluster number of the index block
! // that holds the entries immediately
! // preceding the current entry (the
! // vcn references the corresponding
! // cluster in the data of the
! // non-resident index allocation
! // attribute). */
} __attribute__ ((__packed__)) INDEX_ENTRY;
--- 1394,1412 ----
INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */
__u16 reserved; /* Reserved/align to 8-byte boundary. */
! union { /* The key of the indexed attribute. NOTE: Only present
! if INDEX_ENTRY_END bit in flags is not set. NOTE: On
! NTFS versions before 3.0 the only valid key is the
! FILENAME_ATTRIBUTE. */
! FILENAME_ATTRIBUTE filename; /* Used in directory indexes. */
! SII_INDEX_KEY sii; /* Used in $SII index. */
! SDH_INDEX_KEY sdh; /* Used in $SDH index. */
! REPARSE_INDEX_KEY reparse; /* Used in $Reparse index. */
! } __attribute__ ((__packed__));
! // __s64 vcn; /* If INDEX_ENTRY_NODE bit in flags is set, the last
! // eight bytes of this index entry contain the virtual
! // cluster number of the index block that holds the
! // entries immediately preceding the current entry (the
! // vcn references the corresponding cluster in the data
! // of the non-resident index allocation attribute). */
} __attribute__ ((__packed__)) INDEX_ENTRY;
***************
*** 1352,1366 ****
/*
- * The system file FILE_$Extend/$Reparse contains an index listing all reparse
- * points on the volume. The index entries have keys as defined below and there
- * is no data associated with them.
- */
- typedef struct {
- __u32 reparse_tag; /* Reparse point type (inc. flags). */
- MFT_REFERENCE file_id; /* Mft record of the file containing the
- reparse point attribute. */
- } __attribute__ ((__packed__)) REPARSE_INDEX_KEY;
-
- /*
* Attribute: Extended attribute (EA) information (0xd0).
*/
--- 1443,1446 ----
***************
*** 1460,1464 ****
*/
typedef struct {
! __u32 version; /* Equals 2. */
QUOTA_FLAGS flags; /* Flags describing this quota entry. */
__u64 bytes_used; /* How many bytes of the quota are in use. */
--- 1540,1544 ----
*/
typedef struct {
! __u32 version; /* Currently equals 2. */
QUOTA_FLAGS flags; /* Flags describing this quota entry. */
__u64 bytes_used; /* How many bytes of the quota are in use. */
|
|
From: Anton A. <an...@us...> - 2001-03-02 15:07:59
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv6047/ntfstools
Added Files:
mkntfs.c
Log Message:
Added begin of mkntfs utility. (Doesn't do anything, including doesn't compile at the moment.)
--- NEW FILE ---
const char *EXEC_NAME = "mkntfs";
const char *EXEC_VERSION = "0.0.1";
/*
* mkntfs - Part of the Linux-NTFS project.
*
* Copyright (c) 2000,2001 Anton Altaparmakov.
*
* This utility will create an NTFS volume on a user specified block device.
*
* Anton Altaparmakov <ai...@ca...>
*
* This program 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/*
* WARNING: This program might not work on architectures which do not allow
* unaligned access. For those, the program would need to start using
* get/put_unaligned macros (#include <asm/unaligned.h>), but not doing it yet,
* since NTFS really mostly applies to ia32 only, which does allow unaligned
* accesses. We might not actually have a problem though, since the structs are
* defined as being packed so that might be enough for gcc to insert the
* correct code.
*
* If anyone using a non-little endian and/or an aligned access only CPU tries
* this program please let me know whether it works or not!
*
* Anton Altaparmakov <ai...@ca...>
*/
//#include <unistd.h>
//#include <stdlib.h>
//#include <stdio.h>
//#include <linux/types.h>
//#include <fcntl.h>
//#include <errno.h>
//#include <string.h>
//#include "attrib.h"
//#include "endians.h"
//#include "mft.h"
//#include "disk_io.h"
//#include "volume.h"
//#include "logfile.h"
struct {
int cluster_size; /* -b, in bytes, 512*1024 max,
power of 2, if not specified
determined by file system size. */
char check_bad_blocks = 0; /* -c, read-only test for bad
clusters. */
char no_action = 0; /* -n, do not write to device, only
display what would be done. */
char *bad_blocks_filename = NULL; /* -l filename, file to read list of
bad clusters from. */
char quiet = 0; /* -q, quiet execution. */
char verbose = 0; /* -v, verbose execution. */
char force = 0; /* -F, force fs creation. */
char *volume_label = NULL; /* -L, set the volume label. */
union { /* -r, revision of ntfs, 1.2 or 3.0 */
__u16 ntfs_version;
struct {
__u8 ntfs_major_ver;
__u8 ntfs_minor_ver;
}
}
char version_only; /* -V, print the version number and
exit */
char quick_format = 0; /* Don't zero the volume. */
__u64 number_of_clusters;
__u64 mft_record_size = 1024;
__u64 index_record_size = 4096;
__u64 mft_size;
__u64 logfile_size;
} opt;
int main(int argc, char **argv)
{
RESTART_PAGE_HEADER *rph;
RESTART_AREA *rr;
RESTART_CLIENT *cr;
int pass = 1;
int i, lps;
options opt;
printf("\n");
if (argc < 2) {
printf("%s v%s - Create an NTFS volume on a user specified "
"block device.\n\n"
/* Generic copyright / disclaimer. */
"Copyright (c) 2000, 2001 Anton Altaparmakov.\n\n"
"%s is free software, released under the GNU "
"General Public License\nand you are welcome to "
"redistribute it under certain conditions.\n"
"%s comes with ABSOLUTELY NO WARRANTY; for details "
"read the GNU\nGeneral Public License to be found "
"in the file COPYING in the main Linux-NTFS\n"
"distribution directory.\n\n"
/* Generic part ends here. */
"Syntax: mkntfs block_device\n"
" e.g. mkntfs /dev/hda6\n\n",
EXEC_NAME, EXEC_VERSION, EXEC_NAME, EXEC_NAME);
fprintf(stderr, "Error: incorrect syntax\n");
exit(1);
}
// Parse command line options!!!
// Need to have: block size, device size / number of blocks to use, cluster
// size, mft record size, index record size, ntfs version, mft
// size, logfile size, volume label, list of bad blocks, quick-
// format, verbose, check for bad blocks, ...
if (stat(name, &sbuf)) {
fprintf(stderr, "Error getting information about %s: %s\n",
name, sterror(errno));
exit(1);
}
if (!S_ISBLK(sbuf.st_mode)) {
fprintf(stderr, "Error: %s is not a block devicer.\n", name);
exit(1);
}
// - Determine real size of device.
// - Open device.
// - If not quickformat then overwrite the device with 0s (except bad blocks!).
// - Create & write (C&w) empty $Mft & $MftMirr ($MftMirr in the middle of the
// partition (not on bad blocks!).
// - C&w $BitMap (not on bad blocks!).
// - C&w empty $BadClus (or if bad blocks are specified fill with these)
// (allocating the bad clusters if present in the $BitMap).
// - C&w bootsector ($Boot) & backup bootsector (backup in last sector of the
// partition).
// - C&w $Volume.
// - C&w empty $LogFile (fill with -1).
// - C&w $AttrDef according to ntfs version.
// - C&w $UpCase (need this to be from a static copyr; don't know a way to
// generate it).
// - Depending on the ntfs version, c&w $Secure file and $Extend directory with
// the corresponding special files in it (i.e. $ObjId, $Quota, $Reparse and
// $UsnJrnl and others?).
// - C&w $root and fill with the system files (and $Extend directory if
// applicable). Possibly should move this as far to the top as possible and
// update during each subsequent c&w.
// - Close device.
return 0;
}
|
|
From: Anton A. <an...@us...> - 2001-03-02 15:07:59
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv6047 Added Files: TODO.mkntfs Log Message: Added begin of mkntfs utility. (Doesn't do anything, including doesn't compile at the moment.) --- NEW FILE --- - mkntfs should be hard linked with mkfs.ntfs for the mkfs utility. |
|
From: Anton A. <an...@us...> - 2001-03-02 15:05:11
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv5502/ntfstools
Modified Files:
Makefile.am ntfsdump_logfile.c ntfsfix.c
Log Message:
Full commit of my current dircetory. New files not yet added.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 2001/02/03 02:03:36 1.2
--- Makefile.am 2001/03/02 15:06:37 1.3
***************
*** 1,17 ****
! bin_PROGRAMS = ntfsfix ntfsdump_logfile
linux_ntfsincludedir = -I$(top_srcdir)/include
ntfsfix_SOURCES = ntfsfix.c
ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la
ntfsdump_logfile_SOURCES= ntfsdump_logfile.c
ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la
-
- # Set the include path.
- INCLUDES = -I$(top_srcdir)/include $(all_includes)
-
- # The library search path.
- ntfsfix_LDFLAGS = $(all_libraries)
ntfsdump_logfile_LDFLAGS= $(all_libraries)
--- 1,19 ----
! bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs
linux_ntfsincludedir = -I$(top_srcdir)/include
+ # Set the include path.
+ INCLUDES = -I$(top_srcdir)/include $(all_includes)
+
ntfsfix_SOURCES = ntfsfix.c
ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la
+ ntfsfix_LDFLAGS = $(all_libraries)
ntfsdump_logfile_SOURCES= ntfsdump_logfile.c
ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la
ntfsdump_logfile_LDFLAGS= $(all_libraries)
+
+ mkntfs_SOURCES = mkntfs.c
+ mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
+ mkntfs_LDFLAGS = $(all_libraries)
Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ntfsdump_logfile.c 2001/02/02 00:16:18 1.2
--- ntfsdump_logfile.c 2001/03/02 15:06:37 1.3
***************
*** 138,142 ****
/* Find the $DATA attribute of the $LogFile. */
a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! find_attribute((MFT_RECORD_HEADER*)b1, $DATA, NULL);
if (!a) {
fprintf(stderr, "Error: Attribute $DATA was not found in" \
--- 138,142 ----
/* Find the $DATA attribute of the $LogFile. */
a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! find_first_attr(vol, (MFT_RECORD_HEADER*)b1, $DATA, NULL);
if (!a) {
fprintf(stderr, "Error: Attribute $DATA was not found in" \
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ntfsfix.c 2001/02/03 04:21:49 1.5
--- ntfsfix.c 2001/03/02 15:06:37 1.6
***************
*** 334,338 ****
/* Find the $DATA attribute. */
a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! find_attribute((MFT_RECORD_HEADER*)(b1+(2*mrs)), $DATA, NULL);
if (!a) {
puts(FAILED);
--- 334,339 ----
/* Find the $DATA attribute. */
a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! find_first_attr(vol, (MFT_RECORD_HEADER*)(b1+(2*mrs)), $DATA,
! NULL);
if (!a) {
puts(FAILED);
|
|
From: Anton A. <an...@us...> - 2001-03-02 15:04:31
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv5330
Modified Files:
attrib.c disk_io.c ntfs_rec.c volume.c
Log Message:
Commit latest library state. !!!NOTE!!! This breaks everything!!! I'm in the
middle of rewritting the find_attribute stuff in attrib.c at the moment.
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** attrib.c 2001/01/30 12:55:21 1.2
--- attrib.c 2001/03/02 15:05:53 1.3
***************
*** 31,35 ****
* This would be defining wchar_t in the kernel, but stdio.h defines it for
* userspace. FIXME: I have been a bit slack and defining __u16 instead of
! * wchar_t in most places. This will need fixing at some point.
*/
/* #include <linux/nls.h> */
--- 31,35 ----
* This would be defining wchar_t in the kernel, but stdio.h defines it for
* userspace. FIXME: I have been a bit slack and defining __u16 instead of
! * wchar_t in most places. This will need fixing at some point. (AIA)
*/
/* #include <linux/nls.h> */
***************
*** 46,61 ****
#define p2n(p) ((ptrdiff_t)((ptrdiff_t*)(p)))
! ATTRIBUTE_RECORD_HEADER *find_attribute(const MFT_RECORD_HEADER *b,
const ATTRIBUTE_TYPE t,
! const wchar_t *n)
{
! ATTRIBUTE_RECORD_HEADER *a;
/* Sanity/size/alignment checks. */
! if (!b || !is_mft_recordp(b) ||
! !(b->flags & MFT_RECORD_IN_USE) ||
! b->base_mft_record ||
! p2n((char*)b + b->attributes_offset) & 7 ||
! p2n((char*)b + b->bytes_in_use) & 7 ||
le16_to_cpu(b->attributes_offset) >= le32_to_cpu(b->bytes_in_use)) {
#ifdef DEBUG
--- 46,161 ----
#define p2n(p) ((ptrdiff_t)((ptrdiff_t*)(p)))
! ATTRIBUTE_RECORD_HEADER *find_next_attr_in_attr_list(
! const ntfs_volume *v,
! const MFT_RECORD_HEADER *m,
! const ATTRIBUTE_RECORD_HEADER *al,
const ATTRIBUTE_TYPE t,
! const wchar_t *n,
! FIND_ATTR_CTX_FLAGS *ctx)
{
! __u64 alen;
! ATTRIBUTE_LIST_ENTRY *ale, *aend;
! int got_there = 0;
!
! if (!al || !ctx || al->type != $ATTRIBUTE_LIST) {
! errno = EINVAL;
! goto ret_now;
! }
! if (al->flags) {
! #ifdef DEBUG
! puts("Error! Compressed/sparse/encrypted attribute lists not "
! "supported.");
! #endif
! errno = ENOTSUP;
! goto ret_now;
! }
! /* Get the actual attribute list and it's length. */
! alen = get_attribute_value_length(al);
! if (!al->non_resident) {
! #define RA(a) ((RESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
! astart = (ATTRIBUTE_LIST_ENTRY*)((char*)al +
! le16_to_cpu(RA(al)->value_offset));
! #undef RA
! } else {
! #define NA(a) ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
! if (!(astart = (ATTRIBUTE_LIST_ENTRY*)malloc(alen)))
! goto ret_now;
! if (get_attribute_value(v, al, astart) != alen)
! goto error_ret;
! #undef NA
! }
! /* Set aend to first byte after the attribute list. */
! aend = (ATTRIBUTE_LIST_ENTRY*)((char*)astart + alen);
! /* Iterate over all attribute list entries looking for the right one. */
! for (ale = astart; ale < aend; ale = (ATTRIBUTE_LIST_ENTRY*)
! ((char*)ale + le16_to_cpu(ale->length))) {
! /* If we encounter lowest_vcn != 0 then instance is 0 and we
! are currently in a list of extents. */
! if (*ctx == FIRST_SEARCH) {
! /* The attribute was not found in the base mft record
! at all. Thus take the first matching entry and
! return that. */
! *ctx = IN_ATTR_LIST | ...;
! } else {
! /* The attribute has been found before. */
! if (!(*ctx & IN_ATTR_LIST)) {
! /* We were not in the attribute list before,
! yet we had found the attribute at least once
! already. The entry we had found will be
! duplicated in the attribute list. Thus, skip
! the first matching entry (which will be the
! duplicate one). */
! /* FIXME: This won't work as we get into nested
! extents / attributes problem! Argh! We _have_
! to search the attribute list if it is present
! and ignore the base mft record otherwise.
! We search the base mft record for other
! attributes only if the attribute list entry
! points us to it. */
! *ctx |= IN_ATTR_LIST;
! } else {
! /* We were in the attribute list already, */
! }
! }
! }
! errno = ENOENT;
! error_ret:
! if (al->non_resident)
! free(astart);
! ret_now:
! return NULL;
! }
!
! __inline__ ATTRIBUTE_RECORD_HEADER *find_first_attr_in_attr_list(
! const ntfs_volume *v,
! const MFT_RECORD_HEADER *m,
! const ATTRIBUTE_RECORD_HEADER *al,
! const ATTRIBUTE_TYPE t,
! const wchar_t *n,
! FIND_ATTR_CTX_FLAGS *ctx)
! {
! FIND_ATTR_CTX_FLAGS c;
!
! if (!ctx)
! ctx = &c;
! *ctx = FIRST_SEARCH;
! return find_next_attr_in_attr_list(v, m, al, t, n, ctx);
! }
+ ATTRIBUTE_RECORD_HEADER *find_next_attr(const ntfs_volume *v,
+ const MFT_RECORD_HEADER *b,
+ const ATTRIBUTE_TYPE t,
+ const wchar_t *n,
+ FIND_ATTR_CTX_FLAGS *ctx)
+ {
+ ATTRIBUTE_RECORD_HEADER *a, *al = NULL;
+ int got_there = 0;
+
/* Sanity/size/alignment checks. */
! if (!b || !ctx || !is_mft_recordp(b) ||
! !(b->flags & MFT_RECORD_IN_USE) ||
! b->base_mft_record ||
! p2n((char*)b + b->attributes_offset) & 7 ||
! p2n((char*)b + b->bytes_in_use) & 7 ||
le16_to_cpu(b->attributes_offset) >= le32_to_cpu(b->bytes_in_use)) {
#ifdef DEBUG
***************
*** 67,73 ****
/* Position of the first attribute. */
a = (ATTRIBUTE_RECORD_HEADER*)(le16_to_cpu(b->attributes_offset) +
! (char*)b);
! /* Alignment check. Note: Can't move this inside while loop, since if
! this fails a->type will fail too but it will cause an exception! */
if (p2n(a) & 7) {
#ifdef DEBUG
--- 167,171 ----
/* Position of the first attribute. */
a = (ATTRIBUTE_RECORD_HEADER*)(le16_to_cpu(b->attributes_offset) +
! (char*)b);
if (p2n(a) & 7) {
#ifdef DEBUG
***************
*** 76,80 ****
return NULL;
}
! /* Iterate over all atributes. */
while (a->type != $END) {
if (le32_to_cpu(a->length) + (char*)a >=
--- 174,180 ----
return NULL;
}
! if (t == 0)
! goto found_it;
! /* Iterate over the attributes. */
while (a->type != $END) {
if (le32_to_cpu(a->length) + (char*)a >=
***************
*** 87,95 ****
}
if (a->type == t) {
/* If want an unnamed attribute, check if current one
is unnamed and if so we have found it! */
if (!n) {
! if (!a->name_length)
return a;
/* If we want a named attribute, check that the string
length is equal and if so, compare the two strings
--- 187,207 ----
}
if (a->type == t) {
+ /* If this is not the first search, we need to find
+ the attribute with instance *ctx & INSTANCE_MASK.
+ We then need to return the first matching attribute
+ following this one. */
+ if (*ctx != FIRST_SEARCH && !got_there) {
+ if (a->instance == *ctx & INSTANCE_MASK)
+ got_there = 1;
+ goto do_next_attr;
+ }
/* If want an unnamed attribute, check if current one
is unnamed and if so we have found it! */
if (!n) {
! if (!a->name_length) {
! found_it:
! *ctx = a->instance;
return a;
+ }
/* If we want a named attribute, check that the string
length is equal and if so, compare the two strings
***************
*** 110,158 ****
continue with the search (i.e. don't
return NULL).
! FIXME: Shouldn't we doing a hotfix
! here, i.e. truncate the name to the
! indicated size or change the
! indicated size, whichever makes more
! sense? */
/* FIXME: Should we really be case sensitive?
If not we should be using the $UpCase table,
thus we need a custom function for
! comparisons. */
} else if (!wcscmp(n, (wchar_t*)((char*)a +
le16_to_cpu(a->name_offset))))
! return a;
}
- }
- /* FIXME: If we find an attribute list then the attribute we
- are looking for might be in there, but we don't handle those
- yet, so just skip it for now and emitt a warning. */
- if (a->type == $ATTRIBUTE_LIST) {
- puts("Warning: Encountered attribute list attribute"
- "which we can't handle yet.");
}
/* Get next attribute. */
a = (ATTRIBUTE_RECORD_HEADER*)((char *)a +
le32_to_cpu(a->length));
- /* Alignment check. */
if (p2n(a) & 7) {
#ifdef DEBUG
! puts("Allignment check (3) failed in " \
"find_attribute()!");
#endif
return NULL;
}
! }
! #ifdef DEBUG
! if (n)
! printf("Named attribute 0x%x not found in " \
! "find_attribute()!", t);
! else
! printf("Unnamed attribute 0x%x not found in " \
! "find_attribute()!", t);
! #endif
return NULL;
}
! int set_ntfs_volume_flags(MFT_RECORD_HEADER *b, const __u16 flags)
{
RESIDENT_ATTRIBUTE_RECORD_HEADER *r;
--- 222,285 ----
continue with the search (i.e. don't
return NULL).
! FIXME: Shouldn't we be doing a hotfix
! here? */
/* FIXME: Should we really be case sensitive?
If not we should be using the $UpCase table,
thus we need a custom function for
! comparisons. Can't just use strcasecmp(). */
} else if (!wcscmp(n, (wchar_t*)((char*)a +
le16_to_cpu(a->name_offset))))
! goto found_it;
}
}
+ do_next_attr:
+ /* If an attribute list is present, save it. */
+ if (!al && a->type == $ATTRIBUTE_LIST)
+ al = a;
/* Get next attribute. */
a = (ATTRIBUTE_RECORD_HEADER*)((char *)a +
le32_to_cpu(a->length));
if (p2n(a) & 7) {
#ifdef DEBUG
! puts("Allignment check (4) failed in " \
"find_attribute()!");
#endif
return NULL;
}
! /* Gone too far? - Make sure to at least go as far as the
! attribute list. */
! if (le32_to_cpu(a->type) > le32_to_cpu(t) &&
! le32_to_cpu(a->type) > le32_to_cpu($ATTRIBUTE_LIST))
! break;
! }
! /* We have not found the attribute in the mft record @b. If an
! attribute_list was found, and we are not looking for it, search it
! now, otherwise return NULL. Second check needed if someone decides
! to search for a second attribute list, which, while braindamaged,
! could screw us up badly. */
! if (al && t != $ATTRIBUTE_LIST)
! attr_list_handling:
! return find_next_attr_in_attr_list(v, b, al, t, n, ctx);
! /* The requested attribute is not present. */
return NULL;
}
+
+ __inline__ ATTRIBUTE_RECORD_HEADER *find_first_attr(const ntfs_volume *v,
+ const MFT_RECORD_HEADER *b,
+ const ATTRIBUTE_TYPE t,
+ const wchar_t *n,
+ FIND_ATTR_CTX_FLAGS *ctx)
+ {
+ FIND_ATTR_CTX_FLAGS c;
+
+ if (!ctx)
+ ctx = &c;
+ *ctx = FIRST_SEARCH;
+ return find_next_attr(v, b, t, n, ctx);
+ }
! /* FIXME: Need to write the new flags to disk. */
! int set_ntfs_volume_flags(ntfs_volume *v, MFT_RECORD_HEADER *b,
! const __u16 flags)
{
RESIDENT_ATTRIBUTE_RECORD_HEADER *r;
***************
*** 163,167 ****
return 0;
/* Get a pointer to the volume information attribute. */
! if (!(r = (RESIDENT_ATTRIBUTE_RECORD_HEADER*)find_attribute(b,
$VOLUME_INFORMATION, NULL))) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION was " \
--- 290,294 ----
return 0;
/* Get a pointer to the volume information attribute. */
! if (!(r = (RESIDENT_ATTRIBUTE_RECORD_HEADER*)find_first_attr(v, b,
$VOLUME_INFORMATION, NULL))) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION was " \
***************
*** 192,196 ****
}
! __u64 get_attribute_value_length(const ATTRIBUTE_RECORD_HEADER *a)
{
if (!a) {
--- 319,323 ----
}
! __s64 get_attribute_value_length(const ATTRIBUTE_RECORD_HEADER *a)
{
if (!a) {
***************
*** 200,207 ****
errno = 0;
if (a->non_resident)
! return le64_to_cpu(((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
(a))->data_size);
else
! return (__u64)le32_to_cpu(((RESIDENT_ATTRIBUTE_RECORD_HEADER*)
(a))->value_length);
errno = EINVAL;
--- 327,334 ----
errno = 0;
if (a->non_resident)
! return sle64_to_cpu(((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
(a))->data_size);
else
! return (__s64)le32_to_cpu(((RESIDENT_ATTRIBUTE_RECORD_HEADER*)
(a))->value_length);
errno = EINVAL;
***************
*** 209,213 ****
}
! __u64 get_attribute_value(const ntfs_volume *vol,
const ATTRIBUTE_RECORD_HEADER *a, __u8 *b)
{
--- 336,340 ----
}
! __s64 get_attribute_value(const ntfs_volume *vol, const MFT_RECORD_HEADER *m,
const ATTRIBUTE_RECORD_HEADER *a, __u8 *b)
{
***************
*** 234,243 ****
le32_to_cpu(RA(a)->value_length));
errno = 0;
! return (__u64)le32_to_cpu(RA(a)->value_length);
#undef RA
} else { /* Attribute is not resident. */
#define NA(a) ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
run_list rl;
! __u64 total;
int r, i;
--- 361,370 ----
le32_to_cpu(RA(a)->value_length));
errno = 0;
! return (__s64)le32_to_cpu(RA(a)->value_length);
#undef RA
} else { /* Attribute is not resident. */
#define NA(a) ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
run_list rl;
! __s64 total;
int r, i;
***************
*** 247,250 ****
--- 374,380 ----
return 0;
}
+ /*
+ * FIXME: What about attribute lists?!? (AIA)
+ */
/* Decompress the mapping pairs array into a run list. */
rl = decompress_run_list(NA(a));
***************
*** 288,292 ****
/*
* FIXME: If compressed file: Only read if
! * lcn != 0. Otherwise, we are dealing with a
* sparse run and we just memset the user buffer
* to 0 for the length of the run, which should
--- 418,422 ----
/*
* FIXME: If compressed file: Only read if
! * lcn != -1. Otherwise, we are dealing with a
* sparse run and we just memset the user buffer
* to 0 for the length of the run, which should
***************
*** 320,330 ****
}
memcpy(b + total, intbuf,
! le64_to_cpu(NA(a)->data_size) - total);
free(intbuf);
! total = le64_to_cpu(NA(a)->data_size);
} else {
/*
* FIXME: If compressed file: Only read if
! * lcn != 0. Otherwise, we are dealing with a
* sparse run and we just memset the user buffer
* to 0 for the length of the run, which should
--- 450,460 ----
}
memcpy(b + total, intbuf,
! sle64_to_cpu(NA(a)->data_size) - total);
free(intbuf);
! total = sle64_to_cpu(NA(a)->data_size);
} else {
/*
* FIXME: If compressed file: Only read if
! * lcn != -1. Otherwise, we are dealing with a
* sparse run and we just memset the user buffer
* to 0 for the length of the run, which should
***************
*** 366,370 ****
int set_attribute_value(ntfs_volume *vol, ATTRIBUTE_RECORD_HEADER *a,
! const __u8 *b, __u64 l)
{
/* Sanity check. */
--- 496,500 ----
int set_attribute_value(ntfs_volume *vol, ATTRIBUTE_RECORD_HEADER *a,
! const __u8 *b, __s64 l)
{
/* Sanity check. */
***************
*** 401,405 ****
#define NA(a) ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
run_list rl;
! __u64 total;
int w, i;
--- 531,535 ----
#define NA(a) ((NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)(a))
run_list rl;
! __s64 total;
int w, i;
***************
*** 490,494 ****
}
/* Start at vcn = lowest_vcn and lcn 0. */
! vcn = le64_to_cpu(attr->lowest_vcn);
lcn = 0;
/* Get start of the mapping pairs array. */
--- 620,624 ----
}
/* Start at vcn = lowest_vcn and lcn 0. */
! vcn = sle64_to_cpu(attr->lowest_vcn);
lcn = 0;
/* Get start of the mapping pairs array. */
***************
*** 534,556 ****
}
/* Enter the current run length into the current
! * run_list_element. */
(rl + rlpos)->length = deltaxcn;
/* Increment the current vcn by the current run length. */
vcn += deltaxcn;
! /* Get the lcn change which really can be negative. */
! for (b = (*buf & 0xf) + ((*buf >> 4) & 0xf),
! deltaxcn = (__s8)buf[b--]; b > (*buf & 0xf); b--) {
! deltaxcn = (deltaxcn << 8) + buf[b];
}
- /* Change the current lcn to it's new value. */
- lcn += deltaxcn;
- /* Enter the current lcn into the current run_list_element. */
- (rl + rlpos)->lcn = lcn;
/* Get to the next run_list_element. */
rlpos++;
/* Increment the buffer position to the next mapping pair. */
! buf += (*buf & 0xf) + ((*buf >> 4) & 0xf) + 1;
}
! /* If there were no mapping pairs in the run_list, then rl will still
be NULL. */
if (rl) {
--- 664,692 ----
}
/* Enter the current run length into the current
! run_list_element. */
(rl + rlpos)->length = deltaxcn;
/* Increment the current vcn by the current run length. */
vcn += deltaxcn;
! /* There might be no lcn change at all, as is the case for
! sparse clusters, in which case we set the lcn to -1. */
! if (!(*buf & 0xf0))
! (rl + rlpos)->lcn = -1;
! else {
! /* Get the lcn change which really can be negative. */
! for (b = (*buf & 0xf) + ((*buf >> 4) & 0xf),
! deltaxcn = (__s8)buf[b--]; b > (*buf & 0xf); b--) {
! deltaxcn = (deltaxcn << 8) + buf[b];
! }
! /* Change the current lcn to it's new value. */
! lcn += deltaxcn;
! /* Enter the current lcn into the run_list_element. */
! (rl + rlpos)->lcn = lcn;
}
/* Get to the next run_list_element. */
rlpos++;
/* Increment the buffer position to the next mapping pair. */
! buf += (*buf & 0xf) + ((*buf >> 4) & 0xf) + 1;
}
! /* If there were no mapping pairs in the run_list, then rl will stil
be NULL. */
if (rl) {
***************
*** 570,580 ****
/*
* This is not necessary, but do it for completeness sake.
! * FIXME: Do we really want this zero? Zero means it is sparse,
! * but I guess better zero than an undefined random value...
*/
! (rl + rlpos)->lcn = 0;
/* The final vcn - 1 has to be equal to highest_vcn or
something has gone badly wrong. */
! if (vcn - 1 != le64_to_cpu(attr->highest_vcn)) {
free(rl);
puts("Corrupt Mapping Pairs Array in non-resident "
--- 706,716 ----
/*
* This is not necessary, but do it for completeness sake.
! * FIXME: Do we really want this -1? -1 means it is sparse,
! * but I guess better that than an undefined random value...
*/
! (rl + rlpos)->lcn = -1;
/* The final vcn - 1 has to be equal to highest_vcn or
something has gone badly wrong. */
! if (vcn - 1 != sle64_to_cpu(attr->highest_vcn)) {
free(rl);
puts("Corrupt Mapping Pairs Array in non-resident "
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** disk_io.c 2001/01/26 00:34:10 1.1
--- disk_io.c 2001/03/02 15:05:53 1.2
***************
*** 65,113 ****
}
__u64 mst_pwrite(int fd, const void *b, __u64 count, const __u64 pos)
{
! __u64 written, total;
char retry;
- void *buf;
if (!b) {
errno = EINVAL;
! return -1;
}
! if (!count)
! return 0;
/* Locate to position. */
! if (lseek(fd, pos, SEEK_SET) == (off_t)-1)
! return -1;
! /* Get memory for copy of data. */
! if (!(buf = malloc(count)))
! return -1;
! /* Make a copy of the data. */
! memcpy(buf, b, count);
! /* Prepare copied data for writing. */
! if (pre_write_mst_fixup((NTFS_RECORD_HEADER*)buf, count)) {
! __u16 *usn_pos;
! __u16 usn;
! /*
! * Ok, need to update usn in original buffer (b) as well,
! * otherwise two writes of the same data would result in the
! * same usn being written on top of the same usn, which means
! * no protection after first write and in fact it actually
! * would cause corruption and not just lack of protection!!!
! */
! usn_pos = (__u16*)((__u8*)b +
! le16_to_cpu(((NTFS_RECORD_HEADER*)b)->usa_ofs));
! usn = le16_to_cpup(usn_pos) + 1;
! if (usn == 0xffff || !usn)
! usn = 1;
! *usn_pos = cpu_to_le16(usn);
}
! /* Write the prepared data (copy). */
total = retry = 0;
do {
! written = write(fd, ((char *)buf) + total, count);
if (written == -1) {
! free(buf);
! return written;
}
else if (!written)
--- 65,105 ----
}
+ /*
+ * NOTE: We mst protect the data, write it, then mst deprotect it using a quick
+ * deprotect algorithm (no checking). This saves us from making a copy before
+ * the write and at the same causes the usn to be incremented in the buffer.
+ * This conceptually fits in better with the idea that cached data is always
+ * deprotected and protection is performed when the data is actually going to
+ * hit the disk and the cache is immediately deprotected again simulating an
+ * mst read on the written data. This way cache coherency is achieved.
+ */
__u64 mst_pwrite(int fd, const void *b, __u64 count, const __u64 pos)
{
! __u64 written, total, error;
char retry;
if (!b) {
errno = EINVAL;
! error = -1;
! goto error_end;
}
! if (!count) {
! error = 0;
! goto error_end;
! }
/* Locate to position. */
! if (lseek(fd, pos, SEEK_SET) == (off_t)-1) {
! error = -1;
! goto error_end;
}
! /* Prepare data for writing. */
! pre_write_mst_fixup((NTFS_RECORD_HEADER*)b, count);
! /* Write the prepared data. */
total = retry = 0;
do {
! written = write(fd, ((char *)b) + total, count);
if (written == -1) {
! error = -1;
! goto finished;
}
else if (!written)
***************
*** 117,127 ****
total += written;
} while (count && (retry < 3));
- /* Don't need the copy of the data anymore. */
- free(buf);
/* Sync write to disk. */
! if (fdatasync(fd) == -1)
! return -1;
/* Finally return the number of bytes written. */
! return total;
}
--- 109,124 ----
total += written;
} while (count && (retry < 3));
/* Sync write to disk. */
! if (fdatasync(fd) == -1) {
! error = -1;
! goto finished;
! }
/* Finally return the number of bytes written. */
! error = total;
! finished:
! /* Quickly deprotect the data again. */
! __post_read_mft_fixup((NTFS_RECORD_HEADER*)b, count);
! error_end:
! return error;
}
Index: ntfs_rec.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfs_rec.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ntfs_rec.c 2001/01/25 22:25:43 1.1
--- ntfs_rec.c 2001/03/02 15:05:54 1.2
***************
*** 25,28 ****
--- 25,54 ----
#include "endians.h"
+ __inline__ void __post_read_mst_fixup(NTFS_RECORD_HEADER *b, const __u32 size)
+ {
+ __u16 usa_ofs, usa_count;
+ __u16 *usa_pos, *data_pos;
+
+ /* Setup the variables. */
+ usa_ofs = le16_to_cpu(b->usa_ofs);
+ usa_count = le16_to_cpu(b->usa_count) - 1;
+ /* Position of usn in update sequence array. */
+ usa_pos = (__u16*)b + usa_ofs/sizeof(__u16);
+ /*
+ * Position in protected data of first __u16 that needs fixing up.
+ */
+ data_pos = (__u16*)b + NTFS_SECTOR_SIZE/sizeof(__u16) - 1;
+ /* Fixup all sectors. */
+ while (usa_count--) {
+ /*
+ * Increment position in usa and restore original data from
+ * the usa into the data buffer.
+ */
+ *data_pos = *(++usa_pos);
+ /* Increment position in data as well. */
+ data_pos += NTFS_SECTOR_SIZE/sizeof(__u16);
+ }
+ }
+
int post_read_mst_fixup(NTFS_RECORD_HEADER *b, const __u32 size)
{
***************
*** 55,59 ****
*/
data_pos = (__u16*)b + NTFS_SECTOR_SIZE/sizeof(__u16) - 1;
! /* Fixup all sectors. */
while (usa_count--) {
if (*data_pos != usn) {
--- 81,87 ----
*/
data_pos = (__u16*)b + NTFS_SECTOR_SIZE/sizeof(__u16) - 1;
! /*
! * Check for incomplete multi sector transfer(s).
! */
while (usa_count--) {
if (*data_pos != usn) {
***************
*** 66,69 ****
--- 94,103 ----
return 0;
}
+ data_pos += NTFS_SECTOR_SIZE/sizeof(__u16);
+ /* Re-setup the variables. */
+ usa_count = le16_to_cpu(b->usa_count) - 1;
+ data_pos = (__u16*)b + NTFS_SECTOR_SIZE/sizeof(__u16) - 1;
+ /* Fixup all sectors. */
+ while (usa_count--) {
/*
* Increment position in usa and restore original data from
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** volume.c 2001/01/30 12:55:21 1.3
--- volume.c 2001/03/02 15:05:54 1.4
***************
*** 222,226 ****
}
/* Find the bitmap attribute. */
! a = find_attribute(mb, $BITMAP, NULL);
if (!a) {
puts(FAILED);
--- 222,226 ----
}
/* Find the bitmap attribute. */
! a = find_first_attribute(vol, mb, $BITMAP, NULL);
if (!a) {
puts(FAILED);
***************
*** 253,257 ****
}
/* Find the $DATA attribute in $Mft. */
! a = find_attribute(mb, $DATA, NULL);
if (!a) {
puts(FAILED);
--- 253,257 ----
}
/* Find the $DATA attribute in $Mft. */
! a = find_first_attribute(vol, mb, $DATA, NULL);
if (!a) {
puts(FAILED);
***************
*** 310,314 ****
}
/* Find the bitmap (it is in the $DATA attribute). */
! a = find_attribute(mb, $DATA, NULL);
if (!a) {
puts(FAILED);
--- 310,314 ----
}
/* Find the bitmap (it is in the $DATA attribute). */
! a = find_first_attribute(vol, mb, $DATA, NULL);
if (!a) {
puts(FAILED);
***************
*** 365,369 ****
}
/* Find the bitmap (it is in the $DATA attribute). */
! a = find_attribute(mb, $DATA, NULL);
if (!a) {
puts(FAILED);
--- 365,369 ----
}
/* Find the bitmap (it is in the $DATA attribute). */
! a = find_first_attribute(vol, mb, $DATA, NULL);
if (!a) {
puts(FAILED);
***************
*** 429,433 ****
}
/* Find the $VOLUME_INFORMATION attribute. */
! a = find_attribute(mb, $VOLUME_INFORMATION, NULL);
if (!a) {
puts(FAILED);
--- 429,433 ----
}
/* Find the $VOLUME_INFORMATION attribute. */
! a = find_first_attribute(vol, mb, $VOLUME_INFORMATION, NULL);
if (!a) {
puts(FAILED);
***************
*** 468,472 ****
/* Phew! Done. */
! /* FIXME: Need to initialise vol->dev_name as well. */
puts(OK);
--- 468,472 ----
/* Phew! Done. */
! /* FIXME: Need to initialise vol->vol_name as well. */
puts(OK);
|
|
From: Anton A. <an...@us...> - 2001-03-02 15:02:58
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/doc In directory usw-pr-cvs1:/tmp/cvs-serv5167 Modified Files: tunable_settings Log Message: Update to latest docs. Index: tunable_settings =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/tunable_settings,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** tunable_settings 2001/01/28 05:49:57 1.1 --- tunable_settings 2001/03/02 15:04:24 1.2 *************** *** 2,10 **** \Registry\Machine\System\CurrentControlSet\Control\FileSystem. ! NtfsDisable8dot3NameCreation ! NtfsAllowExtendedCharacterIn8dot3Name ! NtfsDisableLastAccessUpdate ! NtfsMftZoneReservation --- 2,25 ---- \Registry\Machine\System\CurrentControlSet\Control\FileSystem. ! NtfsDisable8dot3NameCreation default is to enable 8.3 creation + NtfsAllowExtendedCharacterIn8dot3Name default is to disallow extended chars + NtfsDisableLastAccessUpdate default is enable the last acc. update + + __u32 NtfsMftZoneReservation: + If not present set the variable _NtfsMftZoneMultiplier to 1. + If = 0 or > 4, again set the variable _NtfsMftZoneMultiplier to 1. + Otherwise, set the variable _NtfsMftZoneMultiplier to the value of + NtfsMftZoneReservation. + + The zone multiplier is ONLY read accessed when mount_volume is called and + when deallocate_clusters is called. + The zone multiplier is ONLY write accessed when the driver initializes. + + Win2k adds: + + NtfsQuotaNotifyRate ? + + NtfsEncryptionService ? |
|
From: Anton A. <an...@us...> - 2001-03-02 15:02:31
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv5076
Modified Files:
attrib.h bootsect.h logfile.h mft.h ntfs_rec.h
Log Message:
Update to latest include files.
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** attrib.h 2001/02/03 02:03:35 1.8
--- attrib.h 2001/03/02 15:03:56 1.9
***************
*** 27,49 ****
/*
- * The data attribute of FILE_$AttrDef contains a sequence of attribute
- * definitions for the NTFS volume. With this, it is supposed to be safe for an
- * older NTFS driver to mount a volume containing a newer NTFS version without
- * damaging it (that's the theory. In practice it's: not damaging it too much).
- * The flags describe whether the attribute can be resident/non-resident and
- * possibly other things, too but the actual bits are unknown.
- */
- typedef struct {
[...1759 lines suppressed...]
--- 1709,1713 ----
* errno describes the error.
*/
! __s64 get_attribute_value(const ntfs_volume *vol,
const ATTRIBUTE_RECORD_HEADER *a, __u8 *b);
***************
*** 915,919 ****
*/
int set_attribute_value(ntfs_volume *vol, ATTRIBUTE_RECORD_HEADER *a,
! const __u8 *b, __u64 l);
#endif /* defined ATTRIB_H */
--- 1731,1735 ----
*/
int set_attribute_value(ntfs_volume *vol, ATTRIBUTE_RECORD_HEADER *a,
! const __u8 *b, __s64 l);
#endif /* defined ATTRIB_H */
Index: bootsect.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bootsect.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bootsect.h 2001/01/30 12:29:03 1.3
--- bootsect.h 2001/03/02 15:03:56 1.4
***************
*** 49,53 ****
__u16 root_entries; /* zero */
__u16 sectors; /* zero */
! __u8 media_type; /* irrelevant */
__u16 sectors_per_fat; /* zero */
__u16 sectors_per_track; /* irrelevant */
--- 49,53 ----
__u16 root_entries; /* zero */
__u16 sectors; /* zero */
! __u8 media_type; /* 0xf8 = hard disk */
__u16 sectors_per_fat; /* zero */
__u16 sectors_per_track; /* irrelevant */
***************
*** 70,75 ****
bytes, the maximum byte size is
approx. 4.7x10^21 bytes. (-; */
! __s64 mft_lcn; /* Cluster location of mft. */
! __s64 mftmirr_lcn; /* Cluster lcoation of copy of mft. */
__s8 clusters_per_mft_record; /* Mft record size in clusters. */
__u8 reserved0[3]; /* zero */
--- 70,75 ----
bytes, the maximum byte size is
approx. 4.7x10^21 bytes. (-; */
! __s64 mft_lcn; /* Cluster location of mft data. */
! __s64 mftmirr_lcn; /* Cluster location of copy of mft. */
__s8 clusters_per_mft_record; /* Mft record size in clusters. */
__u8 reserved0[3]; /* zero */
Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/logfile.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** logfile.h 2001/01/27 14:22:02 1.3
--- logfile.h 2001/03/02 15:03:56 1.4
***************
*** 143,147 ****
__u16 prev_client; /* ??? = 0x808, 0xd07, 0xd5d */
__u16 next_client; /* ??? = 0x70 */
! __u16 seq_number; /* ??? = 0, 4 size uncertain */
__u16 client_name; /* ??? = empty string??? size uncertain */
} __attribute__ ((__packed__)) RESTART_CLIENT;
--- 143,149 ----
__u16 prev_client; /* ??? = 0x808, 0xd07, 0xd5d */
__u16 next_client; /* ??? = 0x70 */
! __u16 seq_number; /* ??? = 0, 4 size uncertain, Regis calls this
! "volume clear flag" and gives a size of one
! byte. */
__u16 client_name; /* ??? = empty string??? size uncertain */
} __attribute__ ((__packed__)) RESTART_CLIENT;
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mft.h 2001/01/30 12:55:21 1.5
--- mft.h 2001/03/02 15:03:56 1.6
***************
*** 50,55 ****
attribute. */
FILE_$root = 5, /* Root directory. */
! FILE_$BitMap = 6, /* Allocation bitmap of all clusters in bitmap
! attribute. */
FILE_$Boot = 7, /* Boot sector (always at cluster 0) in data
attribute. */
--- 50,55 ----
attribute. */
FILE_$root = 5, /* Root directory. */
! FILE_$BitMap = 6, /* Allocation bitmap of all clusters (lcns) in
! data attribute. */
FILE_$Boot = 7, /* Boot sector (always at cluster 0) in data
attribute. */
***************
*** 74,84 ****
/*
! * These are the so far known MFT_RECORD_* flags which contain information
! * about the mft record in which they are present.
*/
typedef enum {
MFT_RECORD_IN_USE = cpu_to_le16(0x0001),
MFT_RECORD_IS_DIRECTORY = cpu_to_le16(0x0002),
! } MFT_RECORD_FLAGS;
/*
--- 74,85 ----
/*
! * These are the so far known MFT_RECORD_* flags (16-bit) which contain
! * information about the mft record in which they are present.
*/
typedef enum {
MFT_RECORD_IN_USE = cpu_to_le16(0x0001),
MFT_RECORD_IS_DIRECTORY = cpu_to_le16(0x0002),
! MFT_REC_SPACE_FILLER = 0xffff /* Just to make flags 16-bit. */
! } __attribute__ ((__packed__)) MFT_RECORD_FLAGS;
/*
***************
*** 107,110 ****
--- 108,119 ----
* horrible thing to do as it would trash our current driver implementation. )-:
* Do I hear screams "we want 64-bit inodes!" ?!? (-;
+ *
+ * FIXME: The mft zone is defined as the first 12% of the volume. This space is
+ * reserved so that the mft can grow contiguously and hence doesn't become
+ * fragmented. Volume free space includes the empty part of the mft zone and
+ * when the volume's free 88% are used up, the mft zone is shrunk by a factor
+ * of 2, thus making more space available for more files/data. This process is
+ * repeated everytime there is no more free space except for the mft zone until
+ * there really is no more free space.
*/
typedef union {
***************
*** 117,121 ****
struct {
__u32 low_part; /* Low 32-bits of mft index. */
! __u16 high_part; /* High 32-bits of mft index. */
} __attribute__ ((__packed__));
__u16 sequence_number; /* 16-bit sequence number. */
--- 126,130 ----
struct {
__u32 low_part; /* Low 32-bits of mft index. */
! __u16 high_part; /* High 16-bits of mft index. */
} __attribute__ ((__packed__));
__u16 sequence_number; /* 16-bit sequence number. */
***************
*** 135,139 ****
/*Ofs*/
/* 0*/ NTFS_RECORD_HEADER ntfs;/* Usually the magic is "FILE". */
! /* 8*/ __s64 lsn; /* Log file sequence number for this record.
Changed every time the record is modified. */
/* 16*/ __u16 sequence_number; /* Number of times this mft record has been
--- 144,148 ----
/*Ofs*/
/* 0*/ NTFS_RECORD_HEADER ntfs;/* Usually the magic is "FILE". */
! /* 8*/ __s64 lsn; /* $LogFile sequence number for this record.
Changed every time the record is modified. */
/* 16*/ __u16 sequence_number; /* Number of times this mft record has been
***************
*** 155,159 ****
mft record from the start of the mft record.
NOTE: Must be aligned to 8-byte boundary. */
! /* 22*/ __u16 flags; /* Bit array of MFT_RECORD_FLAGS. When a file
is deleted, the MFT_RECORD_IN_USE flag is
set to zero. */
--- 164,168 ----
mft record from the start of the mft record.
NOTE: Must be aligned to 8-byte boundary. */
! /* 22*/ MFT_RECORD_FLAGS flags; /* Bit array of MFT_RECORD_FLAGS. When a file
is deleted, the MFT_RECORD_IN_USE flag is
set to zero. */
***************
*** 163,177 ****
record. This should be equal to the mft
record size. */
! /* 32*/ __u64 base_mft_record; /* This is zero for base mft records. When it
! is not zero it is a mft reference pointing
! to the base mft record to which this record
! belongs (this is then used to locate the
! attribute list attribute present in the base
! record which describes this extension record
! and hence might need modification when the
! extension record itself is modified, also
! locating the attribute list also means
! finding the other potential extents,
! belonging to the non-base mft record). */
/* 40*/ __u16 next_attribute_instance; /* The instance number that will be
assigned to the next attribute added to this
--- 172,187 ----
record. This should be equal to the mft
record size. */
! /* 32*/ MFT_REFERENCE base_mft_record; /* This is zero for base mft records.
! When it is not zero it is a mft reference
! pointing to the base mft record to which
! this record belongs (this is then used to
! locate the attribute list attribute present
! in the base record which describes this
! extension record and hence might need
! modification when the extension record
! itself is modified, also locating the
! attribute list also means finding the other
! potential extents, belonging to the non-base
! mft record). */
/* 40*/ __u16 next_attribute_instance; /* The instance number that will be
assigned to the next attribute added to this
Index: ntfs_rec.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfs_rec.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ntfs_rec.h 2001/01/28 05:49:57 1.2
--- ntfs_rec.h 2001/03/02 15:03:56 1.3
***************
*** 36,40 ****
magic_HOLE = cpu_to_le32(0x454c4f48), /* "HOLE" == ??? (NTFS 3.0+?) */
magic_INDX = cpu_to_le32(0x58444e49), /* "INDX" == index buffer */
! } NTFS_RECORD_TYPES;
/*
--- 36,40 ----
magic_HOLE = cpu_to_le32(0x454c4f48), /* "HOLE" == ??? (NTFS 3.0+?) */
magic_INDX = cpu_to_le32(0x58444e49), /* "INDX" == index buffer */
! } NTFS_RECORD_TYPE;
/*
***************
*** 75,93 ****
* are set to it (during writing). If they are not, an incomplete multi sector
* transfer has occured when the data was written.
*/
typedef struct {
! NTFS_RECORD_TYPES magic; /* A four-byte magic identifying the record
! type and/or status. */
! __u16 usa_ofs; /* Offset to the Update Sequence Array (usa)
! from the start of the ntfs record. */
! __u16 usa_count; /* Number of __u16 sized entries in the usa
! including the Update Sequence Number (usn),
! thus the number of fixups is the usa_count
! minus 1. */
} __attribute__ ((__packed__)) NTFS_RECORD_HEADER;
/**
* post_read_mst_fixup - deprotect multi sector transfer protected data
! * @b: pinter to the data to deprotect
* @size: size in bytes of @b
*
--- 75,110 ----
* are set to it (during writing). If they are not, an incomplete multi sector
* transfer has occured when the data was written.
+ * The maximum size for the update sequence array is fixed to:
+ * maximum size = usa_ofs + (usa_count * 2) = 510 bytes
+ * The 510 bytes comes from the fact that the last __u16 in the array has to
+ * (obviously) finish before the last __u16 of the first 512-byte sector.
+ * This formula can be used as a consistency check in that usa_ofs +
+ * (usa_count * 2) has to be less than or equal to 510.
*/
typedef struct {
! NTFS_RECORD_TYPE magic; /* A four-byte magic identifying the record
! type and/or status. */
! __u16 usa_ofs; /* Offset to the Update Sequence Array (usa)
! from the start of the ntfs record. */
! __u16 usa_count; /* Number of __u16 sized entries in the usa
! including the Update Sequence Number (usn),
! thus the number of fixups is the usa_count
! minus 1. */
} __attribute__ ((__packed__)) NTFS_RECORD_HEADER;
/**
+ * __post_read_mst_fixup - fast deprotect multi sector transfer protected data
+ * @b: pointer to the data to deprotect
+ * @size: size in bytes of @b
+ *
+ * Perform the necessary post read multi sector transfer fixup, not checking for
+ * any errors. Defined inline for additional speed.
+ */
+ extern __inline__ void __post_read_mst_fixup(NTFS_RECORD_HEADER *b,
+ const __u32 size);
+
+ /**
* post_read_mst_fixup - deprotect multi sector transfer protected data
! * @b: pointer to the data to deprotect
* @size: size in bytes of @b
*
|
|
From: Anton A. <an...@us...> - 2001-02-03 04:49:25
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs/.deps In directory usw-pr-cvs1:/tmp/cvs-serv20831/libntfs/.deps Removed Files: attrib.P bitmap.P bootsect.P disk_io.P mft.P ntfs_rec.P volume.P Log Message: Remove the dependency files as they are not part of a distribution. --- attrib.P DELETED --- --- bitmap.P DELETED --- --- bootsect.P DELETED --- --- disk_io.P DELETED --- --- mft.P DELETED --- --- ntfs_rec.P DELETED --- --- volume.P DELETED --- |
|
From: Anton A. <an...@us...> - 2001-02-03 04:49:25
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools/.deps In directory usw-pr-cvs1:/tmp/cvs-serv20831/ntfstools/.deps Removed Files: ntfsdump_logfile.P ntfsfix.P Log Message: Remove the dependency files as they are not part of a distribution. --- ntfsdump_logfile.P DELETED --- --- ntfsfix.P DELETED --- |
|
From: Anton A. <an...@us...> - 2001-02-03 04:33:00
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv18950 Removed Files: config.h Log Message: Really last check in for first release (now just need to make a branch for the release and can continue development in main trunk). --- config.h DELETED --- |
|
From: Anton A. <an...@us...> - 2001-02-03 04:21:43
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv17740/ntfstools
Modified Files:
ntfsfix.c
Log Message:
Finished first public release. This is the final commit to make sure
everything is in cvs.
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ntfsfix.c 2001/02/02 00:16:18 1.4
--- ntfsfix.c 2001/02/03 04:21:49 1.5
***************
*** 410,414 ****
/* That's all for now! */
printf("NTFS partition %s was processed successfully.\n",
! vol->vol_name);
/* Set return code to 0. */
i = 0;
--- 410,414 ----
/* That's all for now! */
printf("NTFS partition %s was processed successfully.\n",
! vol->dev_name);
/* Set return code to 0. */
i = 0;
|
|
From: Anton A. <an...@us...> - 2001-02-03 02:03:30
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv6403/libntfs
Modified Files:
Makefile.am Makefile.in
Log Message:
More files.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 2001/02/02 01:15:17 1.2
--- Makefile.am 2001/02/03 02:03:36 1.3
***************
*** 9,14 ****
LTVERSION = 1:0:0
lib_LTLIBRARIES = libntfs.la
!
libntfs_la_SOURCES = \
attrib.c \
--- 9,15 ----
LTVERSION = 1:0:0
+ linux_ntfsincludedir = -I$(top_srcdir)/include
lib_LTLIBRARIES = libntfs.la
! libntfs_la_LDFLAGS = -version-info $(LTVERSION)
libntfs_la_SOURCES = \
attrib.c \
***************
*** 19,26 ****
disk_io.c \
ntfs_rec.c
-
- INCLUDES = -I$(top_srcdir)/include $(all_includes)
!
! libntfs_la_LDFLAGS = -version-info $(LTVERSION)
--- 20,24 ----
disk_io.c \
ntfs_rec.c
! INCLUDES = $(linux_ntfsincludedir) $(all_includes)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in 2001/02/02 00:16:18 1.1
--- Makefile.in 2001/02/03 02:03:36 1.2
***************
*** 11,15 ****
--- 11,23 ----
# PARTICULAR PURPOSE.
+ # Before making a release, the LTVERSION string should be modified.
+ # The string is of the form C:R:A.
+ # - If interfaces have been changed or added, but binary compatibility has
+ # been preserved, change to C+1:0:A+1
+ # - If binary compatibility has been broken (eg removed or changed interfaces)
+ # change to C+1:0:0
+ # - If the interface is the same as the previous version, change to C:R+1:A
+
SHELL = @SHELL@
***************
*** 83,103 ****
all_libraries = @all_libraries@
! lib_LTLIBRARIES = libntfs.la
libntfs_la_SOURCES = attrib.c bootsect.c bitmap.c mft.c volume.c disk_io.c ntfs_rec.c
-
- # include_HEADERS = \
- # attrib.h \
- # bootsect.h \
- # bitmap.h \
- # mft.h \
- # volume.h \
- # disk_io.h \
- # ntfs_rec.h
-
- INCLUDES = -I$(top_srcdir)/include $(all_includes)
! libntfs_la_LDFLAGS = -version-info 1:0:0
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
--- 91,103 ----
all_libraries = @all_libraries@
! LTVERSION = 1:0:0
+ linux_ntfsincludedir = -I$(top_srcdir)/include
+ lib_LTLIBRARIES = libntfs.la
+ libntfs_la_LDFLAGS = -version-info $(LTVERSION)
libntfs_la_SOURCES = attrib.c bootsect.c bitmap.c mft.c volume.c disk_io.c ntfs_rec.c
! INCLUDES = $(linux_ntfsincludedir) $(all_includes)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
|
|
From: Anton A. <an...@us...> - 2001-02-03 02:03:30
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv6403/ntfstools Modified Files: Makefile.am Makefile.in Log Message: More files. Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.am 2001/02/02 00:16:18 1.1 --- Makefile.am 2001/02/03 02:03:36 1.2 *************** *** 1,4 **** --- 1,6 ---- bin_PROGRAMS = ntfsfix ntfsdump_logfile + linux_ntfsincludedir = -I$(top_srcdir)/include + ntfsfix_SOURCES = ntfsfix.c ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.in 2001/02/02 00:16:18 1.1 --- Makefile.in 2001/02/03 02:03:36 1.2 *************** *** 85,88 **** --- 85,90 ---- bin_PROGRAMS = ntfsfix ntfsdump_logfile + linux_ntfsincludedir = -I$(top_srcdir)/include + ntfsfix_SOURCES = ntfsfix.c ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la |
|
From: Anton A. <an...@us...> - 2001-02-03 02:03:30
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv6403/include
Modified Files:
Makefile.am attrib.h
Added Files:
Makefile.in
Log Message:
More files.
--- NEW FILE ---
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
AS = @AS@
AUTODIRS = @AUTODIRS@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
DLLTOOL = @DLLTOOL@
LDFLAGS = @LDFLAGS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@
all_includes = @all_includes@
all_libraries = @all_libraries@
linux_ntfsincludedir = $(includedir)/ntfs
linux_ntfsinclude_HEADERS = attrib.h bitmap.h bootsect.h disk_io.h endians.h logfile.h mft.h ntfs_rec.h volume.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
HEADERS = $(linux_ntfsinclude_HEADERS)
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-linux_ntfsincludeHEADERS: $(linux_ntfsinclude_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(linux_ntfsincludedir)
@list='$(linux_ntfsinclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(linux_ntfsincludedir)/$$p"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(linux_ntfsincludedir)/$$p; \
done
uninstall-linux_ntfsincludeHEADERS:
@$(NORMAL_UNINSTALL)
list='$(linux_ntfsinclude_HEADERS)'; for p in $$list; do \
rm -f $(DESTDIR)$(linux_ntfsincludedir)/$$p; \
done
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
here=`pwd` && cd $(srcdir) \
&& mkid -f$$here/ID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
clean-tags:
distclean-tags:
-rm -f TAGS ID
maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = include
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
install-data-am: install-linux_ntfsincludeHEADERS
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-linux_ntfsincludeHEADERS
uninstall: uninstall-am
all-am: Makefile $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(linux_ntfsincludedir)
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-tags clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-tags distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: uninstall-linux_ntfsincludeHEADERS \
install-linux_ntfsincludeHEADERS tags mostlyclean-tags distclean-tags \
clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
check-am installcheck-am installcheck install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am 2001/02/02 01:28:46 1.1
--- Makefile.am 2001/02/03 02:03:35 1.2
***************
*** 1,4 ****
! EXTRA_DIST = \
attrib.h \
bitmap.h \
--- 1,5 ----
! linux_ntfsincludedir = $(includedir)/ntfs
! linux_ntfsinclude_HEADERS = \
attrib.h \
bitmap.h \
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** attrib.h 2001/01/30 12:55:21 1.7
--- attrib.h 2001/02/03 02:03:35 1.8
***************
*** 151,175 ****
portion, so this usually equals the attribute
value size in clusters. */
! /* 30*/ __u16 mapping_pairs_offset; /* Byte offset from the beginning of the
structure to the mapping pairs array which
contains the mappings between the vcns and
! the logical cluster numbers (lcns). */
! /* 32*/ __u8 compression_unit; /* The compression unit expressed as the log
to the base 2 of the number of clusters in a
compression unit. 0 means not compressed.
(This effectively limits the compression
unit size to be a power of two clusters.) */
! /* 33*/ __u8 reserved[5]; /* Align to 8-byte boundary. */
! /* 38*/ __u64 allocated_size; /* Byte size of disk space allocated to hold
the attribute value. Always is a multiple of
the cluster size. */
! /* 46*/ __u64 data_size; /* Byte size of the attribute value. Can be
larger than allocated_size if attribute
value is compressed or sparse. */
! /* 54*/ __u64 initialized_size; /* Byte size of initialized portion of the
attribute value. */
! /* 62*/ __u64 compressed_size; /* Byte size of the attribute value after
compression. Only present when compressed. */
! /* sizeof() = 70 bytes (when compressed, otherwise = 62 bytes) */
} __attribute__ ((__packed__)) NONRESIDENT_ATTRIBUTE_RECORD_HEADER;
--- 151,177 ----
portion, so this usually equals the attribute
value size in clusters. */
! /* 32*/ __u16 mapping_pairs_offset; /* Byte offset from the beginning of the
structure to the mapping pairs array which
contains the mappings between the vcns and
! the logical cluster numbers (lcns). When
! creating, place this at the end of this
! record header aligned to 8-byte boundary. */
! /* 34*/ __u8 compression_unit; /* The compression unit expressed as the log
to the base 2 of the number of clusters in a
compression unit. 0 means not compressed.
(This effectively limits the compression
unit size to be a power of two clusters.) */
! /* 35*/ __u8 reserved[5]; /* Align to 8-byte boundary. */
! /* 40*/ __u64 allocated_size; /* Byte size of disk space allocated to hold
the attribute value. Always is a multiple of
the cluster size. */
! /* 48*/ __u64 data_size; /* Byte size of the attribute value. Can be
larger than allocated_size if attribute
value is compressed or sparse. */
! /* 56*/ __u64 initialized_size; /* Byte size of initialized portion of the
attribute value. */
! /* 64*/ __u64 compressed_size; /* Byte size of the attribute value after
compression. Only present when compressed. */
! /* sizeof() = 72 bytes (when compressed, otherwise = 64 bytes) */
} __attribute__ ((__packed__)) NONRESIDENT_ATTRIBUTE_RECORD_HEADER;
|
|
From: Anton A. <an...@us...> - 2001-02-03 02:03:30
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/doc In directory usw-pr-cvs1:/tmp/cvs-serv6403/doc Added Files: Makefile.in Log Message: More files. --- NEW FILE --- # Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ datadir = @datadir@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ AS = @AS@ AUTODIRS = @AUTODIRS@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ DLLTOOL = @DLLTOOL@ LDFLAGS = @LDFLAGS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ all_includes = @all_includes@ all_libraries = @all_libraries@ EXTRA_DIST = CodingStyle attribute_definitions attributes.txt template.c template.h tunable_settings mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status tags: TAGS TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = doc distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done info-am: info: info-am dvi-am: dvi: dvi-am check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am install-exec-am: install-exec: install-exec-am install-data-am: install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am uninstall-am: uninstall: uninstall-am all-am: Makefile all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: mostlyclean-am: mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am .PHONY: tags distdir info-am info dvi-am dvi check check-am \ installcheck-am installcheck install-exec-am install-exec \ install-data-am install-data install-am install uninstall-am uninstall \ all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |
