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-04-02 02:20:58
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv19289
Modified Files:
ntfsfix.c
Log Message:
Fixed up the automatic version numbering (I hope).
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- ntfsfix.c 2001/04/02 02:13:57 1.8
+++ ntfsfix.c 2001/04/02 02:20:53 1.9
@@ -64,5 +64,6 @@
{
const char *EXEC_NAME = "NtfsFix";
- const char *EXEC_VERSION = "$Revision$";
+ char *EXEC2_VERSION = "$Revision$";
+ char *EXEC_VERSION + 11;
const char *OK = "OK";
const char *FAILED = "FAILED";
@@ -79,4 +80,5 @@
MFT_REFERENCE mref;
+ EXEC_VERSION[strlen(EXEC_VERSION) - 2] = '\0';
printf("\n");
if (argc != 2) {
|
|
From: Anton A. <an...@us...> - 2001-04-02 02:14:01
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv18618
Modified Files:
ntfsfix.c
Log Message:
Make the ntfsfix version be equal to the Revision in CVS.
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- ntfsfix.c 2001/04/02 02:04:37 1.7
+++ ntfsfix.c 2001/04/02 02:13:57 1.8
@@ -1,4 +1,2 @@
-const char *EXEC_NAME = "NtfsFix";
-const char *EXEC_VERSION = "0.0.3";
/*
* NtfsFix - Part of the Linux-NTFS project.
@@ -65,4 +63,6 @@
int main(int argc, char **argv)
{
+ const char *EXEC_NAME = "NtfsFix";
+ const char *EXEC_VERSION = "$Revision$";
const char *OK = "OK";
const char *FAILED = "FAILED";
|
|
From: Anton A. <an...@us...> - 2001-04-02 02:04:42
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv17127/libntfs
Modified Files:
Makefile.in attrib.c disk_io.c ntfs_rec.c unistr.c volume.c
Added Files:
attrib_RE.c
Log Message:
Everything compiles again! Yey! (Don't know about working though, haven't tried
it... So be careful...)
The definitely final find_{first_}attr() functions are in place. Currently
still no support for attribute lists.
The two new _RE files contain the C-fied and more or less (more less than more
actually) cleaned up functions from the ntfs driver. Once they are cleaned
up (find_attr() is already completed but I left it in the _RE files for future
reference/educational value) and modified to suit my ideas of how they should
work, which are not quite the same as the driver way, they will make it into
attrib.[ch].
If anyone gives the new code a try, I would be interested in whether it worked
or not... (-;
--- NEW FILE ---
/* Reverse engineered functions in more or less modified form. find_attr()
* is quite heavily modified but should be functionally equivalent to original.
* lookup and lookup_external are less modified. Both should be functionally
* equivalent to originals. */
BOOL find_attr(const ntfs_volume *vol, const ATTR_TYPES type,
const wchar_t *name, const __u32 name_len,
const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len,
attr_search_context *ctx)
{
ATTR_RECORD *a;
#ifdef DEBUG
if (!vol || !ctx || !ctx->mrec || !ctx->attr) {
printf(stderr, "find_attr() received NULL pointer!\n");
return FALSE;
}
#endif
a = ctx->attr;
/*
* Iterate over attributes in mft record starting at @ctx->attr.
* Note: Not using while/do/for loops so the comparison code
* does not get indented out of the 80 characters wide screen... (AIA)
*/
goto search_loop;
do_next:
a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length));
if (a < ctx->mrec || a > (char*)ctx->mrec + vol->mft_record_size)
goto file_corrupt;
ctx->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 TRUE;
}
rv = memcmp(val, (char*)a + le16_to_cpu(a->value_offset),
min(val_len, le32_to_cpu(a->value_length)));
/* If @val collates after the current attribute's value,
continue searching as a matching attribute might follow. */
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;
}
if (ntfs_are_names_equal(name, name_len,
(wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
a->name_length, ic, vol->upcase, vol->upcase_len))
goto found_it;
{ register int rc = ntfs_collate_names(vol->upcase,
vol->upcase_len, name, name_len,
(wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
a->name_length, IGNORE_CASE, 1);
/* If case insensitive collation of names collates @name
before a->name, there is no matching attribute. */
if (rc == -1)
goto not_found;
/* If the strings are not equal, continue search. */
if (rc)
goto do_next;
}
/* If case sensitive collation of names doesn't collate @name before
a->name, we continue the search. Otherwise we haven't found it. */
if (ntfs_collate_names(vol->upcase, vol->upcase_len, name, name_len,
(wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
a->name_length, CASE_SENSITIVE, 1) != -1)
goto do_next;
not_found:
return FALSE;
file_corrupt:
#ifdef DEBUG
printf(stderr, "find_attr(): File is corrupt. Run chkdsk.\n");
#endif
goto not_found;
}
BOOL lookup_external_attr(const ntfs_volume *vol, const MFT_REFERENCE mref,
const ATTR_TYPES type, const wchar_t *name,
const __u32 name_len, const IGNORE_CASE_BOOL ic,
const __s64 lowest_vcn, const __u8 *val,
const __u32 val_len, attr_search_context *ctx)
{
ATTR_LIST_ENTRY *al_pos, **al_val, *al_val_start, *al_next_pos;
ATTR_RECORD *attr_pos;
MFT_RECORD *mrec, *m;
__u8 var1 = 0;
__u8 var2 = 0;
__u8 var3;
int rc;
wchar_t *al_name;
__u32 al_name_len;
al_val = &ctx->alist_val;
if (ctx->alist_val_end <= *al_val && !ctx->is_first)
goto file_corrupt;
al_val_start = 0;
if (ctx->base) {
if (ctx->is_first)
goto already_have_the_base_and_is_first;
al_val_start = *al_val;
al_pos = (char*)*al_val + le16_to_cpu((*al_val)->length);
} else
al_pos = *al_val;
do_next:
if (al_pos < ctx->alist_val_end)
goto al_pos_below_alist_val_end;
var1 = var2 = 1;
al_pos = *al_val;
do_next_2:
*al_val = al_pos;
if (!type || var1 || type == al_pos->type)
goto compare_names;
if (le32_to_cpu(al_pos->type) > le32_to_cpu(type))
goto gone_too_far;
al_pos = al_next_pos;
goto do_next;
already_have_the_base_and_is_first:
ctx->is_first = FALSE;
if (*al_val < ctx->alist_val_end)
goto do_next;
if (ctx->base) {
// FIXME: CcUnpinData(ctx->base);
ctx->base = NULL;
}
if (!type)
return FALSE;
if (read_file_record(vol, mref, &ctx->mrec, &ctx->attr) < 0)
return FALSE;
ctx->base = ctx->mrec;
find_attr(vol, type, name, name_len, ic, val, val_len, ctx);
return FALSE;
al_pos_below_alist_val_end:
if (al_pos < ctx->alist_val)
goto file_corrupt;
if (al_pos >= ctx->alist_val_end)
goto file_corrupt;
if (!al_pos->length)
goto file_corrupt;
al_next_pos = (ATTR_LIST_ENTRY*)((char*)al_pos +
le16_to_cpu(al_pos->length));
goto do_next_2;
gone_too_far:
var1 = 1;
compare_names:
al_name_len = al_pos->name_length;
al_name = (wchar_t*)((char*)al_pos + al_pos->name_offset);
if (!name || var1)
goto compare_lowest_vcn;
if (ic == CASE_SENSITIVE) {
if (name_len == al_name_len &&
!memcmp(al_name, name, al_name_len << 1))
rc = TRUE;
else
rc = FALSE;
} else /* IGNORE_CASE */
rc = ntfs_are_names_equal(al_name, al_name_len, name, name_len,
ic, vol->upcase, vol->upcase_len);
if (rc)
goto compare_lowest_vcn;
rc = ntfs_collate_names(vol->upcase, vol->upcase_len, name, name_len,
al_name, al_name_len, IGNORE_CASE, 1);
if (rc == -1)
goto name_collates_before_al_name;
if (!rc && ntfs_collate_names(vol->upcase, vol->upcase_len, name,
name_len, al_name, al_name_len,
IGNORE_CASE, 0) == -1)
goto name_collates_before_al_name;
al_pos = al_next_pos;
goto do_next;
name_collates_before_al_name:
var1 = 1;
compare_lowest_vcn:
if (lowest_vcn && !var1 && al_next_pos < ctx->alist_val_end &&
sle64_to_cpu(al_next_pos->lowest_vcn) <= sle64_to_cpu(lowest_vcn) &&
al_next_pos->type == al_pos->type &&
al_next_pos->name_length == al_name_len &&
!memcmp((char*)al_next_pos + al_next_pos->name_offset, al_name,
al_name_len << 1)) {
al_pos = al_next_pos;
goto do_next;
}
/* Don't mask the sequence number. If it isn't equal, the ref is stale.
*/
if (al_val_start &&
al_pos->mft_reference == al_val_start->mft_reference) {
mrec = ctx->mrec;
attr_pos = (ATTR_RECORD*)((char*)mrec +
le16_to_cpu(mrec->attrs_offset));
} else {
if (ctx->base) {
// FIXME: CcUnpinData(ctx->base);
ctx->base = 0;
}
if (read_file_record(vol, le64_to_cpu(al_pos->mft_reference),
&m, &attr_pos) < 0)
return FALSE;
mrec = ctx->mrec;
ctx->base = ctx->mrec = m;
}
var3 = 0;
do_next_attr_loop_start:
if (attr_pos < mrec || attr_pos > (char*)mrec + vol->mft_record_size)
goto file_corrupt;
if (attr_pos->type == $END)
goto do_next_al_entry;
if (!attr_pos->length)
goto file_corrupt;
if (al_pos->instance != attr_pos->instance)
goto do_next_attr;
if (al_pos->type != attr_pos->type)
goto do_next_al_entry;
if (!name)
goto skip_name_comparison;
if (attr_pos->name_length != al_name_len)
goto do_next_al_entry;
if (memcmp((wchar_t*)((char*)attr_pos +
le16_to_cpu(attr_pos->name_offset)), al_name,
attr_pos->name_length << 1))
goto do_next_al_entry;
skip_name_comparison:
var3 = 1;
ctx->attr = attr_pos;
if (var1)
goto loc_5217c;
if (!val)
return TRUE;
if (attr_pos->non_resident)
goto do_next_attr;
if (le32_to_cpu(attr_pos->value_length) != val_len)
goto do_next_attr;
if (!memcmp((char*)attr_pos + le16_to_cpu(attr_pos->value_offset),
val, val_len))
return TRUE;
do_next_attr:
attr_pos = (ATTR_RECORD*)((char*)attr_pos +
le32_to_cpu(attr_pos->length));
goto do_next_attr_loop_start;
do_next_al_entry:
if (!var3)
goto file_corrupt;
al_pos = (ATTR_RECORD*)((char*)al_pos + le16_to_cpu(al_pos->length));
goto do_next;
loc_5217c:
if (var2)
*al_val = (ATTR_RECORD*)((char*)al_pos +
le16_to_cpu(al_pos->length));
if (ctx->base) {
// FIXME: CcUnpinData(ctx->base);
ctx->base = 0;
}
if (!type)
return FALSE;
if (read_file_record(vol, mref, &mrec, &ctx->attr) < 0)
return FALSE;
ctx->base = mrec;
find_attr(vol, type, name, name_len, ic, val, val_len, ctx);
return FALSE;
file_corrupt:
#ifdef DEBUG
fprintf(stderr, "lookup_attr() encountered corrupt file record.\n");
#endif
return FALSE;
}
BOOL lookup_attr(const ntfs_volume *vol, const MFT_REFERENCE *mref,
const ATTR_TYPES type, const wchar_t *name,
const __u32 name_len, const IGNORE_CASE_BOOL ic,
const __s64 lowest_vcn, const __u8 *val, const __u32 val_len,
attr<F12_search_context *ctx)
{
MFT_RECORD *m;
ATTR_RECORD *a;
__s64 len;
if (!vol || !ctx) {
#ifdef DEBUG
printf(stderr, "lookup_attr() received NULL pointer!\n");
#endif
return FALSE;
}
if (ctx->base)
goto already_have_the_base;
if (read_file_record(vol, mref, &m, &a) < 0)
return FALSE;
ctx->base = ctx->mrec = m;
ctx->attr = a;
ctx->alist_mrec = ctx->alist_attr = ctx->alist_val = NULL;
/*
* Look for an attribute list and at the same time check for attributes
* which collate before the attribute list (i.e. $STANDARD_INFORMATION).
*/
if (le32_to_cpu(a->type) > le32_to_cpu($ATTRIBUTE_LIST))
goto no_attr_list;
do_next:
if (!a->length)
goto file_corrupt;
if (a->type == $ATTRIBUTE_LIST)
goto attr_list_present;
a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length));
if (a < m || a > (char*)m + vol->mft_record_size)
goto file_corrupt;
if (le32_to_cpu(a->type) <= le32_to_cpu($ATTRIBUTE_LIST))
goto do_next;
no_attr_list:
if (!type ||
type == $STANDARD_INFORMATION && a->type == $STANDARD_INFORMATION)
goto found_it;
call_find_attr:
return find_attr(vol, type, name, name_len, ic, val, val_len, ctx);
found_it:
ctx->attr = a;
return TRUE;
already_have_the_base:
/*
* If ctx->is_first, search starting with ctx->attr. Otherwise
* continue search after ctx->attr.
*/
if (ctx->is_first) {
a = ctx->attr;
ctx->is_first = 0;
} else
a = (ATTR_RECORD*)((char*)ctx->attr +
le32_to_cpu(ctx->attr->length));
if (a < m || a > (char*)m + vol->mft_record_size)
goto file_corrupt;
if (a->type == $END)
return FALSE;
if (!a->length)
goto file_corrupt;
if (type)
goto call_find_attr;
goto found_it;
attr_list_present:
/*
* Looking for zero means we return the first attribute, which will
* be the first one listed in the attribute list.
*/
ctx->attr = a;
if (!type)
goto search_attr_list;
if (type == $ATTRIBUTE_LIST)
return TRUE;
search_attr_list:
/*
* "a" contains the attribute list attribute at this stage.
*/
ctx->alist_attr = a;
len = get_attribute_value_length(a);
#ifdef DEBUG
if (len > 0x40000LL) {
printf(stderr, "lookup_attr() found corrupt attribute list.\n");
return FALSE;
}
#endif
ctx->alist_val_len = len;
if (!(ctx->alist_val = malloc(ctx->alist_val_len))) {
#ifdef DEBUG
printf(stderr, "lookup_attr() failed to allocate memory for "
"attribute list value.\n");
#endif
return FALSE;
}
if (get_attribute_value(vol, ctx->mrec, a, ctx->alist_val) !=
ctx->alist_val_len) {
#ifdef DEBUG
printf(stderr, "lookup_attr() failed to read attribute list "
"value.\n");
#endif
return FALSE;
}
ctx->alist_val_end = (char*)ctx->alist_val + ctx->alist_val_len;
if (a->non_resident) {
ctx->alist_old_base = ctx->alist_val_base;
ctx->alist_val_base = ctx->base;
ctx->base = NULL;
} else if (ctx->base) {
// FIXME: CcUnpinData(ctx->base);
ctx->base = NULL;
}
lookup_external:
return lookup_external_attr(vol, mref, type, name, name_len, ic,
lowest_vcn, val, val_len, ctx);
file_corrupt:
#ifdef DEBUG
fprintf(stderr, "lookup_attr() encountered corrupt file record.\n");
#endif
return FALSE;
}
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Makefile.in 2001/02/03 02:03:36 1.2
+++ Makefile.in 2001/04/02 02:04:37 1.3
@@ -96,5 +96,5 @@
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
+libntfs_la_SOURCES = attrib.c bootsect.c bitmap.c mft.c volume.c disk_io.c ntfs_rec.c unistr.c
@@ -110,5 +110,5 @@
libntfs_la_LIBADD =
libntfs_la_OBJECTS = attrib.lo bootsect.lo bitmap.lo mft.lo volume.lo \
-disk_io.lo ntfs_rec.lo
+disk_io.lo ntfs_rec.lo unistr.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -123,5 +123,6 @@
GZIP_ENV = --best
DEP_FILES = .deps/attrib.P .deps/bitmap.P .deps/bootsect.P \
-.deps/disk_io.P .deps/mft.P .deps/ntfs_rec.P .deps/volume.P
+.deps/disk_io.P .deps/mft.P .deps/ntfs_rec.P .deps/unistr.P \
+.deps/volume.P
SOURCES = $(libntfs_la_SOURCES)
OBJECTS = $(libntfs_la_OBJECTS)
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- attrib.c 2001/03/15 23:13:45 1.7
+++ attrib.c 2001/04/02 02:04:37 1.8
@@ -33,107 +33,9 @@
#include "volume.h"
#include "unistr.h"
+#include "support.h"
-/*
- * Generic macro to convert pointers to values for comparison purposes.
- */
-#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;
-
- 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) {
- 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
- 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__ 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)
-{
- 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);
-}
-
/**
- * find_next_attr - find (next) attribute in mft record
+ * find_attr - find (next) attribute in mft record
* @vol: volume on which @a resides (used to find the upcase table)
- * @attr: attribute record inside mft record where to begin the search
* @type: attribute type to find
* @name: attribute name to find (optional, i.e. NULL means don't care)
@@ -142,271 +44,178 @@
* @val: attribute value to find (optional, resident attributes only)
* @val_len: attribute value length
+ * @ctx: search context with mft record and attribute to search from
*
- * 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, @name_len is the @name length
- * in Unicode characters, and @val is ignored.
+ * find_attr() takes a search context @ctx as parameter and searches the mft
+ * record specified by @ctx->mrec, beginning at @ctx->attr, for an attribute of
+ * @type, optionally @name and @val. If found, find_attr() returns TRUE and
+ * @ctx->attr will point to the found attribute. If not found, find_attr()
+ * returns FALSE and @ctx->attr is undefined (i.e. do not rely on it not
+ * changing).
*
+ * If @ctx->is_first is TRUE, the search begins with @ctx->attr itself. If it
+ * is FALSE, the search begins after @ctx->attr.
+ *
+ * If @ic is IGNORE_CASE, the @name comparisson is not case sensitive and if it
+ * is CASE_SENSITIVE, the comparison is case sensitive. When @name is present,
+ * @name_len is the @name length in Unicode characters.
+ *
* 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.
+ * all. Thus, to find an unnamed attribute specifically, specify a @name
+ * pointing to a zero length string.
*
- * find_next_attr() only searches the mft record in which @attr is present and
- * it ignores the presence of an attribute list attribute (unless it is the one
- * being searched for, obviously). If you need to take attribute lists into
- * consideration, use lookup_next_attr() instead (see below).
+ * Finally, the resident attribute value @val is looked for, if present. If @val
+ * is not present (NULL), @val_len is ignored.
*
+ * find_attr() only searches the specified mft record and it ignores the
+ * presence of an attribute list attribute (unless it is the one being searched
+ * for, obviously). If you need to take attribute lists into consideration, use
+ * lookup_attr() instead (see below). This also means that you cannot use
+ * find_attr() to search for extent records of non-resident attributes, as
+ * extents with lowest_vcn != 0 are invariably described by the attribute list
+ * attribute only.
+ *
* 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, wchar_t *name,
- const __u32 name_len, const IGNORE_CASE_BOOL ic,
- const __u8 *val, const __u32 val_len)
+BOOL find_attr(const ntfs_volume *vol, const ATTR_TYPES type,
+ const wchar_t *name, const __u32 name_len,
+ const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len,
+ attr_search_context *ctx)
{
ATTR_RECORD *a;
- void *mft_rec;
#ifdef DEBUG
- if (!vol || !attr || !*attr) {
- printf(stderr, "find_next_attr() received NULL pointer!\n");
- return NULL;
+ if (!vol || !ctx || !ctx->mrec || !ctx->attr) {
+ printf(stderr, "find_attr() received NULL pointer!\n");
+ return FALSE;
}
#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 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 = p2n(a) & (vol->mft_record_size - 1);
/*
- * Iterate over attributes in mft record starting at @attr.
- * Note: Not using while/do/for loops so the comparison code
- * does not get indented out of the screen... (AIA)
+ * Iterate over attributes in mft record starting at @ctx->attr, or the
+ * attribute following that, if @ctx->is_first is TRUE.
*/
- 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;
+ if (ctx->is_first) {
+ a = ctx->attr;
+ ctx->is_first = FALSE;
+ } else
+ a = (ATTR_RECORD*)((char*)ctx->attr +
+ le32_to_cpu(ctx->attr->length));
+ for (; p2n(a) >= p2n(ctx->mrec) &&
+ (char*)a <= (char*)ctx->mrec + vol->mft_record_size;
+ a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length))) {
+ if (p2n(a) < p2n(ctx->mrec) ||
+ (char*)a > (char*)ctx->mrec + vol->mft_record_size)
+ break;
+ ctx->attr = a;
+ /* We catch $END with this more general check, too... */
+ if (le32_to_cpu(a->type) > le32_to_cpu(type))
+ return FALSE;
+ if (!a->length)
+ break;
+ if (a->type != type)
+ continue;
+ /* If @name is present, compare the two names. */
+ if (name && !ntfs_are_names_equal(name, name_len,
+ (wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
+ a->name_length, ic, vol->upcase, vol->upcase_len)) {
+ register int rc;
+
+ rc = ntfs_collate_names(vol->upcase, vol->upcase_len,
+ name, name_len, (wchar_t*)((char*)a +
+ le16_to_cpu(a->name_offset)),
+ a->name_length, IGNORE_CASE, 1);
+ /*
+ * If @name collates before a->name, there is no
+ * matching attribute.
+ */
+ if (rc == -1)
+ return FALSE;
+ /* If the strings are not equal, continue search. */
+ if (rc)
+ continue;
+ rc = ntfs_collate_names(vol->upcase, vol->upcase_len,
+ name, name_len, (wchar_t*)((char*)a +
+ le16_to_cpu(a->name_offset)),
+ a->name_length, CASE_SENSITIVE, 1);
+ if (rc == -1)
+ return FALSE;
+ if (rc)
+ continue;
+ }
+ /*
+ * The names match or @name not present. If no @val specified,
+ * we have found the attribute and are done.
+ */
+ if (!val)
+ return TRUE;
+ /* @val is present; compare values. */
+ else {
+ register int rc;
+
+ rc = memcmp(val, (char*)a +le16_to_cpu(a->value_offset),
+ min(val_len, le32_to_cpu(a->value_length)));
+ /*
+ * If @val collates before the current attribute's
+ * value, there is no matching attribute.
+ */
+ if (!rc) {
+ register __u32 avl;
+ avl = le32_to_cpu(a->value_length);
+ if (val_len == avl)
+ return TRUE;
+ if (val_len < avl)
+ return FALSE;
+ } else if (rc < 0)
+ return FALSE;
}
- rv = memcmp(val, (char*)a + le16_to_cpu(a->value_offset),
- min(val_len, le32_to_cpu(a->value_length)));
- /* If @val collates after the current attribute's value,
- continue searching as a matching attribute might follow. */
- 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;
- }
- 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;
- }
- { register int rc = ntfs_collate_names(vol->upcase,
- vol->upcase_len, name, name_len,
- (wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
- a->name_length, IGNORE_CASE, 1);
- /* If case insensitive collation of names collates @name
- before a->name, there is no matching attribute. */
- if (rc == -1)
- goto not_found;
- /* If the strings are not equal, continue search. */
- if (rc)
- goto do_next;
- }
- /* If case sensitive collation of names doesn't collate @name before
- a->name, we continue the search. Otherwise we haven't found it. */
- if (ntfs_collate_names(vol->upcase, vol->upcase_len, name, name_len,
- (wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
- a->name_length, CASE_SENSITIVE, 1) != -1)
- goto do_next;
-not_found:
- return NULL;
-file_corrupt:
+ }
#ifdef DEBUG
- printf(stderr, "find_next_attr(): File is corrupt. Run chkdsk.\n");
+ printf(stderr, "find_attr(): File is corrupt. Run chkdsk.\n");
#endif
- goto not_found;
+ return FALSE;
}
-__inline__ ATTR_RECORD *find_first_attr(const ntfs_volume *vol,
- const MFT_RECORD *mft_rec, const ATTR_TYPES type,
- wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic,
- const __u8 *val, const __u32 val_len)
+/**
+ * find_first_attr - find first attribute in mft record
+ * @vol: volume on which @a resides (used to find the upcase table)
+ * @type: attribute type to find
+ * @name: attribute name to find (optional, i.e. NULL means don't care)
+ * @name_len: attribute name length (only needed if @name present)
+ * @ic: IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
+ * @val: attribute value to find (optional, resident attributes only)
+ * @val_len: attribute value length
+ * @ctx: search context with mft record and attribute to search from
+ *
+ * find_first_attr() is just an inlined wrapper for find_attr(). For details
+ * see description of find_attr() above.
+ */
+__inline__ BOOL find_first_attr(const ntfs_volume *vol, const ATTR_TYPES type,
+ const wchar_t *name, const __u32 name_len,
+ const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len,
+ attr_search_context *ctx)
{
+ MFT_RECORD *m;
ATTR_RECORD *a;
#ifdef DEBUG
- if (!vol || !mft_rec) {
+ if (!vol || !ctx || !ctx->mrec) {
printf(stderr, "find_first_attr() received NULL pointer!\n");
- return NULL;
+ return FALSE;
}
+ if (ctx->attr)
+ printf(stderr, "find_first_attr(): received non-NULL attribute "
+ "pointer.\nThis will be overwritten resulting "
+ "in possible memory leakage.\n");
#endif
- a = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset));
- if (a < mft_rec || a > (char*)mft_rec + vol->mft_record_size)
- goto file_corrupt;
- return find_next_attr(vol, &a, type, name, name_len, ic, val, val_len);
-}
-
-/*
- * 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(const ntfs_volume *vol, const MFT_RECORD *m,
- const IS_FIRST_BOOL *first, const ATTR_RECORD **attr,
- const ATTR_TYPES type, const wchar_t *name,
- const __u32 name_len, const IGNORE_CASE_BOOL ic,
- const __u8 *val, const __u32 val_len)
-{
- ATTR_RECORD *a, *alist = NULL;
- int got_there = 0;
-
-#ifdef DEBUG
- /* Sanity/size/alignment checks. */
- if (!vol || !m || !attr || !is_mft_recordp(m) ||
- !(m->flags & MFT_RECORD_IN_USE) ||
- m->base_mft_record ||
- p2n((char*)m + m->attributes_offset) & 7 ||
- p2n((char*)m + m->bytes_in_use) & 7 ||
- le16_to_cpu(m->attributes_offset) >= le32_to_cpu(m->bytes_in_use)) {
- puts("Sanity/size/allignment checks failed in " \
- "lookup_attr()!");
- return NULL;
- }
-#endif
- if (!*attr) {
- /* Position of the first attribute. */
- a = (ATTR_RECORD*)(le16_to_cpu(m->attributes_offset) +
- (char*)m);
+ m = ctx->mrec;
+ ctx->is_first = TRUE;
+ ctx->attr = a = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset));
+ if (p2n(a) >= p2n(m) && (char*)a <= (char*)m + vol->mft_record_size)
+ return find_attr(vol, type, name, name_len, ic, val, val_len,
+ ctx);
#ifdef DEBUG
- if (p2n(a) & 7) {
- puts("Alignment check (2) failed in lookup_attr()!");
- return NULL;
- }
+ printf(stderr, "find_first_attr(): file is corrupt.");
#endif
- } else {
- if (*first) {
- /* Where to commence the search. */
- a = *attr;
- } else {
- /* Where to continue the search. */
- a = (ATTR_RECORD*)((char*)*attr +
- le32_to_cpu(*attr->length));
- }
- if (a < m || a > (char*)m + vol->mft_record_size)
- goto file_corrupt;
- *first = 0;
- if (a->type == $END)
- goto not_found;
- if (!a->length)
- goto file_corrupt;
- if (!type)
- goto call_find_attr;
- goto found_it;
- }
- /*
- * Look for an attribute list and at the same time check for attributes
- * which collate before the attribute list (i.e. $STANDARD_INFORMATION).
- */
- if (le32_to_cpu(a->type) > le32_to_cpu($ATTRIBUTE_LIST))
- goto no_attr_list;
-do_next:
- if (!a->length)
- goto file_corrupt;
- if (a->type == $ATTRIBUTE_LIST)
- goto attr_list_present;
- a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length));
- if (a < m || a > (char*)m + vol->mft_record_size)
- goto file_corrupt;
- if (le32_to_cpu(a->type) <= le32_to_cpu($ATTRIBUTE_LIST))
- goto do_next;
-no_attr_list:
- if (!type ||
- type == $STANDARD_INFORMATION && a->type == $STANDARD_INFORMATION)
- goto found_it;
-call_find_attr:
- *attr = find_next_attr(vol, &a, type, name, name_len, ic, val, val_len);
-return_now:
- return a;
-found_it:
- *attr = a;
- goto return_now;
-not_found:
- /* The requested attribute is not present. */
- a = NULL;
- goto return_now;
-attr_list_present:
- /* Looking for zero means we return the first attribute, which will
- * be the first one listed in the attribute list. */
- if (type == 0)
- goto search_attr_list;
- if (type == $ATTRIBUTE_LIST)
- goto found_it;
-search_attr_list:
- *attr = a;
- al = a;
- _NtfsMapAttributeValue(arg_0, arg_4,
- arg_output_buf[0x24]pattr_valueOUT, attr_val_lenOUT,
- arg_output_buf[0x1c]OUT, arg_output_bufIN/OUT);
+ return FALSE;
}
@@ -417,4 +226,5 @@
ATTR_RECORD *r;
VOLUME_INFORMATION *c;
+ attr_search_context ctx;
/* Sanity checks. */
@@ -422,9 +232,13 @@
return 0;
/* Get a pointer to the volume information attribute. */
- if (!(r = find_first_attr(v, b, $VOLUME_INFORMATION, NULL))) {
+ memset(&ctx, 0, sizeof(attr_search_context));
+ ctx.mrec = b;
+ if (!find_first_attr(v, $VOLUME_INFORMATION, NULL, 0, 0, NULL, 0,
+ &ctx)) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION was " \
"not found in $Volume!\n");
return 0;
}
+ r = ctx.attr;
/* Sanity check. */
if (r->non_resident) {
@@ -469,5 +283,5 @@
{
/* Sanity checks. */
- if (!vol || !a || !b) {
+ if (!vol || !m || !a || !b) {
errno = EINVAL;
return 0;
@@ -576,7 +390,7 @@
}
memcpy(b + total, intbuf,
- sle64_to_cpu(NA(a)->data_size) - total);
+ sle64_to_cpu(a->data_size) - total);
free(intbuf);
- total = sle64_to_cpu(NA(a)->data_size);
+ total = sle64_to_cpu(a->data_size);
} else {
/*
@@ -615,5 +429,4 @@
free(rl);
return total;
-#undef NA
}
errno = EINVAL;
@@ -730,9 +543,4 @@
if (!attr || !attr->non_resident)
return NULL;
- /*
- * Other fail safe checks are not required since the caller is
- * assumed to have done alignment and other consistency checks.
- * See find_attribute() above for an example.
- */
/* FIXME: Compression not supported yet. */
if (attr->compression_unit) {
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- disk_io.c 2001/03/26 04:34:20 1.6
+++ disk_io.c 2001/04/02 02:04:37 1.7
@@ -118,5 +118,5 @@
finished:
/* Quickly deprotect the data again. */
- __post_read_mft_fixup((NTFS_RECORD*)b, count);
+ __post_read_mst_fixup((NTFS_RECORD*)b, count);
error_end:
return error;
@@ -266,16 +266,16 @@
* get_mft_records - read records from the mft
* @vol: volume to read from
- * @buf: output data buffer
+ * @mrec: output data buffer
* @mref: starting mft record number
* @count: number of mft records to read
*
* Read @count mft records starting at @mref from volume @vol into buffer
- * @buf. Return @count on success or -ERRNO on error, where ERRNO is the error
+ * @mrec. Return @count on success or -ERRNO on error, where ERRNO is the error
* code. This function will do the error reporting so caller really only needs
* to check for sucess / failure.
*
- * NOTE: @buf has to be at least of size @count * vol->mft_record_size.
+ * NOTE: @mrec has to be at least of size @count * vol->mft_record_size.
*/
-int get_mft_records(const ntfs_volume *vol, __u8 *buf,
+int get_mft_records(const ntfs_volume *vol, MFT_RECORD *mrec,
const MFT_REFERENCE *mref, const int count)
{
@@ -283,9 +283,9 @@
__s64 lcn, ofs;
- if (!vol || !buf)
+ if (!vol || !mrec)
return -EINVAL;
if (!vol->fd)
return -EBADF;
- m = mref->mft_reference & MFT_REFERENCE_MASK;
+ m = *(__u64*)mref & MFT_REFERENCE_MASK_CPU;
if (vol->number_of_mft_records < m + count)
return -ESPIPE;
@@ -312,5 +312,5 @@
return -eo;
}
- br = mst_pread(vol->fd, buf, vol->mft_record_size, count,
+ br = mst_pread(vol->fd, (__u8*)mrec, vol->mft_record_size, count,
(lcn << vol->cluster_size_bits) + ofs);
if (br != count) {
@@ -334,19 +334,19 @@
* get_mft_record - read a record from the mft
* @vol: volume to read from
- * @buf: output data buffer
+ * @mrec: output data buffer
* @mref: starting mft record number
* @count: number of mft records to read
*
- * Read mft record specified by @mref from volume @vol into buffer @buf.
+ * Read mft record specified by @mref from volume @vol into buffer @mrec.
* Return 1 on success or -ERRNO on error, where ERRNO is the error
* code. This function will do the error reporting so caller really only needs
* to check for sucess / failure.
*
- * NOTE: @buf has to be at least of size vol->mft_record_size.
+ * NOTE: @mrec has to be at least of size vol->mft_record_size.
*/
-__inline__ int get_mft_record(const ntfs_volume *vol, __u8 *buf,
+__inline__ int get_mft_record(const ntfs_volume *vol, MFT_RECORD *mrec,
const MFT_REFERENCE *mref)
{
- return get_mft_records(vol, buf, mref, 1);
+ return get_mft_records(vol, mrec, mref, 1);
}
@@ -361,5 +361,5 @@
* to read, including the sequence number. When the function returns, @mrec and
* @attr will contain pointers to the read mft record and to the first attribute
- * within the mft record, respectively.
+ * within the mft record, respectively. @attr is optional (can be NULL).
*
* The read mft record is checked for having the magic FILE, for being in use,
@@ -375,7 +375,8 @@
{
MFT_RECORD *m;
+ ATTR_RECORD *a;
int er = 0;
- if (!vol || !mrec || !attr) {
+ if (!vol || !mrec) {
#ifdef DEBUG
fprintf(stderr, "read_file_record() received NULL pointer!\n");
@@ -394,11 +395,11 @@
if (!(m->flags & MFT_RECORD_IN_USE))
goto file_corrupt;
- *attr = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset));
- if (*attr < m || *attr > (char*)m + vol->mft_record_size)
+ a = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset));
+ if (p2n(a) < p2n(m) || (char*)a > (char*)m + vol->mft_record_size)
goto file_corrupt;
*mrec = m;
+ if (attr)
+ *attr = a;
return 0;
-file_corrupt_attr:
- *attr = NULL;
file_corrupt:
#ifdef DEBUG
@@ -420,5 +421,5 @@
if (!vol->fd)
return -EBADF;
- m = mref->mft_reference & MFT_REFERENCE_MASK;
+ m = *(__u64*)mref & MFT_REFERENCE_MASK_CPU;
if (vol->number_of_mft_records <= m)
return -ESPIPE;
Index: ntfs_rec.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfs_rec.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- ntfs_rec.c 2001/03/05 03:04:40 1.3
+++ ntfs_rec.c 2001/04/02 02:04:37 1.4
@@ -61,5 +61,5 @@
/* Size and alignement checks. */
if ( size & (NTFS_SECTOR_SIZE - 1) ||
- usa_ofs & 1 ||
+ usa_ofs & 1 ||
usa_ofs + (usa_count * 2) > size ||
(size >> NTFS_SECTOR_SIZE_BITS) != usa_count)
@@ -95,4 +95,5 @@
}
data_pos += NTFS_SECTOR_SIZE/sizeof(__u16);
+ }
/* Re-setup the variables. */
usa_count = le16_to_cpu(b->usa_count) - 1;
Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/unistr.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- unistr.c 2001/03/31 15:27:34 1.2
+++ unistr.c 2001/04/02 02:04:37 1.3
@@ -22,4 +22,22 @@
#include "unistr.h"
+/*
+ * This is used by the name collation functions to quickly determine what
+ * characters are (in)valid.
+ */
+const __u8 legal_ansi_char_array[0x40] = {
+ 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+
+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+
+ 0x17, 0x07, 0x18, 0x17, 0x17, 0x17, 0x17, 0x17,
+ 0x17, 0x17, 0x18, 0x16, 0x16, 0x17, 0x07, 0x00,
+
+ 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17,
+ 0x17, 0x17, 0x04, 0x16, 0x18, 0x16, 0x18, 0x18,
+};
+
/**
* ntfs_are_names_equal - compare two Unicode names for equality
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- volume.c 2001/03/31 15:27:34 1.7
+++ volume.c 2001/04/02 02:04:37 1.8
@@ -34,6 +34,7 @@
#include "disk_io.h"
#include "mft.h"
+#include "support.h"
-ntfs_volume *ntfs_open(const char *name)
+ntfs_volume *ntfs_mount(const char *name)
{
const char *OK = "OK";
@@ -50,4 +51,6 @@
__s8 c;
attr_search_context ctx;
+ MFT_REFERENCE mref;
+ int err;
if (!name) {
@@ -223,8 +226,9 @@
}
/* Find the bitmap attribute. */
- memset(ctx, 0, sizeof(attr_search_context));
+ memset(&ctx, 0, sizeof(attr_search_context));
ctx.mrec = mb;
ctx.attr = (ATTR_RECORD*)((char*)mb + le16_to_cpu(mb->attrs_offset));
- if (ctx.attr < mb || ctx.attr > (char*)mb + vol->mft_record_size) {
+ if (p2n(ctx.attr) < p2n(mb) ||
+ (char*)ctx.attr > (char*)mb + vol->mft_record_size) {
puts(FAILED);
fprintf(stderr, "Error: corrupt mft record for $Mft.\n"
@@ -234,5 +238,5 @@
}
ctx.is_first = TRUE;
- if (!lookup_attr(vol, 0, $BITMAP, NULL, 0, 0, 0, 0, 0, &ctx)) {
+ if (!find_attr(vol, $BITMAP, NULL, 0, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "$bitmap attribute not found in $Mft?!?\n");
@@ -257,5 +261,5 @@
}
/* Read in the bitmap attribute value into the buffer. */
- if (l != get_attribute_value(vol, a, vol->mft_bitmap)) {
+ if (l != get_attribute_value(vol, mb, a, vol->mft_bitmap)) {
puts(FAILED);
puts("Amount of data read does not correspond to expected "
@@ -264,12 +268,10 @@
goto error_exit;
}
- //if (ctx.alist_val)
- // free(ctx.alist_val);
/* Find the $DATA attribute in $Mft. */
- memset(ctx, 0, sizeof(attr_search_context));
+ memset(&ctx, 0, sizeof(attr_search_context));
ctx.mrec = mb;
ctx.attr = (ATTR_RECORD*)((char*)mb + le16_to_cpu(mb->attrs_offset));
ctx.is_first = TRUE;
- if (!lookup_attr(vol, 0, $DATA, NULL, 0, 0, 0, 0, 0, &ctx)) {
+ if (!find_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "$DATA attribute not found in $Mft?!?\n");
@@ -277,4 +279,5 @@
goto error_exit;
}
+ a = ctx.attr;
/* Determine the number of mft records in $Mft. */
vol->number_of_mft_records = a->data_size >> vol->mft_record_size_bits;
@@ -296,34 +299,19 @@
}
puts(OK);
+ /* Done with the $Mft mft record. */
+ free(mb);
+ mb = NULL;
/* Now load the bitmap from $Bitmap. */
printf("Loading $Bitmap... ");
- br = get_mft_records(vol, (char*)mb, 6, 1);
- if (br != 1) {
- puts(FAILED);
- errno = EIO;
- goto error_exit;
- }
- if (is_baad_record(mb)) {
+ mref = (MFT_REFERENCE)(__u64)FILE_$BitMap;
+ if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
- fprintf(stderr, "Error: Incomplete multi sector "
- "transfer detected in $Bitmap.\nCannot "
- "handle this yet. )-:\n");
- errno = EIO;
+ errno = err;
goto error_exit;
}
- if (!is_mft_recordp(mb)) {
- puts(FAILED);
- fprintf(stderr, "Error: Invalid $Mft record for $Bitmap.\n"
- "Cannot handle this yet. )-:\n");
- printf("Record is of type: %c%c%c%c\n", ((char*)mb)[0],
- ((char*)mb)[1],
- ((char*)mb)[2],
- ((char*)mb)[3]);
- errno = EIO;
- goto error_exit;
- }
+ memset(&ctx, 0, sizeof(attr_search_context));
+ ctx.mrec = mb;
/* Find the bitmap (it is in the $DATA attribute). */
- a = find_first_attribute(vol, mb, $DATA, NULL);
- if (!a) {
+ if (!find_first_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "bitmap attribute not found in $Bitmap?!?\n");
@@ -331,4 +319,5 @@
goto error_exit;
}
+ a = ctx.attr;
/* Get attribute value size and allocate a big enough buffer.*/
l = get_attribute_value_length(a);
@@ -347,5 +336,5 @@
}
/* Read in the bitmap attribute value into the buffer. */
- if (l != get_attribute_value(vol, a, vol->lcn_bitmap)) {
+ if (l != get_attribute_value(vol, mb, a, vol->lcn_bitmap)) {
puts(FAILED);
puts("Amount of data read does not correspond to expected "
@@ -354,31 +343,20 @@
goto error_exit;
}
+ /* Done with the $BitMap mft record. */
puts(OK);
+ free(mb);
+ mb = NULL;
/* Now load the upcase table from $UpCase. */
printf("Loading $UpCase... ");
- br = get_mft_records(vol, (char*)mb, 10, 1);
- if (br != 1) {
+ mref = (MFT_REFERENCE)(__u64)FILE_$UpCase;
+ if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
- errno = EIO;
- goto error_exit;
- }
- if (is_baad_record(mb)) {
- puts(FAILED);
- fprintf(stderr, "Error: Incomplete multi sector "
- "transfer detected in $UpCase.\nCannot "
- "handle this yet. )-:\n");
- errno = EIO;
- goto error_exit;
- }
- if (!is_mft_recordp(mb)) {
- puts(FAILED);
- fprintf(stderr, "Error: Invalid $Mft record for $UpCase.\n"
- "Cannot handle this yet. )-:\n");
- errno = EIO;
+ errno = err;
goto error_exit;
- }
+ }
+ memset(&ctx, 0, sizeof(attr_search_context));
+ ctx.mrec = mb;
/* Find the bitmap (it is in the $DATA attribute). */
- a = find_first_attribute(vol, mb, $DATA, NULL);
- if (!a) {
+ if (!find_first_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "$DATA attribute not found in $UpCase?!?\n");
@@ -386,4 +364,5 @@
goto error_exit;
}
+ a = ctx.attr;
/* Get attribute value size and allocate a big enough buffer.*/
l = get_attribute_value_length(a);
@@ -405,5 +384,5 @@
}
vol->upcase_len = l >> 1;
- vol->upcase = (__u16*)malloc(l);
+ vol->upcase = (wchar_t*)malloc(l);
if (!vol->upcase) {
puts(FAILED);
@@ -413,5 +392,5 @@
}
/* Read in the $DATA attribute value into the buffer. */
- if (l != get_attribute_value(vol, a, (__u8*)vol->upcase)) {
+ if (l != get_attribute_value(vol, mb, a, (__u8*)vol->upcase)) {
puts(FAILED);
puts("Amount of data read does not correspond to expected "
@@ -420,32 +399,22 @@
goto error_exit;
}
+ /* Done with the $UpCase mft record. */
puts(OK);
+ free(mb);
+ mb = NULL;
/* Now load $Volume and set the version information and flags in the
- vol structure accordingly. */
+ * vol structure accordingly. */
printf("Loading $Volume... ");
- br = get_mft_records(vol, (char*)mb, 3, 1);
- if (br != 1) {
- puts(FAILED);
- errno = EIO;
- goto error_exit;
- }
- if (is_baad_record(mb)) {
+ mref = (MFT_REFERENCE)(__u64)FILE_$Volume;
+ if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
- fprintf(stderr, "Error: Incomplete multi sector "
- "transfer detected in $Volume.\nCannot "
- "handle this yet. )-:\n");
- errno = EIO;
+ errno = err;
goto error_exit;
}
- if (!is_mft_recordp(mb)) {
- puts(FAILED);
- fprintf(stderr, "Error: Invalid $Mft record for $Volume.\n"
- "Cannot handle this yet. )-:\n");
- errno = EIO;
- goto error_exit;
- }
+ memset(&ctx, 0, sizeof(attr_search_context));
+ ctx.mrec = mb;
/* Find the $VOLUME_INFORMATION attribute. */
- a = find_first_attribute(vol, mb, $VOLUME_INFORMATION, NULL);
- if (!a) {
+ if (!find_first_attr(vol, $VOLUME_INFORMATION, NULL, 0, 0, NULL, 0,
+ &ctx)) {
puts(FAILED);
fprintf(stderr, "$VOLUME_INFORMATION attribute not found in "
@@ -454,4 +423,5 @@
goto error_exit;
}
+ a = ctx.attr;
/* Has to be resident. */
if (a->non_resident) {
@@ -486,6 +456,7 @@
puts(OK);
free(mb);
+ mb = NULL;
- /* FIXME: Need to deal with $AttrDef (4). */
+ /* FIXME: Need to deal with FILE_$AttrDef. */
return vol;
@@ -521,5 +492,5 @@
}
-int ntfs_close(ntfs_volume *vol, const int force)
+int ntfs_umount(ntfs_volume *vol, const int force)
{
if (!vol) {
|
|
From: Anton A. <an...@us...> - 2001-04-02 02:04:42
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv17127/ntfstools
Modified Files:
Makefile.am Makefile.in ntfsdump_logfile.c ntfsfix.c
Log Message:
Everything compiles again! Yey! (Don't know about working though, haven't tried
it... So be careful...)
The definitely final find_{first_}attr() functions are in place. Currently
still no support for attribute lists.
The two new _RE files contain the C-fied and more or less (more less than more
actually) cleaned up functions from the ntfs driver. Once they are cleaned
up (find_attr() is already completed but I left it in the _RE files for future
reference/educational value) and modified to suit my ideas of how they should
work, which are not quite the same as the driver way, they will make it into
attrib.[ch].
If anyone gives the new code a try, I would be interested in whether it worked
or not... (-;
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.am 2001/03/02 15:06:37 1.3
+++ Makefile.am 2001/04/02 02:04:37 1.4
@@ -1,3 +1,3 @@
-bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs
+bin_PROGRAMS = ntfsfix ntfsdump_logfile #mkntfs
linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -14,6 +14,6 @@
ntfsdump_logfile_LDFLAGS= $(all_libraries)
-mkntfs_SOURCES = mkntfs.c
-mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
-mkntfs_LDFLAGS = $(all_libraries)
+#mkntfs_SOURCES = mkntfs.c
+#mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
+#mkntfs_LDFLAGS = $(all_libraries)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Makefile.in 2001/02/03 02:03:36 1.2
+++ Makefile.in 2001/04/02 02:04:37 1.3
@@ -83,19 +83,17 @@
all_libraries = @all_libraries@
-bin_PROGRAMS = ntfsfix ntfsdump_logfile
+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
-
-# Set the include path.
-INCLUDES = -I$(top_srcdir)/include $(all_includes)
-
-# The library search path.
-ntfsfix_LDFLAGS = $(all_libraries)
ntfsdump_logfile_LDFLAGS = $(all_libraries)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -360,4 +358,8 @@
mostlyclean distclean maintainer-clean
+
+#mkntfs_SOURCES = mkntfs.c
+#mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
+#mkntfs_LDFLAGS = $(all_libraries)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- ntfsdump_logfile.c 2001/03/02 15:06:37 1.3
+++ ntfsdump_logfile.c 2001/04/02 02:04:37 1.4
@@ -1,7 +1,9 @@
const char *EXEC_NAME = "NtfsDump_LogFile";
-const char *EXEC_VERSION = "0.0.1";
+const char *EXEC_VERSION = "0.0.2";
/*
* NtfsDump_LogFile - Part of the Linux-NTFS project.
*
+ * $Id$
+ *
* Copyright (c) 2000,2001 Anton Altaparmakov.
*
@@ -60,6 +62,6 @@
int main(int argc, char **argv)
{
- unsigned char *b1 = NULL;
- NONRESIDENT_ATTRIBUTE_RECORD_HEADER *a;
+ MFT_RECORD *m = NULL;
+ ATTR_RECORD *a;
__u64 l;
unsigned char *lfd;
@@ -70,4 +72,6 @@
int pass = 1;
int i, lps;
+ MFT_REFERENCE mref;
+ attr_search_context ctx;
printf("\n");
@@ -91,31 +95,9 @@
exit(1);
}
- vol = ntfs_open(argv[1]);
+ vol = ntfs_mount(argv[1]);
if (!vol) {
- perror("ntfs_open() failed");
+ perror("ntfs_mount() failed");
exit(1);
}
- b1 = (__u8 *)malloc(vol->mft_record_size);
- if (!b1) {
- perror("Error allocating internal buffers");
- goto error_exit;
- }
- /* Read $MFT and $MFTmirr. */
- if (get_mft_records(vol, b1, 2, 1) != 1) {
- fprintf(stderr, "Error reading mft record for $LogFile.\n");
- goto error_exit;
- }
- /* Check the $LogFile mft record. */
- if (is_baad_record(b1)) {
- fprintf(stderr, "Error: Incomplete multi sector "
- "transfer detected in $LogFile.\nCannot "
- "handle this yet. )-:\n");
- goto error_exit;
- }
- if (!is_mft_recordp(b1)) {
- fprintf(stderr, "Error: Invalid mft record for $LogFile.\n"
- "Cannot handle this yet. )-:\n");
- goto error_exit;
- }
/* Check NTFS version is ok for us. */
printf("\nNTFS volume version is %i.%i.\n", vol->major_ver,
@@ -136,14 +118,21 @@
goto error_exit;
}
+ /* Read in $LogFile. */
+ memset(&ctx, 0, sizeof(attr_search_context));
+ *(__u64*)&mref = FILE_$LogFile;
+ if (read_file_record(vol, &mref, &m, NULL)) {
+ fprintf(stderr, "Error reading mft record for $LogFile.\n");
+ goto error_exit;
+ }
+ ctx.mrec = m;
/* Find the $DATA attribute of the $LogFile. */
- a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
- find_first_attr(vol, (MFT_RECORD_HEADER*)b1, $DATA, NULL);
- if (!a) {
+ if (!find_first_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
fprintf(stderr, "Error: Attribute $DATA was not found in" \
"$LogFile!\n");
goto log_file_error;
}
+ a = ctx.attr;
/* Get length of $LogFile contents. */
- l = get_attribute_value_length((ATTRIBUTE_RECORD_HEADER*)a);
+ l = get_attribute_value_length(a);
if (!l) {
puts("$LogFile has zero length, no need to write to disk.");
@@ -157,5 +146,5 @@
}
/* Read in the $LogFile into the buffer. */
- if (l != get_attribute_value(vol, (ATTRIBUTE_RECORD_HEADER*)a, lfd)) {
+ if (l != get_attribute_value(vol, m, a, lfd)) {
puts("Amount of data read does not correspond to expected "
"length!");
@@ -173,5 +162,5 @@
lps = le32_to_cpu(rph->log_page_size);
pass_loc:
- if (!post_read_mst_fixup((NTFS_RECORD_HEADER*)rph, lps) ||
+ if (!post_read_mst_fixup((NTFS_RECORD*)rph, lps) ||
is_baad_recordp(rph)) {
puts("$LogFile incomplete multi sector transfer detected! "
@@ -183,5 +172,5 @@
le16_to_cpu(rph->minor_ver != 1)) {
fprintf(stderr, "$LogFile version %i.%i! Error: Unknown "
- "$LogFilee version!\n",
+ "$LogFile version!\n",
le16_to_cpu(rph->major_ver),
le16_to_cpu(rph->minor_ver));
@@ -253,8 +242,8 @@
i = 0;
final_exit:
- if (b1)
- free(b1);
+ if (m)
+ free(m);
if (vol)
- ntfs_close(vol, 0);
+ ntfs_umount(vol, 0);
return i;
error_exit:
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ntfsfix.c 2001/03/02 15:06:37 1.6
+++ ntfsfix.c 2001/04/02 02:04:37 1.7
@@ -1,7 +1,9 @@
const char *EXEC_NAME = "NtfsFix";
-const char *EXEC_VERSION = "0.0.2";
+const char *EXEC_VERSION = "0.0.3";
/*
* NtfsFix - Part of the Linux-NTFS project.
*
+ * $Id$
+ *
* Copyright (c) 2000,2001 Anton Altaparmakov.
*
@@ -69,9 +71,11 @@
int i, ebits;
ssize_t br;
- NONRESIDENT_ATTRIBUTE_RECORD_HEADER *a;
+ ATTR_RECORD *a;
__u64 l;
unsigned char *lfd;
ntfs_volume *vol = NULL;
__u16 flags;
+ attr_search_context ctx;
+ MFT_REFERENCE mref;
printf("\n");
@@ -102,7 +106,7 @@
exit(1);
}
- vol = ntfs_open(argv[1]);
+ vol = ntfs_mount(argv[1]);
if (!vol) {
- perror("ntfs_open() failed");
+ perror("ntfs_mount() failed");
exit(1);
}
@@ -215,10 +219,10 @@
for (i = 0, ebits = 0; i < 4; ++i) {
if (memcmp(b1+i*mrs, b2+i*mrs,
- get_mft_record_data_size((MFT_RECORD_HEADER*)(b1 +
+ get_mft_record_data_size((MFT_RECORD*)(b1 +
i * mrs)))) {
ebits |= 1 << i;
#ifdef DEBUG
printf("in memcmp: i = %x, count = 0x%x\n", i,
- get_mft_record_data_size((MFT_RECORD_HEADER*)(b1
+ get_mft_record_data_size((MFT_RECORD*)(b1
+ i * mrs)));
#endif
@@ -239,5 +243,6 @@
memcpy(b2 + mrs * i, b1 + mrs * i, mrs);
/* Do the writes now. */
- br = put_mft_record(vol, b1 + mrs * i, i);
+ *(__u64*)&mref = i;
+ br = put_mft_record(vol, b1 + mrs * i, &mref);
if (br != 1)
goto mirr_sync_failed;
@@ -288,5 +293,5 @@
if (vol->major_ver >= 2)
flags |= VOLUME_MOUNTED_ON_NT4;
- if (!set_ntfs_volume_flags((MFT_RECORD_HEADER*)(b1+3*mrs), flags)) {
+ if (!set_ntfs_volume_flags(vol, (MFT_RECORD*)(b1+3*mrs), flags)) {
puts(FAILED);
fprintf(stderr, "Error setting volume flags.\n");
@@ -301,5 +306,6 @@
/* Write $Volume to $Mft. */
printf("Writing $Volume to $Mft... ");
- br = put_mft_record(vol, b1 + (3 * mrs), 3);
+ *(__u64*)&mref = 3ULL;
+ br = put_mft_record(vol, b1 + (3 * mrs), &mref);
if (br != 1) {
puts(FAILED);
@@ -333,8 +339,7 @@
printf("Going to empty the journal ($LogFile)... ");
/* Find the $DATA attribute. */
- a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
- find_first_attr(vol, (MFT_RECORD_HEADER*)(b1+(2*mrs)), $DATA,
- NULL);
- if (!a) {
+ memset(&ctx, 0, sizeof(attr_search_context));
+ ctx.mrec = (MFT_RECORD*)(b1 + (2 * mrs));
+ if (!find_first_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "Error: Attribute $DATA was not found in" \
@@ -342,6 +347,7 @@
goto log_file_error;
}
+ a = ctx.attr;
/* The $DATA attribute of the $LogFile has to be non-resident. */
- if (!a->attribute.non_resident) {
+ if (!a->non_resident) {
puts(FAILED);
fprintf(stderr, "$LogFile $DATA attribute is resident!?!\n");
@@ -349,5 +355,5 @@
}
/* Get length of $LogFile contents. */
- l = get_attribute_value_length((ATTRIBUTE_RECORD_HEADER*)a);
+ l = get_attribute_value_length((ATTR_RECORD*)a);
if (!l) {
puts(OK);
@@ -366,5 +372,6 @@
decompressing the mapping pairs array correctly and hence writing
below if safe as well. */
- if (l != get_attribute_value(vol, (ATTRIBUTE_RECORD_HEADER*)a, lfd)) {
+ if (l != get_attribute_value(vol, (MFT_RECORD*)(b1 + (2 * mrs)),
+ a, lfd)) {
puts(FAILED);
puts("Amount of data read does not correspond to expected "
@@ -377,13 +384,13 @@
/* Set the $DATA attribute. */
/* FIXME: set_attribute_value needs to either:
- * - know the MFT_RECORD_HEADER so it can adjust it accordingly with
+ * - know the MFT_RECORD so it can adjust it accordingly with
* changes in length of the resident part of the attribute.
* or
- * - return a copy of the attribute so the MFT_RECORD_HEADER can be
+ * - return a copy of the attribute so the MFT_RECORD can be
* adjusted accordingly with changes in the length of the resident
* part of the attribute by the caller.
* For now, just assume that attribute length remains constant, since
* this is the case for the $LogFile zeroing out. */
- if (!set_attribute_value(vol, (ATTRIBUTE_RECORD_HEADER*)a, lfd, l)) {
+ if (!set_attribute_value(vol, (ATTR_RECORD*)a, lfd, l)) {
puts(FAILED);
puts("Failed to set the $LogFile attribute value.");
@@ -418,5 +425,5 @@
free(b1);
if (vol)
- ntfs_close(vol, 0);
+ ntfs_umount(vol, 0);
return i;
error_exit:
|
|
From: Anton A. <an...@us...> - 2001-04-02 02:04:42
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv17127/include
Modified Files:
Makefile.in attrib.h mft.h support.h unistr.h volume.h
Added Files:
attrib_RE.h
Log Message:
Everything compiles again! Yey! (Don't know about working though, haven't tried
it... So be careful...)
The definitely final find_{first_}attr() functions are in place. Currently
still no support for attribute lists.
The two new _RE files contain the C-fied and more or less (more less than more
actually) cleaned up functions from the ntfs driver. Once they are cleaned
up (find_attr() is already completed but I left it in the _RE files for future
reference/educational value) and modified to suit my ideas of how they should
work, which are not quite the same as the driver way, they will make it into
attrib.[ch].
If anyone gives the new code a try, I would be interested in whether it worked
or not... (-;
--- NEW FILE ---
/**
* attr_search_context - used in attribute search functions
* @mrec: buffer containing mft record to search
* @attr: attribute record in @mrec where to begin/continue search
* @alist_mrec: mft record containing attribute list (i.e. base mft record)
* @alist_attr: attribute list attribute record
* @alist_val: attribute list value (if alist is resident in @alist_mrec)
* @alist_val_end: end of attribute list value + 1
* @alist_val_len: length of attribute list in bytes
* @is_first: if true lookup_attr() begins search with @attr, else after @attr
*
* Structure must be initialized to zero before the first call to one of the
* attribute search functions. If the mft record in which to search has already
* been loaded into memory, then initialize @base and @mrec to point to it,
* @attr to point to the first attribute within @mrec, and set @is_first to
* TRUE.
*
* @is_first is only honoured in lookup_attr() and only when called with @mrec
* not NULL. Then, if @is_first is TRUE, lookup_attr() begins the search with
* @attr. If @is_first is FALSE, lookup_attr() begins the search after @attr.
* This is so that, after the first call to lookup_attr(), we can call
* lookup_attr() again, without any modification of the search context, to
* automagically get the next matching attribute.
*
* In contrast, find_attr() ignores @is_first and always begins the search with
* @attr. find_attr() shouldn't really be called directly; it is just for
* internal use. FIXME: Might want to change this behaviour later, but not
* before I am finished with lookup_external_attr(). (AIA)
*
* FIXME: alist_val* stuff is subject to change. A bit of redundancy at the
* moment. (AIA)
*/
typedef struct {
__u8 *base;
MFT_RECORD *mrec;
ATTR_RECORD *attr;
__u8 *alist_val_base;
MFT_RECORD *alist_mrec;
ATTR_RECORD *alist_attr;
ATTR_LIST_ENTRY *alist_val;
ATTR_LIST_ENTRY *alist_val_end;
__u32 alist_val_len;
IS_FIRST_BOOL is_first;
__u8 *alist_old_base;
} attr_search_context;
BOOL lookup_external_attr(const ntfs_volume *vol, const MFT_REFERENCE mref,
const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
const IGNORE_CASE_BOOL ic, const VCN lowest_vcn, const __u8 *val,
const __u32 val_len, attr_search_context *ctx);
BOOL lookup_attr(const ntfs_volume *vol, const MFT_REFERENCE mref,
const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
const IGNORE_CASE_BOOL ic, const VCN lowest_vcn, const __u8 *val,
const __u32 val_len, attr_search_context *ctx);
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- Makefile.in 2001/02/03 02:03:35 1.1
+++ Makefile.in 2001/04/02 02:04:37 1.2
@@ -84,5 +84,5 @@
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
+linux_ntfsinclude_HEADERS = attrib.h bitmap.h bootsect.h disk_io.h endians.h logfile.h mft.h ntfs_rec.h volume.h unistr.h support.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- attrib.h 2001/03/31 15:25:19 1.19
+++ attrib.h 2001/04/02 02:04:37 1.20
@@ -25,4 +25,6 @@
#include "endians.h"
#include "mft.h"
+#include "support.h"
+#include "unistr.h"
/*
@@ -132,5 +134,5 @@
/* 0*/ wchar_t name[64]; /* Unicode name of the attribute. Zero
terminated. */
-/* 80*/ ATTR_TYPE type; /* Type of the attribute. */
+/* 80*/ ATTR_TYPES type; /* Type of the attribute. */
/* 84*/ __u32 display_rule; /* Default display rule.
FIXME: What does it mean? (AIA) */
@@ -228,72 +230,4 @@
/*
- * Partial resident attribute record header.
- */
-typedef struct {
-/*Ofs when in ATTR_REC*/
-/* 16*/ __u32 value_length; /* Byte size of attribute value. */
-/* 20*/ __u16 value_offset; /* Byte offset of the attribute value from the
- start of the attribute record. */
-/* 22*/ RESIDENT_ATTR_FLAGS resident_flags; /* Flags (see above). */
-/* 23*/ __s8 reserved1; /* Reserved/alignment to 8-byte boundary. */
-/* sizeof() = 24 bytes */
-} __attribute__ ((__packed__)) NTFS_RESIDENT_ATTR_RECORD_PARTIAL;
-
-/*
- * Partial non-resident attribute record header.
- *
- * FIXME: Not sure whether clusters and vcns/lcns are stored as __u64 or __s64.
- * Some indicators point to __s64 though. (AIA)
- */
-typedef struct {
-/*Ofs when in ATTR_REC*/
-/* 16*/ __s64 lowest_vcn; /* Lowest valid virtual cluster number (vcn)
- for this portion of the attribute value or
- 0 if this is the only extent (usually the
- case). - Only when an attribute list is used
- does lowest_vcn != 0 ever occur. */
-/* 24*/ __s64 highest_vcn; /* Highest valid vcn of this extent of the
- attribute value. - Usually there is only one
- portion, so this usually equals the attribute
- value size in clusters. Can be -1 for zero
- length files. Can be 0 for "single extent"
- attributes. */
-/* 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.)
- Windows NT4 only uses a value of 4. */
-/* 35*/ __u8 reserved2[5]; /* Align to 8-byte boundary. */
-/* The sizes below are only used when LowestVcn is zero, as otherwise it would
- be difficult to keep them up-to-date.*/
-/* 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__)) NTFS_NONRESIDENT_ATTR_RECORD_PARTIAL;
-
-/*
* Attribute record header. Always aligned to 8-byte boundary.
*/
@@ -318,8 +252,66 @@
in mft.h for more details). */
/* 16*/ union {
- NTFS_RESIDENT_ATTR_RECORD_PARTIAL;
- NTFS_NON_RESIDENT_ATTR_RECORD_PARTIAL;
+ /* Resident attributes. */
+ struct {
+/* 16 */ __u32 value_length; /* Byte size of attribute value. */
+/* 20 */ __u16 value_offset; /* Byte offset of the attribute
+ value from the start of the
+ attribute record. */
+/* 22 */ RESIDENT_ATTR_FLAGS resident_flags; /* See above. */
+/* 23 */ __s8 reserved1; /* Reserved/alignment to 8-byte
+ boundary. */
+ } __attribute__ ((__packed__));
+ /* Non-resident attributes. */
+ struct {
+/* 16*/ VCN lowest_vcn; /* Lowest valid virtual cluster number
+ for this portion of the attribute value or
+ 0 if this is the only extent (usually the
+ case). - Only when an attribute list is used
+ does lowest_vcn != 0 ever occur. */
+/* 24*/ VCN highest_vcn; /* Highest valid vcn of this extent of
+ the attribute value. - Usually there is only one
+ portion, so this usually equals the attribute
+ value size in clusters. Can be -1 for zero
+ length files. Can be 0 for "single extent"
+ attributes. */
+/* 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.) WinNT4 only uses a value of 4. */
+/* 35*/ __u8 reserved2[5]; /* Align to 8-byte boundary. */
+/* The sizes below are only used when lowest_vcn is zero, as otherwise it would
+ be difficult to keep them up-to-date.*/
+/* 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. */
+ } __attribute__ ((__packed__));
} __attribute__ ((__packed__));
-} __attribute__ ((__packed__)) ATTR_RECORD, ATTR_REC;
+} __attribute__ ((__packed__)) ATTR_RECORD;
+
+typedef ATTR_RECORD ATTR_REC;
/*
@@ -493,5 +485,5 @@
(always set this to where the name would
start even if unnamed). */
-/* 8*/ __s64 lowest_vcn; /* Lowest virtual cluster number of this portion
+/* 8*/ VCN lowest_vcn; /* Lowest virtual cluster number of this portion
of the attribute value. This is usually 0. It
is non-zero for the case where one attribute
@@ -501,5 +493,8 @@
record holds one extent of the attribute and
there is one attribute list entry for each
- extent. */
+ extent. NOTE: This is DEFINITELY a signed
+ value! The windows driver uses cmp, followed
+ by jg when comparing this, thus it treats it
+ as signed. */
/* 16*/ MFT_REFERENCE mft_reference; /* The reference of the mft record holding
the ATTR_RECORD for this portion of the
@@ -661,12 +656,12 @@
* the SID structure (see below).
*/
-typedef enum { /* SID string prefix. */
- SECURITY_NULL_SID_AUTHORITY = {0, 0, 0, 0, 0, 0}, /* S-1-0 */
- SECURITY_WORLD_SID_AUTHORITY = {0, 0, 0, 0, 0, 1}, /* S-1-1 */
- SECURITY_LOCAL_SID_AUTHORITY = {0, 0, 0, 0, 0, 2}, /* S-1-2 */
- SECURITY_CREATOR_SID_AUTHORITY = {0, 0, 0, 0, 0, 3}, /* S-1-3 */
- SECURITY_NON_UNIQUE_AUTHORITY = {0, 0, 0, 0, 0, 4}, /* S-1-4 */
- SECURITY_NT_SID_AUTHORITY = {0, 0, 0, 0, 0, 5}, /* S-1-5 */
-} IDENTIFIER_AUTHORITIES;
+//typedef enum { /* SID string prefix. */
+// SECURITY_NULL_SID_AUTHORITY = {0, 0, 0, 0, 0, 0}, /* S-1-0 */
+// SECURITY_WORLD_SID_AUTHORITY = {0, 0, 0, 0, 0, 1}, /* S-1-1 */
+// SECURITY_LOCAL_SID_AUTHORITY = {0, 0, 0, 0, 0, 2}, /* S-1-2 */
+// SECURITY_CREATOR_SID_AUTHORITY = {0, 0, 0, 0, 0, 3}, /* S-1-3 */
+// SECURITY_NON_UNIQUE_AUTHORITY = {0, 0, 0, 0, 0, 4}, /* S-1-4 */
+// SECURITY_NT_SID_AUTHORITY = {0, 0, 0, 0, 0, 5}, /* S-1-5 */
+//} IDENTIFIER_AUTHORITIES;
/*
@@ -791,5 +786,5 @@
*/
typedef union {
- typedef struct {
+ struct {
__u32 low_part; /* Low 32-bits. */
__u16 high_part; /* High 16-bits. */
@@ -1385,5 +1380,5 @@
__s64 lsn; /* $LogFile sequence number of the last
modification of this index block. */
- __s64 index_block_vcn; /* Virtual cluster number of the index block. */
+ VCN index_block_vcn; /* Virtual cluster number of the index block. */
INDEX_HEADER index; /* Describes the following index entries. */
/*
@@ -1462,8 +1457,8 @@
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 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. */
+ __s64 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
@@ -1541,5 +1536,5 @@
} __attribute__ ((__packed__)) key;
/* The (optional) index data is inserted here when creating. */
- // __s64 vcn; /* If INDEX_ENTRY_NODE bit in flags is set, the last
+ // VCN 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
@@ -1628,5 +1623,5 @@
*/
typedef enum {
- NEED_EA = 0x80;
+ NEED_EA = 0x80,
} __attribute__ ((__packed__)) EA_FLAGS;
@@ -1675,12 +1670,7 @@
} __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTR;
-/* min macro used in attrib.c */
-#ifndef min
-#define min(a,b) ((a) <= (b) ? (a) : (b))
-#endif
-
typedef struct { /* In memory vcn to lcn mapping structure element. */
- __s64 vcn; /* vcn = starting virtual cluster number */
- __s64 lcn; /* lcn = starting logical cluster number */
+ VCN vcn; /* vcn = starting virtual cluster number */
+ LCN lcn; /* lcn = starting logical cluster number */
__u64 length; /* run length in clusters */
} run_list_element;
@@ -1715,5 +1705,5 @@
* if vcn is outside the boundaries covered by the run list.
*/
-__s64 vcn_to_lcn(const run_list rl, const __s64 vcn);
+LCN vcn_to_lcn(const run_list rl, const VCN vcn);
#include "volume.h"
@@ -1751,44 +1741,22 @@
* @mrec: buffer containing mft record to search
* @attr: attribute record in @mrec where to begin/continue search
- * @alist_mrec: mft record containing attribute list (i.e. base mft record)
- * @alist_attr: attribute list attribute record
- * @alist_val: attribute list value (if alist is resident in @alist_mrec)
- * @alist_val_end: end of attribute list value + 1
- * @alist_val_len: length of attribute list in bytes
* @is_first: if true lookup_attr() begins search with @attr, else after @attr
*
* Structure must be initialized to zero before the first call to one of the
* attribute search functions. If the mft record in which to search has already
- * been loaded into memory, then initialize @base and @mrec to point to it,
- * @attr to point to the first attribute within @mrec, and set @is_first to
- * TRUE.
- *
- * @is_first is only honoured in lookup_attr() and only when called with @mrec
- * not NULL. Then, if @is_first is TRUE, lookup_attr() begins the search with
- * @attr. If @is_first is FALSE, lookup_attr() begins the search after @attr.
- * This is so that, after the first call to lookup_attr(), we can call
- * lookup_attr() again, without any modification of the search context, to
- * automagically get the next matching attribute.
- *
- * In contrast, find_attr() ignores @is_first and always begins the search with
- * @attr. find_attr() shouldn't really be called directly; it is just for
- * internal use. FIXME: Might want to change this behaviour later, but not
- * before I am finished with lookup_external_attr(). (AIA)
+ * been loaded into memory, then initialize @mrec to point to it, @attr to
+ * point to the first attribute within @mrec, and set @is_first to TRUE.
*
- * FIXME: alist_val* stuff is subject to change. A bit of redundancy at the
- * moment. (AIA)
+ * @is_first is only honoured when @mrec is not NULL. Then, if @is_first is
+ * TRUE, the search begins with @attr. If @is_first is FALSE, the search begins
+ * after @attr. This is so that, after the first call to one of the search
+ * attribute functions, we can call the function again, without any
+ * modification of the search context, to automagically get the next matching
+ * attribute.
*/
typedef struct {
- __u8 *base;
MFT_RECORD *mrec;
ATTR_RECORD *attr;
-
- __u8 *alist_val_base;
- MFT_RECORD *alist_mrec;
- ATTR_RECORD *alist_attr;
- ATTR_LIST_ENTRY *alist_val;
- ATTR_LIST_ENTRY *alist_val_end;
- __u32 alist_val_len;
- IS_FIRST_BOOL is_first;
+ BOOL is_first;
} attr_search_context;
@@ -1806,14 +1774,4 @@
const __u8 *val, const __u32 val_len, attr_search_context *ctx);
-BOOL lookup_external_attr(const ntfs_volume *vol, const MFT_REFERENCE mref,
- const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
- const IGNORE_CASE_BOOL ic, const __s64 lowest_vcn, const __u8 *val,
- const __u32 val_len, attr_search_context *ctx);
-
-BOOL lookup_attr(const ntfs_volume *vol, const MFT_REFERENCE mref,
- const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
- const IGNORE_CASE_BOOL ic, const __s64 lowest_vcn, const __u8 *val,
- const __u32 val_len, attr_search_context *ctx);
-
/**
* get_attribute_value_length - return the length of the value of an attribute
@@ -1843,6 +1801,6 @@
* errno describes the error.
*/
-__s64 get_attribute_value(const ntfs_volume *vol, const ATTR_RECORD *a,
- __u8 *b);
+__s64 get_attribute_value(const ntfs_volume *vol, const MFT_RECORD *m,
+ const ATTR_RECORD *a, __u8 *b);
/**
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- mft.h 2001/03/31 15:25:19 1.10
+++ mft.h 2001/04/02 02:04:37 1.11
@@ -30,4 +30,11 @@
/*
+ * Clusters are signed 64-bit values on NTFS volumes. We define two types, LCN
+ * and VCN, to allow for type checking and better code readability.
+ */
+typedef __s64 VCN;
+typedef __s64 LCN;
+
+/*
* System files mft record numbers. All these files are always marked as used
* in the bitmap attribute of the mft; presumably in order to avoid accidental
@@ -130,9 +137,10 @@
__u16 sequence_number; /* 16-bit sequence number. */
} __attribute__ ((__packed__));
- __u64 mft_reference; /* Mft reference as one value.*/
+ __u64 full_ref; /* Mft reference as one value.*/
} __attribute__ ((__packed__)) MFT_REFERENCE;
typedef enum {
- MFT_REFERENCE_MASK = 0x0000ffffffffffffULL,
+ MFT_REFERENCE_MASK_CPU = 0x0000ffffffffffffULL,
+ MFT_REFERENCE_MASK_LE = cpu_to_le64(0x0000ffffffffffffULL),
} MFT_REFERENCE_CONSTS;
Index: support.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/support.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- support.h 2001/03/26 03:42:13 1.1
+++ support.h 2001/04/02 02:04:37 1.2
@@ -23,4 +23,6 @@
#define SUPPORT_H
+#include <stddef.h>
+
/*
* These are just to make the code more readable...
@@ -34,4 +36,22 @@
ONE = 1,
} BOOL;
+
+/*
+ * Generic macro to convert pointers to values for comparison purposes.
+ */
+#ifndef p2n
+#define p2n(p) ((ptrdiff_t)((ptrdiff_t*)(p)))
+#endif
+
+/*
+ * The classical min and max macros.
+ */
+#ifndef min
+#define min(a,b) ((a) <= (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a,b) ((a) >= (b) ? (a) : (b))
+#endif
#endif /* defined SUPPORT_H */
Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/unistr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- unistr.h 2001/03/31 15:25:19 1.2
+++ unistr.h 2001/04/02 02:04:37 1.3
@@ -30,25 +30,9 @@
/* #include <linux/nls.h> */
#include <stdio.h>
-#include <wchar.h>
#include "endians.h"
+#include "support.h"
-/*
- * This is used by the name collation functions to quickly determine what
- * characters are (in)valid.
- */
-const __u8 legal_ansi_char_array[0x40] = {
- 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-
- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-
- 0x17, 0x07, 0x18, 0x17, 0x17, 0x17, 0x17, 0x17,
- 0x17, 0x17, 0x18, 0x16, 0x16, 0x17, 0x07, 0x00,
-
- 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17,
- 0x17, 0x17, 0x04, 0x16, 0x18, 0x16, 0x18, 0x18,
-};
+extern const __u8 legal_ansi_char_array[0x40];
/*
@@ -66,6 +50,6 @@
int ntfs_collate_names(const wchar_t *upcase, const __u32 upcase_len,
- wchar_t *name1, const int name1_len,
- wchar_t *name2, const int name2_len,
+ const wchar_t *name1, const __u32 name1_len,
+ const wchar_t *name2, const __u32 name2_len,
const IGNORE_CASE_BOOL ic, const int err_val);
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- volume.h 2001/03/06 02:10:55 1.4
+++ volume.h 2001/04/02 02:04:37 1.5
@@ -23,4 +23,6 @@
#define VOLUME_H
+#include <stdio.h>
+
#include "attrib.h"
@@ -84,5 +86,5 @@
__s64 number_of_mft_records; /* Number of records in the mft, equals
the number of bits in mft_bitmap. */
- __u16 *upcase; /* Upper case equivalents of all 65536
+ wchar_t *upcase; /* Upper case equivalents of all 65536
2-byte Unicode characters. Obtained
from FILE_$UpCase. */
@@ -99,5 +101,5 @@
/**
- * ntfs_open - open ntfs volume
+ * ntfs_mount - open ntfs volume
* @name: name of device/file to open
*
@@ -111,5 +113,5 @@
* setting up the structure.
*
- * ntfs_open() returns a pointer to the allocated ntfs_volume structure.
+ * ntfs_mount() returns a pointer to the allocated ntfs_volume structure.
* On error, the return value is NULL and errno is set appropriately.
*
@@ -120,8 +122,8 @@
* means.
*/
-ntfs_volume *ntfs_open(const char *name);
+ntfs_volume *ntfs_mount(const char *name);
/**
- * ntfs_close - close ntfs volume
+ * ntfs_umount - close ntfs volume
* @vol: address of ntfs_volume structure of volume to close
* @force: if true force close the volume even if it is busy
@@ -139,5 +141,5 @@
* returns 1.
*
- * @vol must have previously been returned by a call to ntfs_open().
+ * @vol must have previously been returned by a call to ntfs_mount().
*
* @vol itself is deallocated and should no longer be referenced after this
@@ -148,5 +150,5 @@
* means.
*/
-int ntfs_close(ntfs_volume *vol, const int force);
+int ntfs_umount(ntfs_volume *vol, const int force);
#endif /* defined VOLUME_H */
|
|
From: Anton A. <an...@us...> - 2001-03-31 15:27:38
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv31323
Modified Files:
unistr.c volume.c
Log Message:
Added new name comparison function.
Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/unistr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- unistr.c 2001/03/07 01:17:33 1.1
+++ unistr.c 2001/03/31 15:27:34 1.2
@@ -23,4 +23,31 @@
/**
+ * ntfs_are_names_equal - compare two Unicode names for equality
+ * @s1: name to compare to @s2
+ * @s1_len: length in Unicode characters of @s1
+ * @s2: name to compare to @s1
+ * @s2_len: length in Unicode characters of @s2
+ * @ic: ignore case bool
+ * @upcase: upcase table (only if @ic == IGNORE_CASE)
+ * @upcase_size: length in Unicode characters of @upcase (if present)
+ *
+ * Compare the names @s1 and @s2 and return TRUE (1) if the names are
+ * identical, or FALSE (0) if they are not identical. If @ic is IGNORE_CASE,
+ * the @upcase table is used to performa a case insensitive comparison.
+ */
+BOOL ntfs_are_names_equal(const wchar_t *s1, size_t s1_len,
+ const wchar_t *s2, size_t s2_len,
+ const IGNORE_CASE_BOOL ic,
+ const wchar_t *upcase, const __u32 upcase_size)
+{
+ if (s1_len != s2_len)
+ return FALSE;
+ if (ic == CASE_SENSITIVE)
+ return memcmp(s1, s2, s1_len << 1) ? FALSE: TRUE;
+ return ntfs_wcsncasecmp(s1, s2, s1_len, upcase, upcase_size) ? FALSE:
+ TRUE;
+}
+
+/**
* ntfs_collate_names - collate two Unicode names
* @upcase: upcase table (ignored if @ic is CASE_SENSITIVE)
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- volume.c 2001/03/06 02:10:55 1.6
+++ volume.c 2001/03/31 15:27:34 1.7
@@ -49,4 +49,5 @@
__u8 sectors_per_cluster, bits;
__s8 c;
+ attr_search_context ctx;
if (!name) {
@@ -222,6 +223,16 @@
}
/* Find the bitmap attribute. */
- a = find_first_attribute(vol, mb, $BITMAP, NULL);
- if (!a) {
+ memset(ctx, 0, sizeof(attr_search_context));
+ ctx.mrec = mb;
+ ctx.attr = (ATTR_RECORD*)((char*)mb + le16_to_cpu(mb->attrs_offset));
+ if (ctx.attr < mb || ctx.attr > (char*)mb + vol->mft_record_size) {
+ puts(FAILED);
+ fprintf(stderr, "Error: corrupt mft record for $Mft.\n"
+ "Cannot handle this yet. )-:\n");
+ errno = EIO;
+ goto error_exit;
+ }
+ ctx.is_first = TRUE;
+ if (!lookup_attr(vol, 0, $BITMAP, NULL, 0, 0, 0, 0, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "$bitmap attribute not found in $Mft?!?\n");
@@ -229,5 +240,6 @@
goto error_exit;
}
- /* Get attribute value size and allocate a big enough buffer.*/
+ a = ctx.attr;
+ /* Get attribute value size and allocate a big enough buffer. */
l = get_attribute_value_length(a);
if (!l) {
@@ -252,7 +264,12 @@
goto error_exit;
}
+ //if (ctx.alist_val)
+ // free(ctx.alist_val);
/* Find the $DATA attribute in $Mft. */
- a = find_first_attribute(vol, mb, $DATA, NULL);
- if (!a) {
+ memset(ctx, 0, sizeof(attr_search_context));
+ ctx.mrec = mb;
+ ctx.attr = (ATTR_RECORD*)((char*)mb + le16_to_cpu(mb->attrs_offset));
+ ctx.is_first = TRUE;
+ if (!lookup_attr(vol, 0, $DATA, NULL, 0, 0, 0, 0, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "$DATA attribute not found in $Mft?!?\n");
|
|
From: Anton A. <an...@us...> - 2001-03-31 15:25:25
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv30976
Modified Files:
attrib.h mft.h unistr.h
Log Message:
Added a name comparison function.
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- attrib.h 2001/03/26 14:50:58 1.18
+++ attrib.h 2001/03/31 15:25:19 1.19
@@ -1751,7 +1751,7 @@
* @mrec: buffer containing mft record to search
* @attr: attribute record in @mrec where to begin/continue search
- * @base_mrec: base mft record
- * @alist_attr: attribute list attribute record (in @base_mrec, not @mrec)
- * @alist_val: attribute list value (if alist is resident in @base_mrec)
+ * @alist_mrec: mft record containing attribute list (i.e. base mft record)
+ * @alist_attr: attribute list attribute record
+ * @alist_val: attribute list value (if alist is resident in @alist_mrec)
* @alist_val_end: end of attribute list value + 1
* @alist_val_len: length of attribute list in bytes
@@ -1760,6 +1760,7 @@
* Structure must be initialized to zero before the first call to one of the
* attribute search functions. If the mft record in which to search has already
- * been loaded into memory, then initialize @mrec to point to it, @attr to point
- * to the first attribute within @mrec, and set @is_first to TRUE.
+ * been loaded into memory, then initialize @base and @mrec to point to it,
+ * @attr to point to the first attribute within @mrec, and set @is_first to
+ * TRUE.
*
* @is_first is only honoured in lookup_attr() and only when called with @mrec
@@ -1779,7 +1780,10 @@
*/
typedef struct {
+ __u8 *base;
MFT_RECORD *mrec;
ATTR_RECORD *attr;
- MFT_RECORD *base_mrec;
+
+ __u8 *alist_val_base;
+ MFT_RECORD *alist_mrec;
ATTR_RECORD *alist_attr;
ATTR_LIST_ENTRY *alist_val;
@@ -1802,10 +1806,10 @@
const __u8 *val, const __u32 val_len, attr_search_context *ctx);
-BOOL lookup_external_attr(const ntfs_volume *vol, const ATTR_TYPES type,
- const wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic,
- const __s64 lowest_vcn, const __u8 *val, const __u32 val_len,
- attr_search_context *ctx);
+BOOL lookup_external_attr(const ntfs_volume *vol, const MFT_REFERENCE mref,
+ const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
+ const IGNORE_CASE_BOOL ic, const __s64 lowest_vcn, const __u8 *val,
+ const __u32 val_len, attr_search_context *ctx);
-BOOL lookup_attr(const ntfs_volume *vol, const MFT_REFERENCE *mref,
+BOOL lookup_attr(const ntfs_volume *vol, const MFT_REFERENCE mref,
const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
const IGNORE_CASE_BOOL ic, const __s64 lowest_vcn, const __u8 *val,
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- mft.h 2001/03/15 23:13:11 1.9
+++ mft.h 2001/03/31 15:25:19 1.10
@@ -133,4 +133,8 @@
} __attribute__ ((__packed__)) MFT_REFERENCE;
+typedef enum {
+ MFT_REFERENCE_MASK = 0x0000ffffffffffffULL,
+} MFT_REFERENCE_CONSTS;
+
/*
* The mft record header present at the beginning of every record in the mft.
Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/unistr.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- unistr.h 2001/03/07 01:17:33 1.1
+++ unistr.h 2001/03/31 15:25:19 1.2
@@ -60,4 +60,9 @@
} IGNORE_CASE_BOOL;
+BOOL ntfs_are_names_equal(const wchar_t *s1, size_t s1_len,
+ const wchar_t *s2, size_t s2_len,
+ const IGNORE_CASE_BOOL ic,
+ const wchar_t *upcase, const __u32 upcase_size);
+
int ntfs_collate_names(const wchar_t *upcase, const __u32 upcase_len,
wchar_t *name1, const int name1_len,
|
|
From: Anton A. <an...@us...> - 2001-03-26 14:51:02
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv32539 Modified Files: attrib.h Log Message: Fix a few typos. Index: attrib.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** attrib.h 2001/03/26 03:35:35 1.17 --- attrib.h 2001/03/26 14:50:58 1.18 *************** *** 1796,1800 **** const ATTR_TYPES type, const wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len, ! attr_search_context ctx); BOOL find_attr(const ntfs_volume *vol, const ATTR_TYPES type, --- 1796,1800 ---- const ATTR_TYPES type, const wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len, ! attr_search_context *ctx); BOOL find_attr(const ntfs_volume *vol, const ATTR_TYPES type, *************** *** 1807,1811 **** attr_search_context *ctx); ! BOOL lookup_attr(const ntfs_volume *vol, const MFT_REFERENCE mref, const ATTR_TYPES type, const wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic, const __s64 lowest_vcn, const __u8 *val, --- 1807,1811 ---- attr_search_context *ctx); ! BOOL lookup_attr(const ntfs_volume *vol, const MFT_REFERENCE *mref, const ATTR_TYPES type, const wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic, const __s64 lowest_vcn, const __u8 *val, |
|
From: Anton A. <an...@us...> - 2001-03-26 04:34:24
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv8377
Modified Files:
disk_io.c
Log Message:
typo fix
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** disk_io.c 2001/03/26 04:28:07 1.5
--- disk_io.c 2001/03/26 04:34:20 1.6
***************
*** 411,415 ****
}
! int put_mft_record(ntfs_volume *vol, const __u8 *buf, const MFT_REFERENC *mref)
{
__u64 bw, m;
--- 411,415 ----
}
! int put_mft_record(ntfs_volume *vol, const __u8 *buf, const MFT_REFERENCE *mref)
{
__u64 bw, m;
|
|
From: Anton A. <an...@us...> - 2001-03-26 04:30:31
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv7942 Modified Files: disk_io.h Log Message: Cleanup and fixes. Index: disk_io.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** disk_io.h 2001/01/26 00:34:35 1.4 --- disk_io.h 2001/03/26 04:30:27 1.5 *************** *** 147,180 **** int put_clusters(ntfs_volume *vol, const __u8 *buf, const __s64 lcn, int count); ! /** ! * get_mft_records - read records from the mft ! * @vol: volume to read from ! * @buf: output data buffer ! * @mftrec: starting mft record number ! * @count: number of mft records to read ! * ! * Read @count mft records starting at @mftrec from volume @vol into buffer ! * @buf. Return @count on success or -ERRNO on error, where ERRNO is the error ! * code. This function will do the error reporting so caller really only needs ! * to check for sucess / failure. ! * ! * NOTE: @buf has to be at least of size @count * vol->MftRecordSize. ! */ ! int get_mft_records(const ntfs_volume *vol, __u8 *buf, const __s64 mftrec, ! const int count); /** * put_mft_record - write a record to the mft * @vol: volume to write to * @buf: data buffer containing the mft record to write ! * @mftrec: mft record number to write to * ! * Write mft record @mftrec from buffer @buf to volume @vol. Return 1 on * success or -ERRNO on error, where ERRNO is the error code. This function * will do the error reporting so caller really only needs to check for sucess * / failure. */ ! int put_mft_record(ntfs_volume *vol, const __u8 *buf, const __s64 mftrec); ! #endif /* defined DISK_IO_H */ --- 147,172 ---- int put_clusters(ntfs_volume *vol, const __u8 *buf, const __s64 lcn, int count); ! int get_mft_records(const ntfs_volume *vol, __u8 *buf, ! const MFT_REFERENCE *mref, const int count); + extern __inline__ int get_mft_record(const ntfs_volume *vol, __u8 *buf, + const MFT_REFERENCE *mref); + + int read_file_record(const ntfs_volume *vol, const MFT_REFERENCE *mref, + MFT_RECORD **mrec, ATTR_RECORD **attr); + /** * put_mft_record - write a record to the mft * @vol: volume to write to * @buf: data buffer containing the mft record to write ! * @mref: mft record number to write to * ! * Write mft record @mref from buffer @buf to volume @vol. Return 1 on * success or -ERRNO on error, where ERRNO is the error code. This function * will do the error reporting so caller really only needs to check for sucess * / failure. */ ! int put_mft_record(ntfs_volume *vol, const __u8 *buf, ! const MFT_REFERENCE *mref); #endif /* defined DISK_IO_H */ |
|
From: Anton A. <an...@us...> - 2001-03-26 04:28:12
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv7617
Modified Files:
disk_io.c
Log Message:
Cleanup and fixes.
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** disk_io.c 2001/03/26 03:39:59 1.4
--- disk_io.c 2001/03/26 04:28:07 1.5
***************
*** 263,325 ****
}
! /*
! * Return 0 on success, <0 on error (return value is the error code).
! * Caller has to free(*mrec) when finished.
*/
! int read_file_record(const ntfs_volume *vol, const MFT_REFERENCE mref,
! MFT_RECORD **mrec, ATTR_RECORD **attr)
{
! int er = 0;
!
! if (!vol || !mrec || !attr) {
! #ifdef DEBUG
! fprintf(stderr, "read_file_record() received NULL pointer!\n");
! #endif
! return -EINVAL;
! }
! if (!(*mrec = malloc(vol->mft_record_size)))
! return -ENOMEM;
! if ((er = get_mft_record(vol, *mrec, mref)) != 1)
! goto failed;
! if (!is_file_record(*mrec->magic))
! goto file_corrupt;
! if (mref.sequence_number != le16_to_cpu(*mrec->sequence_number))
! goto file_corrupt;
! if (!(*mrec->flags & MFT_RECORD_IN_USE))
! goto file_corrupt;
! *attr = (ATTR_RECORD*)((char*)*mrec + le16_to_cpu(*mrec->attrs_offset));
! if (*attr < *mrec || *attr > (char*)*mrec + vol->mft_record_size)
! goto file_corrupt;
! return 0;
! file_corrupt:
! #ifdef DEBUG
! fprintf(stderr, "read_file_record(): file is corrupt.\n");
! #endif
! er = -EIO;
! failed:
! free(*mrec);
! *mrec = *attr = NULL;
! return er < 0 ? er : -EINVAL;
! }
!
! __inline__ int get_mft_record(const ntfs_volume *vol, __u8 *buf,
! const __s64 mft_ref)
! {
! return get_mft_records(vol, buf, mft_ref, 1);
! }
!
! int get_mft_records(const ntfs_volume *vol, __u8 *buf, const __s64 mft_ref,
! const int count)
! {
! __u64 br;
__s64 lcn, ofs;
! if (!vol || !buf || mftref < 0)
return -EINVAL;
if (!vol->fd)
return -EBADF;
! if (vol->number_of_mft_records < mft_ref + count)
return -ESPIPE;
! if (!get_bit(vol->mft_bitmap, mft_ref))
return -ENOENT;
/* Size of mft record != size of cluster thus need to work with
--- 263,294 ----
}
! /**
! * get_mft_records - read records from the mft
! * @vol: volume to read from
! * @buf: output data buffer
! * @mref: starting mft record number
! * @count: number of mft records to read
! *
! * Read @count mft records starting at @mref from volume @vol into buffer
! * @buf. Return @count on success or -ERRNO on error, where ERRNO is the error
! * code. This function will do the error reporting so caller really only needs
! * to check for sucess / failure.
! *
! * NOTE: @buf has to be at least of size @count * vol->mft_record_size.
*/
! int get_mft_records(const ntfs_volume *vol, __u8 *buf,
! const MFT_REFERENCE *mref, const int count)
{
! __u64 br, m;
__s64 lcn, ofs;
! if (!vol || !buf)
return -EINVAL;
if (!vol->fd)
return -EBADF;
! m = mref->mft_reference & MFT_REFERENCE_MASK;
! if (vol->number_of_mft_records < m + count)
return -ESPIPE;
! if (!get_bit(vol->mft_bitmap, m))
return -ENOENT;
/* Size of mft record != size of cluster thus need to work with
***************
*** 327,338 ****
if (vol->mft_records_per_cluster) {
lcn = vcn_to_lcn(vol->mft_runlist,
! mft_ref / vol->mft_records_per_cluster);
/* FIXME: Change "/" above and "%" below to ">>" and "&"
respectively! */
! ofs = mft_ref % vol->mft_records_per_cluster;
ofs <<= vol->mft_record_size_bits;
} else {
lcn = vcn_to_lcn(vol->mft_runlist,
! mft_ref * vol->clusters_per_mft_record);
/* FIXME: Change "*" above to "<<"! */
ofs = 0;
--- 296,307 ----
if (vol->mft_records_per_cluster) {
lcn = vcn_to_lcn(vol->mft_runlist,
! m / vol->mft_records_per_cluster);
/* FIXME: Change "/" above and "%" below to ">>" and "&"
respectively! */
! ofs = m % vol->mft_records_per_cluster;
ofs <<= vol->mft_record_size_bits;
} else {
lcn = vcn_to_lcn(vol->mft_runlist,
! m * vol->clusters_per_mft_record);
/* FIXME: Change "*" above to "<<"! */
ofs = 0;
***************
*** 361,377 ****
return br;
}
! int put_mft_record(ntfs_volume *vol, const __u8 *buf, const __s64 mftrec)
{
! __u64 bw;
__s64 lcn, ofs;
! if (!vol || !buf || mftrec < 0)
return -EINVAL;
if (!vol->fd)
return -EBADF;
! if (vol->number_of_mft_records <= mftrec)
return -ESPIPE;
! if (!get_bit(vol->mft_bitmap, mftrec))
return -ENOENT;
/* Size of mft record != size of cluster thus need to work with offsets
--- 330,427 ----
return br;
}
+
+ /**
+ * get_mft_record - read a record from the mft
+ * @vol: volume to read from
+ * @buf: output data buffer
+ * @mref: starting mft record number
+ * @count: number of mft records to read
+ *
+ * Read mft record specified by @mref from volume @vol into buffer @buf.
+ * Return 1 on success or -ERRNO on error, where ERRNO is the error
+ * code. This function will do the error reporting so caller really only needs
+ * to check for sucess / failure.
+ *
+ * NOTE: @buf has to be at least of size vol->mft_record_size.
+ */
+ __inline__ int get_mft_record(const ntfs_volume *vol, __u8 *buf,
+ const MFT_REFERENCE *mref)
+ {
+ return get_mft_records(vol, buf, mref, 1);
+ }
+
+ /**
+ * read_file_record - read a FILE record from the mft
+ * @vol: volume to read from
+ * @mref: mft reference specifying mft record to read
+ * @mrec: address of pointer in which to return the mft record
+ * @attr: address of pointer in which to return the first attribute
+ *
+ * Read a FILE record from the mft of @vol. @mref specifies the mft record
+ * to read, including the sequence number. When the function returns, @mrec and
+ * @attr will contain pointers to the read mft record and to the first attribute
+ * within the mft record, respectively.
+ *
+ * The read mft record is checked for having the magic FILE, for being in use,
+ * and for having a matching sequence number (if @mref->sequence_number != 0).
+ * If either of these fails, return -EIO.
+ *
+ * Return 0 on success, or -ERRNO on error, where ERRNO is the error code.
+ *
+ * Note: Caller has to free *@mrec when finished.
+ */
+ int read_file_record(const ntfs_volume *vol, const MFT_REFERENCE *mref,
+ MFT_RECORD **mrec, ATTR_RECORD **attr)
+ {
+ MFT_RECORD *m;
+ int er = 0;
+
+ if (!vol || !mrec || !attr) {
+ #ifdef DEBUG
+ fprintf(stderr, "read_file_record() received NULL pointer!\n");
+ #endif
+ return -EINVAL;
+ }
+ if (!(m = malloc(vol->mft_record_size)))
+ return -ENOMEM;
+ if ((er = get_mft_record(vol, m, mref)) != 1)
+ goto failed;
+ if (!is_file_record(m->magic))
+ goto file_corrupt;
+ if (mref->sequence_number &&
+ mref->sequence_number != le16_to_cpu(m->sequence_number))
+ goto file_corrupt;
+ if (!(m->flags & MFT_RECORD_IN_USE))
+ goto file_corrupt;
+ *attr = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset));
+ if (*attr < m || *attr > (char*)m + vol->mft_record_size)
+ goto file_corrupt;
+ *mrec = m;
+ return 0;
+ file_corrupt_attr:
+ *attr = NULL;
+ file_corrupt:
+ #ifdef DEBUG
+ fprintf(stderr, "read_file_record(): file is corrupt.\n");
+ #endif
+ er = -EIO;
+ failed:
+ free(m);
+ return er < 0 ? er : -EINVAL;
+ }
! int put_mft_record(ntfs_volume *vol, const __u8 *buf, const MFT_REFERENC *mref)
{
! __u64 bw, m;
__s64 lcn, ofs;
! if (!vol || !buf)
return -EINVAL;
if (!vol->fd)
return -EBADF;
! m = mref->mft_reference & MFT_REFERENCE_MASK;
! if (vol->number_of_mft_records <= m)
return -ESPIPE;
! if (!get_bit(vol->mft_bitmap, m))
return -ENOENT;
/* Size of mft record != size of cluster thus need to work with offsets
***************
*** 379,390 ****
if (vol->mft_records_per_cluster) {
lcn = vcn_to_lcn(vol->mft_runlist,
! mftrec / vol->mft_records_per_cluster);
/* FIXME: Change "/" above and "%" below to ">>" and "&"
respectively! */
! ofs = mftrec % vol->mft_records_per_cluster;
ofs <<= vol->mft_record_size_bits;
} else {
lcn = vcn_to_lcn(vol->mft_runlist,
! mftrec * vol->clusters_per_mft_record);
/* FIXME: Change "*" above to "<<"! */
ofs = 0;
--- 429,440 ----
if (vol->mft_records_per_cluster) {
lcn = vcn_to_lcn(vol->mft_runlist,
! m / vol->mft_records_per_cluster);
/* FIXME: Change "/" above and "%" below to ">>" and "&"
respectively! */
! ofs = m % vol->mft_records_per_cluster;
ofs <<= vol->mft_record_size_bits;
} else {
lcn = vcn_to_lcn(vol->mft_runlist,
! m * vol->clusters_per_mft_record);
/* FIXME: Change "*" above to "<<"! */
ofs = 0;
|
|
From: Anton A. <an...@us...> - 2001-03-26 03:46:59
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv2799
Modified Files:
Makefile.am
Log Message:
Makefile fix.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am 2001/02/03 02:03:36 1.3
--- Makefile.am 2001/03/26 03:46:56 1.4
***************
*** 19,23 ****
volume.c \
disk_io.c \
! ntfs_rec.c
INCLUDES = $(linux_ntfsincludedir) $(all_includes)
--- 19,24 ----
volume.c \
disk_io.c \
! ntfs_rec.c \
! unistr.c
INCLUDES = $(linux_ntfsincludedir) $(all_includes)
|
|
From: Anton A. <an...@us...> - 2001-03-26 03:42:16
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv2426
Modified Files:
Makefile.am
Added Files:
support.h
Log Message:
Forgot to add the new support.h
--- NEW FILE ---
/*
* support.h - Useful definitions and macros. 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 SUPPORT_H
#define SUPPORT_H
/*
* These are just to make the code more readable...
*/
typedef enum {
FALSE = 0,
NO = 0,
ZERO = 0,
TRUE = 1,
YES = 1,
ONE = 1,
} BOOL;
#endif /* defined SUPPORT_H */
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 2001/02/03 02:03:35 1.2
--- Makefile.am 2001/03/26 03:42:13 1.3
***************
*** 10,13 ****
mft.h \
ntfs_rec.h \
! volume.h
--- 10,15 ----
mft.h \
ntfs_rec.h \
! volume.h \
! unistr.h \
! support.h
|
|
From: Anton A. <an...@us...> - 2001-03-26 03:40:03
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv2185/libntfs
Modified Files:
disk_io.c
Log Message:
Updates
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** disk_io.c 2001/03/05 03:04:40 1.3
--- disk_io.c 2001/03/26 03:39:59 1.4
***************
*** 263,267 ****
}
! int get_mft_records(const ntfs_volume *vol, __u8 *buf, const __s64 mftrec,
const int count)
{
--- 263,313 ----
}
! /*
! * Return 0 on success, <0 on error (return value is the error code).
! * Caller has to free(*mrec) when finished.
! */
! int read_file_record(const ntfs_volume *vol, const MFT_REFERENCE mref,
! MFT_RECORD **mrec, ATTR_RECORD **attr)
! {
! int er = 0;
!
! if (!vol || !mrec || !attr) {
! #ifdef DEBUG
! fprintf(stderr, "read_file_record() received NULL pointer!\n");
! #endif
! return -EINVAL;
! }
! if (!(*mrec = malloc(vol->mft_record_size)))
! return -ENOMEM;
! if ((er = get_mft_record(vol, *mrec, mref)) != 1)
! goto failed;
! if (!is_file_record(*mrec->magic))
! goto file_corrupt;
! if (mref.sequence_number != le16_to_cpu(*mrec->sequence_number))
! goto file_corrupt;
! if (!(*mrec->flags & MFT_RECORD_IN_USE))
! goto file_corrupt;
! *attr = (ATTR_RECORD*)((char*)*mrec + le16_to_cpu(*mrec->attrs_offset));
! if (*attr < *mrec || *attr > (char*)*mrec + vol->mft_record_size)
! goto file_corrupt;
! return 0;
! file_corrupt:
! #ifdef DEBUG
! fprintf(stderr, "read_file_record(): file is corrupt.\n");
! #endif
! er = -EIO;
! failed:
! free(*mrec);
! *mrec = *attr = NULL;
! return er < 0 ? er : -EINVAL;
! }
!
! __inline__ int get_mft_record(const ntfs_volume *vol, __u8 *buf,
! const __s64 mft_ref)
! {
! return get_mft_records(vol, buf, mft_ref, 1);
! }
!
! int get_mft_records(const ntfs_volume *vol, __u8 *buf, const __s64 mft_ref,
const int count)
{
***************
*** 269,279 ****
__s64 lcn, ofs;
! if (!vol || !buf || mftrec < 0)
return -EINVAL;
if (!vol->fd)
return -EBADF;
! if (vol->number_of_mft_records < mftrec + count)
return -ESPIPE;
! if (!get_bit(vol->mft_bitmap, mftrec))
return -ENOENT;
/* Size of mft record != size of cluster thus need to work with
--- 315,325 ----
__s64 lcn, ofs;
! if (!vol || !buf || mftref < 0)
return -EINVAL;
if (!vol->fd)
return -EBADF;
! if (vol->number_of_mft_records < mft_ref + count)
return -ESPIPE;
! if (!get_bit(vol->mft_bitmap, mft_ref))
return -ENOENT;
/* Size of mft record != size of cluster thus need to work with
***************
*** 281,292 ****
if (vol->mft_records_per_cluster) {
lcn = vcn_to_lcn(vol->mft_runlist,
! mftrec / vol->mft_records_per_cluster);
/* FIXME: Change "/" above and "%" below to ">>" and "&"
respectively! */
! ofs = mftrec % vol->mft_records_per_cluster;
ofs <<= vol->mft_record_size_bits;
} else {
lcn = vcn_to_lcn(vol->mft_runlist,
! mftrec * vol->clusters_per_mft_record);
/* FIXME: Change "*" above to "<<"! */
ofs = 0;
--- 327,338 ----
if (vol->mft_records_per_cluster) {
lcn = vcn_to_lcn(vol->mft_runlist,
! mft_ref / vol->mft_records_per_cluster);
/* FIXME: Change "/" above and "%" below to ">>" and "&"
respectively! */
! ofs = mft_ref % vol->mft_records_per_cluster;
ofs <<= vol->mft_record_size_bits;
} else {
lcn = vcn_to_lcn(vol->mft_runlist,
! mft_ref * vol->clusters_per_mft_record);
/* FIXME: Change "*" above to "<<"! */
ofs = 0;
|
|
From: Anton A. <an...@us...> - 2001-03-26 03:40:03
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/doc In directory usw-pr-cvs1:/tmp/cvs-serv2185/doc Modified Files: attributes.txt Log Message: Updates Index: attributes.txt =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/attributes.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** attributes.txt 2001/03/07 15:53:20 1.2 --- attributes.txt 2001/03/26 03:39:59 1.3 *************** *** 56,59 **** --- 56,62 ---- Naturally, all extension mft records point back to their base mft record. + Only one attribute is stored in an extension mft record, even if the attribute + is very small. At least this is the case with Windows NT4 SP6a driver. + Should the mapping pairs array of an attribute become so large as to not fit into an extenstion mft record, even though it's attribute is the only attribute |
|
From: Anton A. <an...@us...> - 2001-03-26 03:40:03
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv2185 Modified Files: TODO.include Log Message: Updates Index: TODO.include =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/TODO.include,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TODO.include 2001/01/30 12:29:03 1.2 --- TODO.include 2001/03/26 03:39:59 1.3 *************** *** 1,2 **** ! Finish attrib.h --- 1,4 ---- ! Finish attrib.h: in particular, add: ! ! - more about EFS and the EFS attribute. |
|
From: Anton A. <an...@us...> - 2001-03-26 03:35:41
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv1700
Modified Files:
attrib.h
Log Message:
New attribute searching API header part complete.
This shouldn't change any more, except for the search context structure,
which might be simplified at some point.
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** attrib.h 2001/03/22 13:16:32 1.16
--- attrib.h 2001/03/26 03:35:35 1.17
***************
*** 104,108 ****
* 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
--- 104,108 ----
* 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
***************
*** 1747,1887 ****
} FIND_ATTR_CTX_FLAGS;
- /*
- * FIXME: The below descriptions are no longer accurate as I am rewriting the
- * functions completely. (AIA)
- */
-
/**
! * find_first_attr_in_attr_list - find attribute (type, name) in attribute list
! * @v: ntfs volume the mft record @m is from
! * @m: mft record the attribute list @al is from
! * @al: the attribute list to search
! * @t: find attribute of this type
! * @n: find attribute of this name
! *
! * Get the location of the desired attribute of type @t and name @n (@n can be
! * NULL for unnamed attributes; note that @n is a Unicode string). Return a
! * pointer to the attribute or NULL if the attribute is not present or an
! * error situation exists.
! *
! * There can be several attributes which have the same type and name. Hence,
! * call find_next_attr_in_attr_list() to obtain the next attribute passing in
! * the return value from find_first_attr_in_attr_list() as the fourth parameter
! * 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,
! const ATTR_RECORD *al,
! const ATTR_TYPES t,
! const wchar_t *n);
!
! /**
! * find_next_attr_in_attr_list - find attribute (type, name) in attribute list
! * @v: ntfs volume the mft record @m is from
! * @m: mft record the attribute list @al is from
! * @al: the attribute list to search
! * @t: find attribute of this type
! * @n: find attribute of this name
! * @ctx: search context
! *
! * Get the location of the desired attribute of type @t and name @n (@n can be
! * NULL for unnamed attributes; note that @n is a Unicode string). Return a
! * pointer to the attribute or NULL if the attribute is not present or an
! * error situation exists.
! *
! * @ctx is the search context. When @ctx is NULL the first attribute with
! * matching type and name will be returned. When @ctx is not NULL it is a
! * pointer to the attribute returned either by find_first_attr_in_attr_list()
! * or by a previous call to find_next_attr_in_attr_list(). In this way a loop
! * can be made in which the result of find_next_attr_in_attr_list() is used as
! * the parameter @ctx in a subsequent call to find_next_attr_in_attr_list(),
! * until find_next_attr_in_attr_list() returns NULL, which is in fact an
! * iteration over all attributes in the attribute list @al matching the type
! * @t and name @n.
! *
! * Also, note that you do not need to call find_first_attr_in_attr_list() at
! * all. Instead, you can just call find_next_attr_in_attr_list() with
! * @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,
! const ATTR_RECORD *al,
! const ATTR_TYPES t,
! const wchar_t *n,
! const ATTR_RECORD *ctx);
!
! /**
! * find_first_attr - find first attribute of a type and name in mft record
! * @v: ntfs volume the mft record @b is from
! * @b: pointer to a buffer containing the mft record to search
! * @t: find attribute of this type
! * @n: find attribute of this name
! * @ctx: optional search context for future calls to find_next_attr()
! *
! * Get the location of the desired attribute of type @t and name @n (@n can be
! * NULL for unnamed attributes; note that @n is a Unicode string). Return a
! * pointer to the attribute or NULL if the attribute is not present or an
! * error situation exists. @ctx is optional and if NULL it will be ignored.
! * When @ctx is not NULL, it is a pointer to an integer, holding the search
! * context. In fact, it will contain the attribute instance number of the found
! * attribute (need to use INSTANCE_MASK to get it). @ctx will be ORed with
! * IN_ATTR_LIST bit if the corresponding attribute is not in a base mft record,
! * i.e. it is only in the attribute list of the base mft record).
! *
! * There can be several attributes which have the same type and name. Hence,
! * call find_next_attr() to obtain the next attribute passing in the returned
! * @ctx value value from find_first_attr() as the fourth parameter to
! * find_next_attr().
! *
! * Note, if @t is zero the first attribute in the mft record @b will be
! * 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,
! const wchar_t *n,
! FIND_ATTR_CTX_FLAGS *ctx);
!
! /**
! * find_next_attr - find next attribute of a type and name in mft record
! * @v: ntfs volume the mft record @b is from
! * @b: pointer to a buffer containing the mft record to search
! * @t: find attribute of this type
! * @n: find attribute of this name
! * @ctx: search context
! *
! * Get the location of the desired attribute of type @t and name @n (@n can be
! * NULL for unnamed attributes; note that @n is a Unicode string). Return a
! * pointer to the attribute or NULL if the attribute is not present or an
! * error situation exists.
! *
! * @ctx is the search context. When *@ctx equls FIRST_SEARCH the first
! * attribute with matching type and name will be returned. When *@ctx is not
! * FIRST_SEARCH it contains the instance number of the attribute returned in
! * *@ctx either by find_first_attr() or by a previous call to find_next_attr().
! * (Need to use INSTANCE_MASK to get the instance number.) The bit IN_ATTR_LIST
! * is set if the corresponding attribute is not in the base mft record, i.e.
! * the instance number is only in the attribute list. In this way a, loop can
! * be made in which find_next_attr() is called recursively until it returns
! * NULL, and this effectively iterates over all attributes in the mft record @b
! * matching the type @t and name @n in order of their sequence numbers.
! *
! * Also, note that you do not need to call find_first_attr() at all. Instead,
! * you can just call find_next_attr() with *@ctx = FIRST_SEARCG. This is in
! * fact what find_first_attr() does.
! *
! * Note: Instance number is __u16 and hence using 32 bits we can use negative
! * numbers without clashing with any actual sequence numbers.
! *
! * Note, if @t is zero the first attribute in the mft record @b will be
! * returned, no matter what it is.
! */
! ATTR_RECORD *find_next_attr(const ntfs_volume *v,
! const MFT_RECORD *b,
! const ATTR_TYPES t,
! const wchar_t *n,
! FIND_ATTR_CTX_FLAGS *ctx);
/**
--- 1747,1814 ----
} FIND_ATTR_CTX_FLAGS;
/**
! * attr_search_context - used in attribute search functions
! * @mrec: buffer containing mft record to search
! * @attr: attribute record in @mrec where to begin/continue search
! * @base_mrec: base mft record
! * @alist_attr: attribute list attribute record (in @base_mrec, not @mrec)
! * @alist_val: attribute list value (if alist is resident in @base_mrec)
! * @alist_val_end: end of attribute list value + 1
! * @alist_val_len: length of attribute list in bytes
! * @is_first: if true lookup_attr() begins search with @attr, else after @attr
! *
! * Structure must be initialized to zero before the first call to one of the
! * attribute search functions. If the mft record in which to search has already
! * been loaded into memory, then initialize @mrec to point to it, @attr to point
! * to the first attribute within @mrec, and set @is_first to TRUE.
! *
! * @is_first is only honoured in lookup_attr() and only when called with @mrec
! * not NULL. Then, if @is_first is TRUE, lookup_attr() begins the search with
! * @attr. If @is_first is FALSE, lookup_attr() begins the search after @attr.
! * This is so that, after the first call to lookup_attr(), we can call
! * lookup_attr() again, without any modification of the search context, to
! * automagically get the next matching attribute.
! *
! * In contrast, find_attr() ignores @is_first and always begins the search with
! * @attr. find_attr() shouldn't really be called directly; it is just for
! * internal use. FIXME: Might want to change this behaviour later, but not
! * before I am finished with lookup_external_attr(). (AIA)
! *
! * FIXME: alist_val* stuff is subject to change. A bit of redundancy at the
! * moment. (AIA)
! */
! typedef struct {
! MFT_RECORD *mrec;
! ATTR_RECORD *attr;
! MFT_RECORD *base_mrec;
! ATTR_RECORD *alist_attr;
! ATTR_LIST_ENTRY *alist_val;
! ATTR_LIST_ENTRY *alist_val_end;
! __u32 alist_val_len;
! IS_FIRST_BOOL is_first;
! } attr_search_context;
!
! /*
! * See attrib.c for descriptions of the below functions.
! */
!
! extern __inline__ BOOL find_first_attr(const ntfs_volume *vol,
! const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
! const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len,
! attr_search_context ctx);
!
! BOOL find_attr(const ntfs_volume *vol, const ATTR_TYPES type,
! const wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic,
! const __u8 *val, const __u32 val_len, attr_search_context *ctx);
!
! BOOL lookup_external_attr(const ntfs_volume *vol, const ATTR_TYPES type,
! const wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic,
! const __s64 lowest_vcn, const __u8 *val, const __u32 val_len,
! attr_search_context *ctx);
!
! BOOL lookup_attr(const ntfs_volume *vol, const MFT_REFERENCE mref,
! const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
! const IGNORE_CASE_BOOL ic, const __s64 lowest_vcn, const __u8 *val,
! const __u32 val_len, attr_search_context *ctx);
/**
|
|
From: Anton A. <an...@us...> - 2001-03-22 13:16:40
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv1759
Modified Files:
attrib.h
Log Message:
Clarified the reparse point tag flags.
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** attrib.h 2001/03/15 23:12:45 1.15
--- attrib.h 2001/03/22 13:16:32 1.16
***************
*** 1561,1571 ****
* The reparse point tag defines the type of the reparse point. It also
* includes several flags, which further describe the reparse point.
! *
! * Most significant three bits mean:
! * tag owned by Microsoft
! * high latency on accessing file data
! * filename is an alias for another object
*/
typedef enum {
IO_REPARSE_TAG_RESERVED_ZERO = cpu_to_le32(0x00000000),
IO_REPARSE_TAG_RESERVED_ONE = cpu_to_le32(0x00000001),
--- 1561,1584 ----
* The reparse point tag defines the type of the reparse point. It also
* includes several flags, which further describe the reparse point.
! *
! * The reparse point tag is an unsigned 32-bit value divided in three parts:
! *
! * 1. The least significant 16 bits (i.e. bits 0 to 15) specifiy the type of
! * the reparse point.
! * 2. The 13 bits after this (i.e. bits 16 to 28) are reserved for future use.
! * 3. The most significant three bits are flags describing the reparse point.
! * They are defined as follows:
! * bit 29: Name surrogate bit. If set, the filename is an alias for
! * another object in the system.
! * bit 30: High-latecny bit. If set, accessing the first byte of data will
! * be slow. (E.g. the data is stored on a tape drive.)
! * bit 31: Microsoft bit. If set, the tag is owned by Microsoft. User
! * defined tags have to use zero here.
*/
typedef enum {
+ IO_REPARSE_TAG_IS_ALIAS = cpu_to_le32(0x20000000),
+ IO_REPARSE_TAG_IS_HIGH_LATENCY = cpu_to_le32(0x40000000),
+ IO_REPARSE_TAG_IS_MICROSOFT = cpu_to_le32(0x80000000),
+
IO_REPARSE_TAG_RESERVED_ZERO = cpu_to_le32(0x00000000),
IO_REPARSE_TAG_RESERVED_ONE = cpu_to_le32(0x00000001),
***************
*** 1588,1594 ****
/*
* Attribute: Reparse point (0xc0).
- *
- * FIXME: Describe more about reparse points here, including the flags in the
- * reparse_tag.
*/
typedef struct {
--- 1601,1604 ----
|
|
From: Anton A. <an...@us...> - 2001-03-15 23:11:40
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv17660
Modified Files:
attrib.c
Log Message:
Current status of library. (Still not working.)
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** attrib.c 2001/03/07 01:17:33 1.6
--- attrib.c 2001/03/15 23:13:45 1.7
***************
*** 313,398 ****
* 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;
- /* 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
puts("Sanity/size/allignment checks failed in " \
! "find_attribute()!");
! #endif
return NULL;
}
- /* Position of the first attribute. */
- a = (ATTR_RECORD*)(le16_to_cpu(b->attributes_offset) +
- (char*)b);
- if (p2n(a) & 7) {
- #ifdef DEBUG
- puts("Alignment check (2) failed in find_attribute()!");
#endif
! 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 >=
! le32_to_cpu(b->bytes_in_use) + (char*)b) {
#ifdef DEBUG
- puts("Attribute length out of bounds in " \
- "find_attribute()!");
- #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) {
! #ifdef DEBUG
! puts("Allignment check (4) failed in " \
! "find_attribute()!");
! #endif
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
! 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. */
! //return find_next_attr_in_attr_list(v, b, al, t, n, ctx);
!
! /* The requested attribute is not present. */
! goto not_found;
}
--- 313,412 ----
* for userspace we just return a pointer into the mft record @m.
*/
! ATTR_RECORD *lookup_attr(const ntfs_volume *vol, const MFT_RECORD *m,
! const IS_FIRST_BOOL *first, const ATTR_RECORD **attr,
! const ATTR_TYPES type, const wchar_t *name,
! const __u32 name_len, const IGNORE_CASE_BOOL ic,
! const __u8 *val, const __u32 val_len)
{
! ATTR_RECORD *a, *alist = NULL;
int got_there = 0;
#ifdef DEBUG
+ /* Sanity/size/alignment checks. */
+ if (!vol || !m || !attr || !is_mft_recordp(m) ||
+ !(m->flags & MFT_RECORD_IN_USE) ||
+ m->base_mft_record ||
+ p2n((char*)m + m->attributes_offset) & 7 ||
+ p2n((char*)m + m->bytes_in_use) & 7 ||
+ le16_to_cpu(m->attributes_offset) >= le32_to_cpu(m->bytes_in_use)) {
puts("Sanity/size/allignment checks failed in " \
! "lookup_attr()!");
return NULL;
}
#endif
! if (!*attr) {
! /* Position of the first attribute. */
! a = (ATTR_RECORD*)(le16_to_cpu(m->attributes_offset) +
! (char*)m);
#ifdef DEBUG
if (p2n(a) & 7) {
! puts("Alignment check (2) failed in lookup_attr()!");
return NULL;
}
+ #endif
+ } else {
+ if (*first) {
+ /* Where to commence the search. */
+ a = *attr;
+ } else {
+ /* Where to continue the search. */
+ a = (ATTR_RECORD*)((char*)*attr +
+ le32_to_cpu(*attr->length));
+ }
+ if (a < m || a > (char*)m + vol->mft_record_size)
+ goto file_corrupt;
+ *first = 0;
+ if (a->type == $END)
+ goto not_found;
+ if (!a->length)
+ goto file_corrupt;
+ if (!type)
+ goto call_find_attr;
+ goto found_it;
}
+ /*
+ * Look for an attribute list and at the same time check for attributes
+ * which collate before the attribute list (i.e. $STANDARD_INFORMATION).
+ */
+ if (le32_to_cpu(a->type) > le32_to_cpu($ATTRIBUTE_LIST))
+ goto no_attr_list;
+ do_next:
+ if (!a->length)
+ goto file_corrupt;
+ if (a->type == $ATTRIBUTE_LIST)
+ goto attr_list_present;
+ a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length));
+ if (a < m || a > (char*)m + vol->mft_record_size)
+ goto file_corrupt;
+ if (le32_to_cpu(a->type) <= le32_to_cpu($ATTRIBUTE_LIST))
+ goto do_next;
+ no_attr_list:
+ if (!type ||
+ type == $STANDARD_INFORMATION && a->type == $STANDARD_INFORMATION)
+ goto found_it;
+ call_find_attr:
+ *attr = find_next_attr(vol, &a, type, name, name_len, ic, val, val_len);
+ return_now:
+ return a;
+ found_it:
+ *attr = a;
+ goto return_now;
not_found:
/* The requested attribute is not present. */
! a = NULL;
! goto return_now;
! attr_list_present:
! /* Looking for zero means we return the first attribute, which will
! * be the first one listed in the attribute list. */
! if (type == 0)
! goto search_attr_list;
! if (type == $ATTRIBUTE_LIST)
goto found_it;
! search_attr_list:
! *attr = a;
! al = a;
! _NtfsMapAttributeValue(arg_0, arg_4,
! arg_output_buf[0x24]pattr_valueOUT, attr_val_lenOUT,
! arg_output_buf[0x1c]OUT, arg_output_bufIN/OUT);
}
|
|
From: Anton A. <an...@us...> - 2001-03-15 23:11:06
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv17573 Modified Files: mft.h Log Message: And this one... Index: mft.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** mft.h 2001/03/05 03:15:08 1.8 --- mft.h 2001/03/15 23:13:11 1.9 *************** *** 130,134 **** __u16 sequence_number; /* 16-bit sequence number. */ } __attribute__ ((__packed__)); - __u64 mft_reference; /* Mft reference as one value.*/ } __attribute__ ((__packed__)) MFT_REFERENCE; --- 130,133 ---- |
|
From: Anton A. <an...@us...> - 2001-03-15 23:10:40
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv17487
Modified Files:
attrib.h
Log Message:
About time to do a new commit...
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** attrib.h 2001/03/05 03:15:08 1.14
--- attrib.h 2001/03/15 23:12:45 1.15
***************
*** 1265,1268 ****
--- 1265,1269 ----
VOLUME_REPAIR_OBJECT_ID = cpu_to_le16(0x0020),
VOLUME_MODIFIED_BY_CHKDSK = cpu_to_le16(0x8000),
+ VOLUME_FLAGS_MASK = cpu_to_le16(0x803f),
} __attribute__ ((__packed__)) VOLUME_FLAGS;
***************
*** 1558,1562 ****
/*
! * Reparse point tag:
*
* Most significant three bits mean:
--- 1559,1564 ----
/*
! * The reparse point tag defines the type of the reparse point. It also
! * includes several flags, which further describe the reparse point.
*
* Most significant three bits mean:
***************
*** 1565,1568 ****
--- 1567,1588 ----
* filename is an alias for another object
*/
+ typedef enum {
+ IO_REPARSE_TAG_RESERVED_ZERO = cpu_to_le32(0x00000000),
+ IO_REPARSE_TAG_RESERVED_ONE = cpu_to_le32(0x00000001),
+ IO_REPARSE_TAG_RESERVED_RANGE = cpu_to_le32(0x00000001),
+
+ IO_REPARSE_TAG_NSS = cpu_to_le32(0x68000005),
+ IO_REPARSE_TAG_NSS_RECOVER = cpu_to_le32(0x68000006),
+ IO_REPARSE_TAG_SIS = cpu_to_le32(0x68000007),
+ IO_REPARSE_TAG_DFS = cpu_to_le32(0x68000008),
+
+ IO_REPARSE_TAG_MOUNT_POINT = cpu_to_le32(0x88000003),
+
+ IO_REPARSE_TAG_HSM = cpu_to_le32(0xa8000004),
+
+ IO_REPARSE_TAG_SYMBOLIC_LINK = cpu_to_le32(0xe8000000),
+
+ IO_REPARSE_TAG_VALID_VALUES = cpu_to_le32(0xe000ffff),
+ } PREDEFINED_REPARSE_TAGS;
/*
|
|
From: Anton A. <an...@us...> - 2001-03-07 15:51:42
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/doc In directory usw-pr-cvs1:/tmp/cvs-serv19933 Modified Files: attributes.txt Log Message: Some corrections/additions to attributes documentation. Index: attributes.txt =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/attributes.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** attributes.txt 2001/01/30 12:57:44 1.1 --- attributes.txt 2001/03/07 15:53:20 1.2 *************** *** 7,20 **** Resident attributes are small enough to be stored in the mft record itself. ! When an attribute becomes too big to fir in the mft record or when the number ! of attributes grows so that there is no more space in the mft record, the ! largest attribute(s) is(are) made non-resident. Non-resident attributes ======================= ! Non-resident attributes ontain only their non-resident attribute header in the mft record and the actual attribute value is stored anywhere on the volume ! (but not in other mft records!). The value of the attribute is saved as a sequence of clusters, named virtual --- 7,21 ---- Resident attributes are small enough to be stored in the mft record itself. ! When an attribute becomes too big to fit in the mft record or when the number ! of attributes grows so large that there is no more space in the mft record, the ! largest attribute(s) is(are) made non-resident. (Note, that some attributes ! cannot be non-resident.) Non-resident attributes ======================= ! Non-resident attributes contain only their non-resident attribute header in the mft record and the actual attribute value is stored anywhere on the volume ! (but not in other mft records). The value of the attribute is saved as a sequence of clusters, named virtual *************** *** 30,39 **** When the mapping pairs array of a non-resident attribute becomes too large to fit in the mft record or when there are so many attributes in the mft record ! that even though all attributes that can be non-resident have been made ! non-resident they still do not fit in the mft record, the larger non-resident attributes are moved away from the mft record to make space. ! This is done by moving the whole non-resident attribute header structures to ! another mft record. Attribute list attribute --- 31,44 ---- When the mapping pairs array of a non-resident attribute becomes too large to fit in the mft record or when there are so many attributes in the mft record ! that, even though all attributes that can be non-resident have been made ! non-resident, they still do not fit in the mft record, the larger non-resident attributes are moved away from the mft record to make space. ! This is done by moving whole non-resident attribute header structures to other ! mft records and/or by splitting the mapping pairs array of attributes into ! several non-resident attribute headers, each containing a chunk of the ! original mapping pairs array. These non-resident attribute headers each ! describing the same attribute value (but different parts of it) are called ! extents. Attribute list attribute *************** *** 48,52 **** be found. For resident attributes this will be the same number as the base mft record in which the attribute list attribute is located itself. For non-resident ! attributes this will be another mft record, called an extension mft record. Naturally, all extension mft records point back to their base mft record. --- 53,57 ---- be found. For resident attributes this will be the same number as the base mft record in which the attribute list attribute is located itself. For non-resident ! attributes, this will be another mft record, called an extension mft record. Naturally, all extension mft records point back to their base mft record. *************** *** 57,80 **** continues up to it's highest vcn value. This is determined by splitting up the mapping pairs array into chunks which just fit into an extension mft record ! each. Thus the first mapping pairs array chunk will determined the value of ! highest vcn for the first extens. The attribute list will contain an entry for ! this extent. Then, a second extent is created which has it's lowest vcn value ! set to the highest vcn of the previous extent + 1 and the next chunk of the ! mapping pairs array is inserted into this extent. Again, an entry for this ! extent is placed into the attribute list and so on until the whole non-resident ! attribute's mapping pairs array has been accomodated. Should the attribute list become too big to fit inside the base mft record it is made non-resident. However, it's maximum value size is determined by the ! Windows cache manager to be 256kb. Also, the mapping pairs array of the ! attribute list has to fit inside the base mft record as an attribute list can't ! be described by itself and attribute lists are not allowed to be nested. --- 62,108 ---- continues up to it's highest vcn value. This is determined by splitting up the mapping pairs array into chunks which just fit into an extension mft record ! each. Thus the first mapping pairs array chunk will determine the value of ! the highest vcn for the first extent. The attribute list will contain an entry ! for this extent. Then, a second extent is created which has it's lowest vcn ! value set to the highest vcn of the previous extent + 1 and the next chunk of ! the mapping pairs array is inserted into this extent. Again, an entry for this ! extent is placed into the attribute list, and so on, until the whole ! non-resident attribute's mapping pairs array has been accomodated. Should the attribute list become too big to fit inside the base mft record it is made non-resident. However, it's maximum value size is determined by the ! Windows cache manager to be 256kb (the size of a VACB). Also, the mapping pairs ! array of the attribute list has to fit inside the base mft record, as an ! attribute list can't be described by itself and attribute lists are not allowed to be nested. + Compressed attributes + ===================== + The attribute value of each $DATA attribute can be compressed to save space. + If this is the case, the ATTR_IS_COMPRESSED flag is set. + See the discussion on compression in include/attrib.h for more details. + FIXME: The discussion belongs here! (AIA) + Sparse attributes (NTFS 3.0+) + ============================= + The attribute value of each $DATA attribute can be sparse to save space. + If this is the case, the ATTR_IS_SPARSE flag is set. Note, that compressed + attributes are by definition sparse, as well as compressed, without having the + ATTR_IS_SPARSE flag set. + See the discussion on compression in include/attrib.h for more details. + FIXME: The discussion belongs here! (AIA) + Encrypted attributes (NTFS 3.0+) + ================================ + Since NTFS 3.0, the attribute value of each $DATA attribute can be encrypted, + to protect the contents from spying eyes. If this is the case, the + ATTR_IS_ENCRYPTED flag is set. + + FIXME: Write notes on attribute encryption. The descussions from the articles + "Inside the Encrypting File System" in Windows NT magazine (?) are very good + starting points. (AIA) |
|
From: Anton A. <an...@us...> - 2001-03-07 15:23:48
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/driver-2.4 In directory usw-pr-cvs1:/tmp/cvs-serv15248/driver-2.4 Log Message: Directory /cvsroot/linux-ntfs/linux-ntfs/driver-2.4 added to the repository |
|
From: Anton A. <an...@us...> - 2001-03-07 01:15:55
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv6492/include
Added Files:
unistr.h
Removed Files:
ntfs_unicode.h
Log Message:
Renamed the unicode files and introduced more code. Finished the new
find_first/next_attr() interface functions. Next on my list are functions
supporting attribute lists...
--- NEW FILE ---
/*
* unistr.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 UNISTR_H
#define UNISTR_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"
/*
* This is used by the name collation functions to quickly determine what
* characters are (in)valid.
*/
const __u8 legal_ansi_char_array[0x40] = {
0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
0x17, 0x07, 0x18, 0x17, 0x17, 0x17, 0x17, 0x17,
0x17, 0x17, 0x18, 0x16, 0x16, 0x17, 0x07, 0x00,
0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17,
0x17, 0x17, 0x04, 0x16, 0x18, 0x16, 0x18, 0x18,
};
/*
* These are just to make the code more readable...
*/
typedef enum {
CASE_SENSITIVE = 0,
IGNORE_CASE = 1,
} IGNORE_CASE_BOOL;
int ntfs_collate_names(const wchar_t *upcase, const __u32 upcase_len,
wchar_t *name1, const int name1_len,
wchar_t *name2, const int name2_len,
const IGNORE_CASE_BOOL ic, const int err_val);
int ntfs_wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n);
int ntfs_wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n,
const wchar_t *upcase, const __u32 upcase_size);
#endif /* defined UNISTR_H */
--- ntfs_unicode.h DELETED ---
|
|
From: Anton A. <an...@us...> - 2001-03-07 01:15:55
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv6492/libntfs
Modified Files:
attrib.c
Added Files:
unistr.c
Removed Files:
ntfs_unicode.c
Log Message:
Renamed the unicode files and introduced more code. Finished the new
find_first/next_attr() interface functions. Next on my list are functions
supporting attribute lists...
--- NEW FILE ---
/*
* unistr.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 "unistr.h"
/**
* ntfs_collate_names - collate two Unicode names
* @upcase: upcase table (ignored if @ic is CASE_SENSITIVE)
* @upcase_len: upcase table size (ignored if @ic is CASE_SENSITIVE)
* @name1: first Unicode name to compare
* @name2: second Unicode name to compare
* @ic: either CASE_SENSITIVE or IGNORE_CASE
* @err_val: if @name1 contains an invalid character return this value
*
* ntfs_collate_names collates two Unicode names and returns:
*
* -1 if the first name collates before the second one,
* 0 if the names match,
* 1 if the second name collates before the first one, or
* @ec if an invalid character is encountered in @name1 during the comparison.
*
* The following characters are considered invalid: '"', '*', '<', '>' and '?'.
*/
int ntfs_collate_names(const wchar_t *upcase, const __u32 upcase_len,
const wchar_t *name1, const __u32 name1_len,
const wchar_t *name2, const __u32 name2_len,
const IGNORE_CASE_BOOL ic, const int err_val)
{
__u32 cnt;
wchar_t c1, c2;
#ifdef DEBUG
if (!name1 || !name2 || ic && !upcase && upcase_len) {
printf(stderr, "ntfs_wcsncmp() received NULL pointer!\n");
exit(1);
}
#endif
for (cnt = 0; cnt < min(name1_len, name2_len); ++cnt)
{
c1 = le16_to_cpu(*name1++);
c2 = le16_to_cpu(*name2++);
if (ic) {
if (c1 < upcase_len)
c1 = le16_to_cpu(upcase[c1]);
if (c2 < upcase_len)
c2 = le16_to_cpu(upcase[c2]);
}
if (c1 < 64 && legal_ansi_char_array[c1] & 8);
return err_val;
if (c1 < c2)
return -1;
if (c1 > c2)
return 1;
++name1;
++name2;
}
if (name1_len < name2_len)
return -1;
if (name1_len == name2_len)
return 0;
/* name1_len > name2_len */
c1 = le16_to_cpu(*name1);
if (c1 < 64 && legal_ansi_char_array[c1] & 8)
return err_val;
return 1;
}
/**
* 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;
#ifdef DEBUG
if (!s1 || !s2) {
printf(stderr, "ntfs_wcsncmp() received NULL pointer!\n");
exit(1);
}
#endif
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;
}
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** attrib.c 2001/03/06 02:10:55 1.5
--- attrib.c 2001/03/07 01:17:33 1.6
***************
*** 32,36 ****
#include "disk_io.h"
#include "volume.h"
! #include "ntfs_unicode.h"
/*
--- 32,36 ----
#include "disk_io.h"
#include "volume.h"
! #include "unistr.h"
/*
***************
*** 133,142 ****
/**
! * 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, 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
--- 133,143 ----
/**
! * find_next_attr - find (next) attribute in mft record
* @vol: volume on which @a resides (used to find the upcase table)
! * @attr: attribute record inside mft record where to begin the search
* @type: attribute type to find
* @name: attribute name to find (optional, i.e. NULL means don't care)
! * @name_len: attribute name length (only needed if @name present)
! * @ic: IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
* @val: attribute value to find (optional, resident attributes only)
* @val_len: attribute value length
***************
*** 146,150 ****
* 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
--- 147,152 ----
* 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, @name_len is the @name length
! * in Unicode characters, and @val is ignored.
*
* If @name is not present (NULL), no attribute name checking is performed at
***************
*** 153,156 ****
--- 155,163 ----
* present. Note: If @val is not present (NULL), @val_len is undefined.
*
+ * find_next_attr() only searches the mft record in which @attr is present and
+ * it ignores the presence of an attribute list attribute (unless it is the one
+ * being searched for, obviously). If you need to take attribute lists into
+ * consideration, use lookup_next_attr() instead (see below).
+ *
* Warning: Never use @val when looking for attribute types which can be
* non-resident as this most likely will result in a crash!
***************
*** 161,177 ****
*
* 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;
}
--- 168,185 ----
*
* 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, wchar_t *name,
! const __u32 name_len, const IGNORE_CASE_BOOL ic,
! const __u8 *val, const __u32 val_len)
{
! ATTR_RECORD *a;
void *mft_rec;
#ifdef DEBUG
if (!vol || !attr || !*attr) {
! printf(stderr, "find_next_attr() received NULL pointer!\n");
return NULL;
}
***************
*** 181,193 ****
* 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.
! * Note: We do not use while/do/for loops so the comparison
! * code does not get indented out of the screen... (AIA)
*/
goto search_loop;
--- 189,201 ----
* 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 = p2n(a) & (vol->mft_record_size - 1);
/*
* Iterate over attributes in mft record starting at @attr.
! * Note: Not using while/do/for loops so the comparison code
! * does not get indented out of the screen... (AIA)
*/
goto search_loop;
***************
*** 213,224 ****
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);
--- 221,228 ----
return a;
}
rv = memcmp(val, (char*)a + le16_to_cpu(a->value_offset),
min(val_len, le32_to_cpu(a->value_length)));
+ /* If @val collates after the current attribute's value,
+ continue searching as a matching attribute might follow. */
if (!rv) {
register __u32 avl = le32_to_cpu(a->value_length);
***************
*** 231,238 ****
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 +
--- 235,238 ----
***************
*** 246,261 ****
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:
--- 246,266 ----
goto found_it;
}
! { register int rc = ntfs_collate_names(vol->upcase,
! vol->upcase_len, name, name_len,
! (wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
! a->name_length, IGNORE_CASE, 1);
! /* If case insensitive collation of names collates @name
! before a->name, there is no matching attribute. */
! if (rc == -1)
! goto not_found;
! /* If the strings are not equal, continue search. */
! if (rc)
! goto do_next;
! }
! /* If case sensitive collation of names doesn't collate @name before
! a->name, we continue the search. Otherwise we haven't found it. */
! if (ntfs_collate_names(vol->upcase, vol->upcase_len, name, name_len,
! (wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
! a->name_length, CASE_SENSITIVE, 1) != -1)
goto do_next;
not_found:
***************
*** 263,272 ****
file_corrupt:
#ifdef DEBUG
! printf(stderr,
! "find_next_attr(): File is corrupt. Run ntfsck or chkdsk.\n");
#endif
goto not_found;
}
/*
* The difference between lookup_attr and find_attr is that find_attr will only
--- 268,295 ----
file_corrupt:
#ifdef DEBUG
! printf(stderr, "find_next_attr(): File is corrupt. Run chkdsk.\n");
#endif
goto not_found;
}
+ __inline__ ATTR_RECORD *find_first_attr(const ntfs_volume *vol,
+ const MFT_RECORD *mft_rec, const ATTR_TYPES type,
+ wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic,
+ const __u8 *val, const __u32 val_len)
+ {
+ ATTR_RECORD *a;
+
+ #ifdef DEBUG
+ if (!vol || !mft_rec) {
+ printf(stderr, "find_first_attr() received NULL pointer!\n");
+ return NULL;
+ }
+ #endif
+ a = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset));
+ if (a < mft_rec || a > (char*)mft_rec + vol->mft_record_size)
+ goto file_corrupt;
+ return find_next_attr(vol, &a, type, name, name_len, ic, val, val_len);
+ }
+
/*
* The difference between lookup_attr and find_attr is that find_attr will only
***************
*** 372,389 ****
/* 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)
- {
- FIND_ATTR_CTX_FLAGS c;
-
- if (!ctx)
- ctx = &c;
- *ctx = FIRST_SEARCH;
- return find_next_attr(v, b, t, n, ctx);
}
--- 395,398 ----
--- ntfs_unicode.c DELETED ---
|
