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: Yura P. <cha...@us...> - 2005-11-04 22:43:21
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3941 Modified Files: ChangeLog Log Message: fix really hard to trigger bug in ntfs_delete Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.329 retrieving revision 1.330 diff -u -p -r1.329 -r1.330 --- ChangeLog 2 Nov 2005 20:47:19 -0000 1.329 +++ ChangeLog 4 Nov 2005 22:43:10 -0000 1.330 @@ -58,7 +58,6 @@ xx/xx/2005 - 1.12.2-WIP - ntfsinfo: dump index attribute keys. (Szaka) - mkntfs: don't fill the last $MFT cluster with empty MFT records. This is needed to conform to Windows' format behavior. (Szaka) - 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs. |
|
From: Szabolcs S. <sz...@us...> - 2005-11-03 21:57:00
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32444/ntfsprogs Modified Files: mkntfs.c Log Message: Set the the same $STANDARD_INFORMATION flags as format for NTFS 3.1 does Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- mkntfs.c 2 Nov 2005 23:14:39 -0000 1.89 +++ mkntfs.c 3 Nov 2005 21:56:52 -0000 1.90 @@ -4318,6 +4318,7 @@ static void mkntfs_create_root_structure } file_attrs = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM; if (i == FILE_root) { + file_attrs |= FILE_ATTR_ARCHIVE; if (opts.disable_indexing) file_attrs |= FILE_ATTR_NOT_CONTENT_INDEXED; if (opts.enable_compression) @@ -4335,7 +4336,7 @@ static void mkntfs_create_root_structure add_attr_std_info(m, file_attrs, cpu_to_le32(0x0100)); else if (i == 9) { - file_attrs |= FILE_ATTR_NOT_CONTENT_INDEXED; + file_attrs |= FILE_ATTR_DUP_VIEW_INDEX_PRESENT; add_attr_std_info(m, file_attrs, cpu_to_le32(0x0101)); } @@ -4343,6 +4344,7 @@ static void mkntfs_create_root_structure add_attr_std_info(m, file_attrs, cpu_to_le32(0x0101)); else if (i ==24 || i == 25 || i == 26) { + file_attrs |= FILE_ATTR_ARCHIVE; file_attrs |= FILE_ATTR_DUP_VIEW_INDEX_PRESENT; add_attr_std_info(m, file_attrs, cpu_to_le32(0x0101)); @@ -4793,7 +4795,7 @@ static void mkntfs_create_root_structure // starting vith file 24 (ignoring file 16-23) if (vol->major_ver >= 3) { extend_flags = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM | - FILE_ATTR_DUP_VIEW_INDEX_PRESENT; + FILE_ATTR_ARCHIVE | FILE_ATTR_DUP_VIEW_INDEX_PRESENT; Vprintf("Creating $Quota (mft record 24)\n"); m = (MFT_RECORD*)(buf + 24 * vol->mft_record_size); m->flags |= MFT_RECORD_IS_4; |
Changes by: uvman Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31639/include/ntfs Modified Files: bitmap.h device.h inode.h layout.h list.h logfile.h runlist.h types.h volume.h Log Message: Comment format improvements Index: bitmap.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/bitmap.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- bitmap.h 31 Oct 2005 01:15:12 -0000 1.6 +++ bitmap.h 3 Nov 2005 19:20:14 -0000 1.7 @@ -139,6 +139,7 @@ static __inline__ int ntfs_bitmap_clear_ /** * struct ntfs_bmp - + * * a cache for either dir/$BITMAP, $MFT/$BITMAP or $Bitmap/$DATA */ struct ntfs_bmp { Index: device.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/device.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- device.h 31 Oct 2005 01:15:12 -0000 1.9 +++ device.h 3 Nov 2005 19:20:14 -0000 1.10 @@ -33,6 +33,7 @@ /** * enum ntfs_device_state_bits - + * * Defined bits for the state field in the ntfs_device structure. */ typedef enum { @@ -59,6 +60,7 @@ typedef enum { /** * struct ntfs_device - + * * The ntfs device structure defining all operations needed to access the low * level device underlying the ntfs volume. */ @@ -74,6 +76,7 @@ struct stat; /** * struct ntfs_device_operations - + * * The ntfs device operations defining all operations that can be performed on * the low level device described by an ntfs device structure. */ Index: inode.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/inode.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- inode.h 31 Oct 2005 01:15:12 -0000 1.19 +++ inode.h 3 Nov 2005 19:20:14 -0000 1.20 @@ -34,6 +34,7 @@ typedef struct _ntfs_inode ntfs_inode; /** * enum ntfs_inode_state_bits - + * * Defined bits for the state field in the ntfs_inode structure. * (f) = files only, (d) = directories only */ @@ -110,9 +111,10 @@ typedef enum { test_and_clear_nino_flag(ni, FileNameDirty) /** - * struct _ntfs_inode - - * The NTFS in-memory inode structure. It is just used as an extension to the - * fields already provided in the VFS inode. + * struct _ntfs_inode - The NTFS in-memory inode structure. + * + * It is just used as an extension to the fields already provided in the VFS + * inode. */ struct _ntfs_inode { u64 mft_no; /* Inode / mft record number. */ Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- layout.h 1 Nov 2005 20:18:27 -0000 1.40 +++ layout.h 3 Nov 2005 19:20:14 -0000 1.41 @@ -44,8 +44,7 @@ */ /** - * struct BIOS_PARAMETER_BLOCK - - * BIOS parameter block (bpb) structure. + * struct BIOS_PARAMETER_BLOCK - BIOS parameter block (bpb) structure. */ typedef struct { u16 bytes_per_sector; /* Size of a sector in bytes. */ @@ -66,8 +65,7 @@ typedef struct { } __attribute__((__packed__)) BIOS_PARAMETER_BLOCK; /** - * struct NTFS_BOOT_SECTOR - - * NTFS boot sector structure. + * struct NTFS_BOOT_SECTOR - NTFS boot sector structure. */ typedef struct { u8 jump[3]; /* Irrelevant (jump to boot up code).*/ @@ -101,6 +99,7 @@ typedef struct { /** * enum NTFS_RECORD_TYPES - + * * Magic identifiers present at the beginning of all ntfs record containing * records (like mft records for example). */ @@ -170,6 +169,7 @@ typedef enum { /** * struct NTFS_RECORD - + * * The Update Sequence Array (usa) is an array of the u16 values which belong * to the end of each sector protected by the update sequence record in which * this array is contained. Note that the first entry is the Update Sequence @@ -197,12 +197,12 @@ typedef struct { } __attribute__((__packed__)) NTFS_RECORD; /** - * enum NTFS_SYSTEM_FILES - - * 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 - * allocation for random other mft records. Also, the sequence number for each - * of the system files is always equal to their mft record number and it is - * never modified. + * enum NTFS_SYSTEM_FILES - 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 allocation for random other + * mft records. Also, the sequence number for each of the system files is + * always equal to their mft record number and it is never modified. */ typedef enum { FILE_MFT = 0, /* Master file table (mft). Data attribute @@ -245,6 +245,7 @@ typedef enum { /** * enum MFT_RECORD_FLAGS - + * * These are the so far known MFT_RECORD_* flags (16-bit) which contain * information about the mft record in which they are present. * _4 and _8 are needed by $Extend sub-files (don't know what to @@ -322,7 +323,8 @@ typedef u64 MFT_REF; #define MREF_ERR(x) ((int)((s64)(x))) /** - * struct MFT_RECORD - + * struct MFT_RECORD - An MFT record layout (NTFS 3.1+) + * * The mft record header present at the beginning of every record in the mft. * This is followed by a sequence of variable length attribute records which * is terminated by an attribute of type AT_END which is a truncated attribute @@ -399,7 +401,8 @@ typedef struct { } __attribute__((__packed__)) MFT_RECORD; /** - * struct MFT_RECORD_OLD - + * struct MFT_RECORD_OLD - An MFT record layout (NTFS <=3.0) + * * This is the version without the NTFS 3.1+ specific fields. */ typedef struct { @@ -469,13 +472,15 @@ typedef struct { } __attribute__((__packed__)) MFT_RECORD_OLD; /** - * enum ATTR_TYPES - - * System defined attributes (32-bit). Each attribute type has a corresponding - * attribute name (Unicode string of maximum 64 character length) as described - * by the attribute definitions present in the data attribute of the $AttrDef - * system file. On NTFS 3.0 volumes the names are just as the types are named - * in the below enum exchanging AT_ for the dollar sign ($). If that isn't a - * revealing choice of symbol... (-; + * enum ATTR_TYPES - System defined attributes (32-bit). + * + * Each attribute type has a corresponding attribute name (Unicode string of + * maximum 64 character length) as described by the attribute definitions + * present in the data attribute of the $AttrDef system file. + * + * On NTFS 3.0 volumes the names are just as the types are named in the below + * enum exchanging AT_ for the dollar sign ($). If that isn't a revealing + * choice of symbol... (-; */ typedef enum { AT_UNUSED = const_cpu_to_le32( 0), @@ -500,8 +505,8 @@ typedef enum { } ATTR_TYPES; /** - * enum COLLATION_RULES - - * The collation rules for sorting views/indexes/etc (32-bit). + * enum COLLATION_RULES - The collation rules for sorting views/indexes/etc + * (32-bit). * * COLLATION_UNICODE_STRING - Collate Unicode strings by comparing their binary * Unicode values, except that when a character can be uppercased, the @@ -556,6 +561,7 @@ typedef enum { /** * enum ATTR_DEF_FLAGS - + * * The flags (32-bit) describing attribute properties in the attribute * definition structure. FIXME: This information is based on Regis's * information and, according to him, it is not certain and probably @@ -592,6 +598,7 @@ typedef enum { /** * struct ATTR_DEF - + * * The data attribute of FILE_AttrDef contains a sequence of attribute * definitions for the NTFS volume. With this, it is supposed to be safe for an * older NTFS driver to mount a volume containing a newer NTFS version without @@ -615,8 +622,7 @@ typedef struct { } __attribute__((__packed__)) ATTR_DEF; /** - * enum ATTR_FLAGS - - * Attribute flags (16-bit). + * enum ATTR_FLAGS - Attribute flags (16-bit). */ typedef enum { ATTR_IS_COMPRESSED = const_cpu_to_le16(0x0001), @@ -695,8 +701,7 @@ typedef enum { */ /** - * enum RESIDENT_ATTR_FLAGS - - * Flags of resident attributes (8-bit). + * enum RESIDENT_ATTR_FLAGS - Flags of resident attributes (8-bit). */ typedef enum { RESIDENT_ATTR_IS_INDEXED = 0x01, /* Attribute is referenced in an index @@ -705,8 +710,9 @@ typedef enum { } __attribute__((__packed__)) RESIDENT_ATTR_FLAGS; /** - * struct ATTR_RECORD - - * Attribute record header. Always aligned to 8-byte boundary. + * struct ATTR_RECORD - Attribute record header. + * + * Always aligned to 8-byte boundary. */ typedef struct { /*Ofs*/ @@ -813,8 +819,7 @@ typedef struct { typedef ATTR_RECORD ATTR_REC; /** - * enum FILE_ATTR_FLAGS - - * File attribute flags (32-bit). + * enum FILE_ATTR_FLAGS - File attribute flags (32-bit). */ typedef enum { /* @@ -875,8 +880,7 @@ typedef enum { */ /** - * struct STANDARD_INFORMATION - - * Attribute: Standard information (0x10). + * struct STANDARD_INFORMATION - Attribute: Standard information (0x10). * * NOTE: Always resident. * NOTE: Present in all base file records on a volume. @@ -968,8 +972,7 @@ typedef struct { } __attribute__((__packed__)) STANDARD_INFORMATION; /** - * struct ATTR_LIST_ENTRY - - * Attribute: Attribute list (0x20). + * struct ATTR_LIST_ENTRY - Attribute: Attribute list (0x20). * * - Can be either resident or non-resident. * - Value consists of a sequence of variable length, 8-byte aligned, @@ -1035,8 +1038,8 @@ typedef struct { #define NTFS_MAX_NAME_LEN 255 /** - * enum FILE_NAME_TYPE_FLAGS - - * Possible namespaces for filenames in ntfs (8-bit). + * enum FILE_NAME_TYPE_FLAGS - Possible namespaces for filenames in ntfs. + * (8-bit). */ typedef enum { FILE_NAME_POSIX = 0x00, @@ -1062,8 +1065,7 @@ typedef enum { } __attribute__((__packed__)) FILE_NAME_TYPE_FLAGS; /** - * struct FILE_NAME_ATTR - - * Attribute: Filename (0x30). + * struct FILE_NAME_ATTR - Attribute: Filename (0x30). * * NOTE: Always resident. * NOTE: All fields, except the parent_directory, are only updated when the @@ -1111,12 +1113,14 @@ typedef struct { } __attribute__((__packed__)) FILE_NAME_ATTR; /** - * struct GUID - - * GUID structures store globally unique identifiers (GUID). A GUID is a - * 128-bit value consisting of one group of eight hexadecimal digits, followed - * by three groups of four hexadecimal digits each, followed by one group of - * twelve hexadecimal digits. GUIDs are Microsoft's implementation of the - * distributed computing environment (DCE) universally unique identifier (UUID). + * struct GUID - GUID structures store globally unique identifiers (GUID). + * + * A GUID is a 128-bit value consisting of one group of eight hexadecimal + * digits, followed by three groups of four hexadecimal digits each, followed + * by one group of twelve hexadecimal digits. GUIDs are Microsoft's + * implementation of the distributed computing environment (DCE) universally + * unique identifier (UUID). + * * Example of a GUID: * 1F010768-5A73-BC91-0010-A52216A7227B */ @@ -1130,11 +1134,12 @@ typedef struct { } __attribute__((__packed__)) GUID; /** - * struct OBJ_ID_INDEX_DATA - - * FILE_Extend/$ObjId contains an index named $O. This index contains all - * object_ids present on the volume as the index keys and the corresponding - * mft_record numbers as the index entry data parts. The data part (defined - * below) also contains three other object_ids: + * struct OBJ_ID_INDEX_DATA - FILE_Extend/$ObjId contains an index named $O. + * + * This index contains all object_ids present on the volume as the index keys + * and the corresponding mft_record numbers as the index entry data parts. + * + * The data part (defined below) also contains three other object_ids: * birth_volume_id - object_id of FILE_Volume on which the file was first * created. Optional (i.e. can be zero). * birth_object_id - object_id of file when it was first created. Usually @@ -1155,8 +1160,7 @@ typedef struct { } __attribute__((__packed__)) OBJ_ID_INDEX_DATA; /** - * struct OBJECT_ID_ATTR - - * Attribute: Object id (NTFS 3.0+) (0x40). + * struct OBJECT_ID_ATTR - Attribute: Object id (NTFS 3.0+) (0x40). * * NOTE: Always resident. */ @@ -1185,6 +1189,7 @@ typedef struct { #if 0 /** * enum IDENTIFIER_AUTHORITIES - + * * The pre-defined IDENTIFIER_AUTHORITIES used as SID_IDENTIFIER_AUTHORITY in * the SID structure (see below). */ @@ -1200,6 +1205,7 @@ typedef enum { /* SID string prefix. /** * enum RELATIVE_IDENTIFIERS - + * * These relative identifiers (RIDs) are used with the above identifier * authorities to make up universal well-known SIDs. * @@ -1331,6 +1337,7 @@ typedef union { /** * struct SID - + * * The SID structure is a variable-length structure used to uniquely identify * users or groups. SID stands for security identifier. * @@ -1364,8 +1371,7 @@ typedef struct { } __attribute__((__packed__)) SID; /** - * enum SID_CONSTANTS - - * Current constants for SIDs. + * enum SID_CONSTANTS - Current constants for SIDs. */ typedef enum { SID_REVISION = 1, /* Current revision level. */ @@ -1375,8 +1381,7 @@ typedef enum { } SID_CONSTANTS; /** - * enum ACE_TYPES - - * The predefined ACE types (8-bit, see below). + * enum ACE_TYPES - The predefined ACE types (8-bit, see below). */ typedef enum { ACCESS_MIN_MS_ACE_TYPE = 0, @@ -1404,8 +1409,7 @@ typedef enum { } __attribute__((__packed__)) ACE_TYPES; /** - * enum ACE_FLAGS - - * The ACE flags (8-bit) for audit and inheritance (see below). + * enum ACE_FLAGS - The ACE flags (8-bit) for audit and inheritance. * * SUCCESSFUL_ACCESS_ACE_FLAG is only used with system audit and alarm ACE * types to indicate that a message is generated (in Windows!) for successful @@ -1430,6 +1434,7 @@ typedef enum { /** * struct ACE_HEADER - + * * An ACE is an access-control entry in an access-control list (ACL). * An ACE defines access to an object for a specific user or group or defines * the types of access that generate system-administration messages or alarms @@ -1447,8 +1452,9 @@ typedef struct { } __attribute__((__packed__)) ACE_HEADER; /** - * enum ACCESS_MASK - - * The access mask (32-bit). Defines the access rights. + * enum ACCESS_MASK - The access mask (32-bit). + * + * Defines the access rights. */ typedef enum { /* @@ -1582,6 +1588,7 @@ typedef enum { /** * struct GENERIC_MAPPING - + * * The generic mapping array. Used to denote the mapping of each generic * access right to a specific access mask. * @@ -1600,6 +1607,7 @@ typedef struct { /** * struct ACCESS_DENIED_ACE - + * * ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE, SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE */ typedef struct { @@ -1614,8 +1622,7 @@ typedef struct { SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE; /** - * enum OBJECT_ACE_FLAGS - - * The object ACE flags (32-bit). + * enum OBJECT_ACE_FLAGS - The object ACE flags (32-bit). */ typedef enum { ACE_OBJECT_TYPE_PRESENT = const_cpu_to_le32(1), @@ -1642,8 +1649,8 @@ typedef struct { SYSTEM_ALARM_OBJECT_ACE; /** - * struct ACL - - * An ACL is an access-control list (ACL). + * struct ACL - An ACL is an access-control list (ACL). + * * An ACL starts with an ACL header structure, which specifies the size of * the ACL and the number of ACEs it contains. The ACL header is followed by * zero or more access control entries (ACEs). The ACL as well as each ACE @@ -1660,8 +1667,7 @@ typedef struct { } __attribute__((__packed__)) ACL; /** - * enum ACL_CONSTANTS - - * Current constants for ACLs. + * enum ACL_CONSTANTS - Current constants for ACLs. */ typedef enum { /* Current revision. */ @@ -1679,6 +1685,7 @@ typedef enum { /** * enum SECURITY_DESCRIPTOR_CONTROL - + * * The security descriptor control flags (16-bit). * * SE_OWNER_DEFAULTED - This boolean flag, when set, indicates that the @@ -1744,6 +1751,7 @@ typedef enum { /** * struct SECURITY_DESCRIPTOR_RELATIVE - + * * Self-relative security descriptor. Contains the owner and group SIDs as well * as the sacl and dacl ACLs inside the security descriptor itself. */ @@ -1770,12 +1778,14 @@ typedef struct { } __attribute__((__packed__)) SECURITY_DESCRIPTOR_RELATIVE; /** - * struct SECURITY_DESCRIPTOR - - * Absolute security descriptor. Does not contain the owner and group SIDs, nor - * the sacl and dacl ACLs inside the security descriptor. Instead, it contains - * pointers to these structures in memory. Obviously, absolute security - * descriptors are only useful for in memory representations of security - * descriptors. On disk, a self-relative security descriptor is used. + * struct SECURITY_DESCRIPTOR - Absolute security descriptor. + * + * Does not contain the owner and group SIDs, nor the sacl and dacl ACLs inside + * the security descriptor. Instead, it contains pointers to these structures + * in memory. Obviously, absolute security descriptors are only useful for in + * memory representations of security descriptors. + * + * On disk, a self-relative security descriptor is used. */ typedef struct { u8 revision; /* Revision level of the security descriptor. */ @@ -1800,6 +1810,7 @@ typedef struct { /** * enum SECURITY_DESCRIPTOR_CONSTANTS - + * * Current constants for security descriptors. */ typedef enum { @@ -1813,8 +1824,9 @@ typedef enum { } SECURITY_DESCRIPTOR_CONSTANTS; /* - * Attribute: Security descriptor (0x50). A standard self-relative security - * descriptor. + * Attribute: Security descriptor (0x50). + * + * A standard self-relative security descriptor. * * NOTE: Can be resident or non-resident. * NOTE: Not used in NTFS 3.0+, as security descriptors are stored centrally @@ -1864,6 +1876,7 @@ typedef SECURITY_DESCRIPTOR_RELATIVE SEC /** * struct SECURITY_DESCRIPTOR_HEADER - + * * This header precedes each security descriptor in the $SDS data stream. * This is also the index entry data part of both the $SII and $SDH indexes. */ @@ -1904,6 +1917,7 @@ typedef struct { /** * struct SDS_ENTRY - + * * The $SDS data stream contains the security descriptors, aligned on 16-byte * boundaries, sorted by security_id in a B+ tree. Security descriptors cannot * cross 256kib boundaries (this restriction is imposed by the Windows cache @@ -1926,19 +1940,19 @@ typedef struct { } __attribute__((__packed__)) SDS_ENTRY; /** - * struct SII_INDEX_KEY - - * The index entry key used in the $SII index. The collation type is - * COLLATION_NTOFS_ULONG. + * struct SII_INDEX_KEY - The index entry key used in the $SII index. + * + * The collation type is COLLATION_NTOFS_ULONG. */ typedef struct { u32 security_id; /* The security_id assigned to the descriptor. */ } __attribute__((__packed__)) SII_INDEX_KEY; /** - * struct SDH_INDEX_KEY - - * The index entry key used in the $SDH index. The keys are sorted first by - * hash and then by security_id. The collation rule is - * COLLATION_NTOFS_SECURITY_HASH. + * struct SDH_INDEX_KEY - The index entry key used in the $SDH index. + * + * The keys are sorted first by hash and then by security_id. + * The collation rule is COLLATION_NTOFS_SECURITY_HASH. */ typedef struct { u32 hash; /* Hash of the security descriptor. */ @@ -1946,8 +1960,7 @@ typedef struct { } __attribute__((__packed__)) SDH_INDEX_KEY; /** - * struct VOLUME_NAME - - * Attribute: Volume name (0x60). + * struct VOLUME_NAME - Attribute: Volume name (0x60). * * NOTE: Always resident. * NOTE: Present only in FILE_Volume. @@ -1957,8 +1970,7 @@ typedef struct { } __attribute__((__packed__)) VOLUME_NAME; /** - * enum VOLUME_FLAGS - - * Possible flags for the volume (16-bit). + * enum VOLUME_FLAGS - Possible flags for the volume (16-bit). */ typedef enum { VOLUME_IS_DIRTY = const_cpu_to_le16(0x0001), @@ -1972,8 +1984,7 @@ typedef enum { } __attribute__((__packed__)) VOLUME_FLAGS; /** - * struct VOLUME_INFORMATION - - * Attribute: Volume information (0x70). + * struct VOLUME_INFORMATION - Attribute: Volume information (0x70). * * NOTE: Always resident. * NOTE: Present only in FILE_Volume. @@ -1988,8 +1999,7 @@ typedef struct { } __attribute__((__packed__)) VOLUME_INFORMATION; /** - * struct DATA_ATTR - - * Attribute: Data attribute (0x80). + * struct DATA_ATTR - Attribute: Data attribute (0x80). * * NOTE: Can be resident or non-resident. * @@ -2000,8 +2010,7 @@ typedef struct { } __attribute__((__packed__)) DATA_ATTR; /** - * enum INDEX_HEADER_FLAGS - - * Index header flags (8-bit). + * enum INDEX_HEADER_FLAGS - Index header flags (8-bit). */ typedef enum { /* When index header is in an index root attribute: */ @@ -2024,6 +2033,7 @@ typedef enum { /** * struct INDEX_HEADER - + * * This is the header for indexes, describing the INDEX_ENTRY records, which * follow the INDEX_HEADER. Together the index header and the index entries * make up a complete index. @@ -2052,8 +2062,7 @@ typedef struct { } __attribute__((__packed__)) INDEX_HEADER; /** - * struct INDEX_ROOT - - * Attribute: Index root (0x90). + * struct INDEX_ROOT - Attribute: Index root (0x90). * * NOTE: Always resident. * @@ -2095,8 +2104,7 @@ typedef struct { } __attribute__((__packed__)) INDEX_ROOT; /** - * struct INDEX_BLOCK - - * Attribute: Index allocation (0xa0). + * struct INDEX_BLOCK - Attribute: Index allocation (0xa0). * * NOTE: Always non-resident (doesn't make sense to be resident anyway!). * @@ -2130,6 +2138,7 @@ typedef INDEX_BLOCK INDEX_ALLOCATION; /** * struct REPARSE_INDEX_KEY - + * * The system file FILE_Extend/$Reparse contains an index named $R listing * all reparse points on the volume. The index entry keys are as defined * below. Note, that there is no index data associated with the index entries. @@ -2145,8 +2154,7 @@ typedef struct { } __attribute__((__packed__)) REPARSE_INDEX_KEY; /** - * enum QUOTA_FLAGS - - * Quota flags (32-bit). + * enum QUOTA_FLAGS - Quota flags (32-bit). */ typedef enum { /* The user quota flags. Names explain meaning. */ @@ -2171,6 +2179,7 @@ typedef enum { /** * struct QUOTA_CONTROL_ENTRY - + * * The system file FILE_Extend/$Quota contains two indexes $O and $Q. Quotas * are on a per volume and per user basis. * @@ -2205,8 +2214,7 @@ typedef struct { } __attribute__((__packed__)) QUOTA_CONTROL_ENTRY; /** - * enum PREDEFINED_OWNER_IDS - - * Predefined owner_id values (32-bit). + * enum PREDEFINED_OWNER_IDS - Predefined owner_id values (32-bit). */ typedef enum { QUOTA_INVALID_ID = const_cpu_to_le32(0x00000000), @@ -2215,8 +2223,7 @@ typedef enum { } PREDEFINED_OWNER_IDS; /** - * enum INDEX_ENTRY_FLAGS - - * Index entry flags (16-bit). + * enum INDEX_ENTRY_FLAGS - Index entry flags (16-bit). */ typedef enum { INDEX_ENTRY_NODE = const_cpu_to_le16(1), /* This entry contains a @@ -2231,8 +2238,7 @@ typedef enum { } __attribute__((__packed__)) INDEX_ENTRY_FLAGS; /** - * struct INDEX_ENTRY_HEADER - - * This the index entry header (see below). + * struct INDEX_ENTRY_HEADER - This the index entry header (see below). */ typedef struct { /* 0*/ union { /* Only valid when INDEX_ENTRY_END is not set. */ @@ -2259,10 +2265,11 @@ typedef struct { } __attribute__((__packed__)) INDEX_ENTRY_HEADER; /** - * struct INDEX_ENTRY - - * This is an index entry. A sequence of such entries follows each INDEX_HEADER - * structure. Together they make up a complete index. The index follows either - * an index root attribute or an index allocation attribute. + * struct INDEX_ENTRY - This is an index entry. + * + * A sequence of such entries follows each INDEX_HEADER structure. Together + * they make up a complete index. The index follows either an index root + * attribute or an index allocation attribute. * * NOTE: Before NTFS 3.0 only filename attributes were indexed. */ @@ -2325,8 +2332,7 @@ typedef struct { } __attribute__((__packed__)) INDEX_ENTRY; /** - * struct BITMAP_ATTR - - * Attribute: Bitmap (0xb0). + * struct BITMAP_ATTR - Attribute: Bitmap (0xb0). * * Contains an array of bits (aka a bitfield). * @@ -2341,6 +2347,7 @@ typedef struct { /** * enum PREDEFINED_REPARSE_TAGS - + * * The reparse point tag defines the type of the reparse point. It also * includes several flags, which further describe the reparse point. * @@ -2382,8 +2389,7 @@ typedef enum { } PREDEFINED_REPARSE_TAGS; /** - * struct REPARSE_POINT - - * Attribute: Reparse point (0xc0). + * struct REPARSE_POINT - Attribute: Reparse point (0xc0). * * NOTE: Can be resident or non-resident. */ @@ -2395,8 +2401,7 @@ typedef struct { } __attribute__((__packed__)) REPARSE_POINT; /** - * struct EA_INFORMATION - - * Attribute: Extended attribute (EA) information (0xd0). + * struct EA_INFORMATION - Attribute: Extended attribute information (0xd0). * * NOTE: Always resident. */ @@ -2413,8 +2418,7 @@ typedef struct { } __attribute__((__packed__)) EA_INFORMATION; /** - * enum EA_FLAGS - - * Extended attribute flags (8-bit). + * enum EA_FLAGS - Extended attribute flags (8-bit). */ typedef enum { NEED_EA = 0x80, /* Indicate that the file to which the EA @@ -2424,8 +2428,7 @@ typedef enum { } __attribute__((__packed__)) EA_FLAGS; /** - * struct EA_ATTR - - * Attribute: Extended attribute (EA) (0xe0). + * struct EA_ATTR - Attribute: Extended attribute (EA) (0xe0). * * Like the attribute list and the index buffer list, the EA attribute value is * a sequence of EA_ATTR variable length records. @@ -2445,8 +2448,7 @@ typedef struct { } __attribute__((__packed__)) EA_ATTR; /** - * struct PROPERTY_SET - - * Attribute: Property set (0xf0). + * struct PROPERTY_SET - Attribute: Property set (0xf0). * * Intended to support Native Structure Storage (NSS) - a feature removed from * NTFS 3.0 during beta testing. @@ -2456,8 +2458,7 @@ typedef struct { } __attribute__((__packed__)) PROPERTY_SET; /** - * struct LOGGED_UTILITY_STREAM - - * Attribute: Logged utility stream (0x100). + * struct LOGGED_UTILITY_STREAM - Attribute: Logged utility stream (0x100). * * NOTE: Can be resident or non-resident. * @@ -2499,8 +2500,9 @@ typedef struct { */ /** - * struct EFS_ATTR_HEADER - - * The header of the 0x100 attribute named "$EFS". + * struct EFS_ATTR_HEADER - "$EFS" header. + * + * The header of the Logged utility stream (0x100) attribute named "$EFS". */ typedef struct { /* 0*/ u32 length; /* Length of EFS attribute in bytes. */ Index: list.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/list.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- list.h 31 Oct 2005 01:15:12 -0000 1.3 +++ list.h 3 Nov 2005 19:20:14 -0000 1.4 @@ -23,9 +23,10 @@ #define _NTFS_LIST_H /** - * struct list_head - - * Simple doubly linked list implementation. - Copied from Linux kernel - * 2.4.2-ac18 into Linux-NTFS (with minor modifications). - AIA + * struct list_head - Simple doubly linked list implementation. + * + * Copied from Linux kernel 2.4.2-ac18 into Linux-NTFS (with minor + * modifications). - AIA * * Some of the internal functions ("__xxx") are useful when * manipulating whole lists rather than single entries, as @@ -47,13 +48,11 @@ struct list_head { } while (0) /** - * __list_add - + * __list_add - Insert a new entry between two known consecutive entries. * @new: * @prev: * @next: * - * Insert a new entry between two known consecutive entries. - * * This is only for internal list manipulation where we know the prev/next * entries already! */ Index: logfile.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/logfile.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- logfile.h 31 Oct 2005 01:15:12 -0000 1.15 +++ logfile.h 3 Nov 2005 19:20:14 -0000 1.16 @@ -57,8 +57,9 @@ #define MinLogRecordPages 48 /** - * struct RESTART_PAGE_HEADER - - * Log file restart page header (begins the restart area). + * struct RESTART_PAGE_HEADER - Log file restart page header. + * + * Begins the restart area. */ typedef struct { /*Ofs*/ @@ -115,10 +116,11 @@ enum { typedef le16 RESTART_AREA_FLAGS; /** - * struct RESTART_AREA - - * Log file restart area record. The offset of this record is found by adding - * the offset of the RESTART_PAGE_HEADER to the restart_area_offset value found - * in it. See notes at restart_area_offset above. + * struct RESTART_AREA - Log file restart area record. + * + * The offset of this record is found by adding the offset of the + * RESTART_PAGE_HEADER to the restart_area_offset value found in it. + * See notes at restart_area_offset above. */ typedef struct { /*Ofs*/ @@ -255,9 +257,10 @@ typedef struct { } __attribute__((__packed__)) RESTART_AREA; /** - * struct LOG_CLIENT_RECORD - - * Log client record. The offset of this record is found by adding the offset - * of the RESTART_AREA to the client_array_offset value found in it. + * struct LOG_CLIENT_RECORD - Log client record. + * + * The offset of this record is found by adding the offset of the + * RESTART_AREA to the client_array_offset value found in it. */ typedef struct { /*Ofs*/ @@ -295,11 +298,12 @@ typedef struct { } __attribute__((__packed__)) LOG_CLIENT_RECORD; /** - * struct RECORD_PAGE_HEADER - - * Log page record page header. Each log page begins with this header and is - * followed by several LOG_RECORD structures, starting at offset 0x40 (the - * size of this structure and the following update sequence array and then - * aligned to 8 byte boundary, but is this specified anywhere?). + * struct RECORD_PAGE_HEADER - Log page record page header. + * + * Each log page begins with this header and is followed by several LOG_RECORD + * structures, starting at offset 0x40 (the size of this structure and the + * following update sequence array and then aligned to 8 byte boundary, but is + * this specified anywhere?). */ typedef struct { /* 0 NTFS_RECORD; -- Unfolded here as gcc doesn't like unnamed structs. */ @@ -327,8 +331,9 @@ typedef struct { } __attribute__((__packed__)) RECORD_PAGE_HEADER; /** - * enum LOG_RECORD_FLAGS - - * Possible 16-bit flags for log records. (Or is it log record pages?) + * enum LOG_RECORD_FLAGS - Possible 16-bit flags for log records. + * + * (Or is it log record pages?) */ typedef enum { LOG_RECORD_MULTI_PAGE = const_cpu_to_le16(0x0001), /* ??? */ @@ -338,8 +343,7 @@ typedef enum { } __attribute__((__packed__)) LOG_RECORD_FLAGS; /** - * struct LOG_CLIENT_ID - - * The log client id structure identifying a log client. + * struct LOG_CLIENT_ID - The log client id structure identifying a log client. */ typedef struct { u16 seq_number; @@ -347,9 +351,9 @@ typedef struct { } __attribute__((__packed__)) LOG_CLIENT_ID; /** - * struct LOG_RECORD - - * Log record header. Each log record seems to have a constant size of 0x70 - * bytes. + * struct LOG_RECORD - Log record header. + * + * Each log record seems to have a constant size of 0x70 bytes. */ typedef struct { LSN this_lsn; Index: runlist.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/runlist.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- runlist.h 31 Oct 2005 01:15:12 -0000 1.11 +++ runlist.h 3 Nov 2005 19:20:14 -0000 1.12 @@ -33,8 +33,7 @@ typedef runlist_element runlist; #include "volume.h" /** - * struct _runlist_element - - * runlist_element - in memory vcn to lcn mapping array element + * struct _runlist_element - in memory vcn to lcn mapping array element. * @vcn: starting vcn of the current array element * @lcn: starting lcn of the current array element * @length: length in clusters of the current array element Index: types.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/types.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- types.h 31 Oct 2005 01:15:12 -0000 1.13 +++ types.h 3 Nov 2005 19:20:14 -0000 1.14 @@ -82,8 +82,7 @@ typedef sle64 leLSN; */ #ifndef _WINDEF_H /** - * enum BOOL - - * These are just to make the code more readable... + * enum BOOL - These are just to make the code more readable... */ typedef enum { FALSE = 0, Index: volume.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- volume.h 31 Oct 2005 01:15:12 -0000 1.19 +++ volume.h 3 Nov 2005 19:20:14 -0000 1.20 @@ -62,6 +62,7 @@ typedef struct _ntfs_volume ntfs_volume; /** * enum ntfs_mount_flags - + * * Flags returned by the ntfs_check_if_mounted() function. */ typedef enum { @@ -74,6 +75,7 @@ extern int ntfs_check_if_mounted(const c /** * enum ntfs_volume_state_bits - + * * Defined bits for the state field in the ntfs_volume structure. */ typedef enum { @@ -114,8 +116,7 @@ typedef enum { #define NTFS_BUF_SIZE 8192 /** - * struct _ntfs_volume - - * ntfs_volume - structure describing an open volume in memory + * struct _ntfs_volume - structure describing an open volume in memory. */ struct _ntfs_volume { union { |
|
From: Szabolcs S. <sz...@us...> - 2005-11-03 01:43:35
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8641 Modified Files: ntfsinfo.c Log Message: Dump $Quota:$O key SID according to the standard textual representation Index: ntfsinfo.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -p -r1.91 -r1.92 --- ntfsinfo.c 1 Nov 2005 23:14:34 -0000 1.91 +++ ntfsinfo.c 3 Nov 2005 01:43:27 -0000 1.92 @@ -1124,7 +1124,7 @@ typedef enum { static void ntfs_dump_index_key(INDEX_ENTRY *entry, INDEX_ATTR_TYPE type) { - unsigned i; + char *sid; char printable_GUID[37]; switch (type) { @@ -1149,19 +1149,9 @@ static void ntfs_dump_index_key(INDEX_EN le64_to_cpu(entry->key.reparse.file_id)); break; case INDEX_ATTR_QUOTA_O: - ntfs_log_verbose("\t\tKey revision:\t\t %u\n", - entry->key.sid.revision); - ntfs_log_verbose("\t\tKey sub authority count: %u\n", - entry->key.sid.sub_authority_count); - ntfs_log_verbose("\t\tKey ident. auth. high: 0x%04x\n", - le16_to_cpu(entry->key.sid. - identifier_authority.high_part)); - ntfs_log_verbose("\t\tKey ident. auth. low: 0x%08x\n", - le32_to_cpu(entry->key.sid. - identifier_authority.low_part)); - for (i = 0; i < entry->key.sid.sub_authority_count; i++) - ntfs_log_verbose("\t\tKey sub authority:\t 0x%08x\n", - le32_to_cpu(entry->key.sid.sub_authority[i])); + sid = ntfs_sid_to_mbs(&entry->key.sid, NULL, 0); + ntfs_log_verbose("\t\tKey SID:\t\t %s\n", sid); + free(sid); break; case INDEX_ATTR_QUOTA_Q: ntfs_log_verbose("\t\tKey owner id:\t\t %u\n", |
|
From: Szabolcs S. <sz...@us...> - 2005-11-02 23:14:48
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7627 Modified Files: mkntfs.c Log Message: Create files in $Extend in the same order as 'format' does. This shouldn't actually matter but it makes ntfscmp happier and helps great deal to catch easily incorrectly created volumes. Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -r1.88 -r1.89 --- mkntfs.c 2 Nov 2005 21:03:29 -0000 1.88 +++ mkntfs.c 2 Nov 2005 23:14:39 -0000 1.89 @@ -4794,47 +4794,47 @@ static void mkntfs_create_root_structure if (vol->major_ver >= 3) { extend_flags = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM | FILE_ATTR_DUP_VIEW_INDEX_PRESENT; - Vprintf("Creating $ObjId (mft record 24)\n"); + Vprintf("Creating $Quota (mft record 24)\n"); m = (MFT_RECORD*)(buf + 24 * vol->mft_record_size); m->flags |= MFT_RECORD_IS_4; m->flags |= MFT_RECORD_IS_8; if (!err) err = create_hardlink_res((MFT_RECORD*)(buf + - 11 * vol->mft_record_size), extend_ref, - m, MK_LE_MREF(24, 24), 0LL, 0LL, - extend_flags, 0, 0, "$ObjId", - FILE_NAME_WIN32_AND_DOS); - + 11 * vol->mft_record_size), extend_ref, m, + MK_LE_MREF(24, 24), 0LL, 0LL, extend_flags + , 0, 0, "$Quota", FILE_NAME_WIN32_AND_DOS); // FIXME: This should be IGNORE_CASE if (!err) err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED, - COLLATION_NTOFS_ULONGS, opts.index_block_size); + COLLATION_NTOFS_SID, opts.index_block_size); + // FIXME: This should be IGNORE_CASE if (!err) - err = initialize_objid(m, volume_obj_id->object_id, - MK_LE_MREF(FILE_Volume, FILE_Volume)); + err = add_attr_index_root(m, "$Q", 2, 0, AT_UNUSED, + COLLATION_NTOFS_ULONG, opts.index_block_size); + if (!err) + err = initialize_quota(m); if (err < 0) - err_exit("Couldn't create $ObjId: %s\n", strerror(-err)); - Vprintf("Creating $Quota (mft record 25)\n"); + err_exit("Couldn't create $Quota: %s\n", strerror(-err)); + Vprintf("Creating $ObjId (mft record 25)\n"); m = (MFT_RECORD*)(buf + 25 * vol->mft_record_size); m->flags |= MFT_RECORD_IS_4; m->flags |= MFT_RECORD_IS_8; if (!err) err = create_hardlink_res((MFT_RECORD*)(buf + - 11 * vol->mft_record_size), extend_ref, m, - MK_LE_MREF(25, 25), 0LL, 0LL, extend_flags - , 0, 0, "$Quota", FILE_NAME_WIN32_AND_DOS); + 11 * vol->mft_record_size), extend_ref, + m, MK_LE_MREF(25, 25), 0LL, 0LL, + extend_flags, 0, 0, "$ObjId", + FILE_NAME_WIN32_AND_DOS); + // FIXME: This should be IGNORE_CASE if (!err) err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED, - COLLATION_NTOFS_SID, opts.index_block_size); - // FIXME: This should be IGNORE_CASE - if (!err) - err = add_attr_index_root(m, "$Q", 2, 0, AT_UNUSED, - COLLATION_NTOFS_ULONG, opts.index_block_size); + COLLATION_NTOFS_ULONGS, opts.index_block_size); if (!err) - err = initialize_quota(m); + err = initialize_objid(m, volume_obj_id->object_id, + MK_LE_MREF(FILE_Volume, FILE_Volume)); if (err < 0) - err_exit("Couldn't create $Quota: %s\n", strerror(-err)); + err_exit("Couldn't create $ObjId: %s\n", strerror(-err)); Vprintf("Creating $Reparse (mft record 26)\n"); m = (MFT_RECORD*)(buf + 26 * vol->mft_record_size); m->flags |= MFT_RECORD_IS_4; |
|
From: Szabolcs S. <sz...@us...> - 2005-11-02 21:03:39
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11603 Modified Files: mkntfs.c Log Message: Don't create 'System Volume Information'. This is never created by format, it's either a side-effect of Distributed Link Tracking Client Service, System Recovery Service, Index Service, WinFS, etc. Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -p -r1.87 -r1.88 --- mkntfs.c 2 Nov 2005 20:47:19 -0000 1.87 +++ mkntfs.c 2 Nov 2005 21:03:29 -0000 1.88 @@ -3812,9 +3812,9 @@ static void mkntfs_initialize_bitmaps(vo for (i = opts.nr_clusters; i < lcn_bitmap_byte_size << 3; i++) ntfs_bit_set(lcn_bitmap, (u64)i, 1); /* - * Determine mft_size: (16 (1.2) or 28 (3.0+) mft records) + * Determine mft_size: (16 (1.2) or 27 (3.0+) mft records) */ - opts.mft_size = ((16 + 12 * (vol->major_ver >= 3)) * + opts.mft_size = ((16 + 11 * (vol->major_ver >= 3)) * vol->mft_record_size); mkDprintf("MFT size = %i (0x%x) bytes\n", opts.mft_size, opts.mft_size); /* Determine mft bitmap size and allocate it. */ @@ -4289,7 +4289,7 @@ static void mkntfs_create_root_structure * sequence numbers of each system file to equal the mft record number * of that file (only for $MFT is the sequence number 1 rather than 0). */ - for (i = 0; i < 16 + 12 * (vol->major_ver >= 3); i++) { + for (i = 0; i < 16 + 11 * (vol->major_ver >= 3); i++) { if (ntfs_mft_record_layout(vol, 0, m = (MFT_RECORD *)(buf + i * vol->mft_record_size))) err_exit("Error: Failed to layout mft record.\n"); @@ -4306,7 +4306,7 @@ static void mkntfs_create_root_structure * Create the 16 system files, adding the system information attribute * to each as well as marking them in use in the mft bitmap. */ - for (i = 0; i < 16 + 12 * (vol->major_ver >= 3); i++) { + for (i = 0; i < 16 + 11 * (vol->major_ver >= 3); i++) { u32 file_attrs; m = (MFT_RECORD*)(buf + i * vol->mft_record_size); @@ -4347,9 +4347,6 @@ static void mkntfs_create_root_structure add_attr_std_info(m, file_attrs, cpu_to_le32(0x0101)); } - else if (i == 27) - add_attr_std_info(m, file_attrs, - cpu_to_le32(0x0102)); else add_attr_std_info(m, file_attrs, cpu_to_le32(0x00)); } @@ -4855,28 +4852,6 @@ static void mkntfs_create_root_structure if (err < 0) err_exit("Couldn't create $Reparse: %s\n", strerror(-err)); - Vprintf("Creating System Volume Information (mft record 27)\n"); - m = (MFT_RECORD*)(buf + 27 * vol->mft_record_size); - m->flags |= MFT_RECORD_IS_DIRECTORY; - if (!err) - err = create_hardlink(index_block, root_ref, m, - MK_LE_MREF(27, 27), 0LL, 0LL, - FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM | - FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT, 0, 0, - "SYSTEM~1", FILE_NAME_DOS); - - if (!err) - err = create_hardlink(index_block, root_ref, m, - MK_LE_MREF(27, 27), 0LL, 0LL, - FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM | - FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT, 0, 0, - "System Volume Information", FILE_NAME_WIN32); - if (!err) - err = add_attr_index_root(m, "$I30", 4, 0, AT_FILE_NAME, - COLLATION_FILE_NAME, opts.index_block_size); - if (err < 0) - err_exit("Couldn't create 'System Volume Information'" - ": %s\n", strerror(-err)); } } |
|
From: Szabolcs S. <sz...@us...> - 2005-11-02 20:47:29
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9106/ntfsprogs Modified Files: mkntfs.c Log Message: mkntfs: don't fill the last $MFT cluster with empty MFT records. This is needed to conform to Windows' format behavior for NTFS v3.1 Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -p -r1.86 -r1.87 --- mkntfs.c 2 Nov 2005 18:06:49 -0000 1.86 +++ mkntfs.c 2 Nov 2005 20:47:19 -0000 1.87 @@ -3812,13 +3812,10 @@ static void mkntfs_initialize_bitmaps(vo for (i = opts.nr_clusters; i < lcn_bitmap_byte_size << 3; i++) ntfs_bit_set(lcn_bitmap, (u64)i, 1); /* - * Determine mft_size: (16 (1.2) or 28 (3.0+) mft records) or - * 1 cluster, which ever is bigger, rounded to multiples of cluster - * size + * Determine mft_size: (16 (1.2) or 28 (3.0+) mft records) */ - opts.mft_size = ((16 + 12 * (vol->major_ver >= 3)) * - vol->mft_record_size + vol->cluster_size - 1) - & ~(vol->cluster_size - 1); + opts.mft_size = ((16 + 12 * (vol->major_ver >= 3)) * + vol->mft_record_size); mkDprintf("MFT size = %i (0x%x) bytes\n", opts.mft_size, opts.mft_size); /* Determine mft bitmap size and allocate it. */ mft_bitmap_size = opts.mft_size / vol->mft_record_size; @@ -3903,8 +3900,8 @@ static void mkntfs_initialize_rl_mft(voi strerror(errno)); rl_mft[0].vcn = 0LL; rl_mft[0].lcn = opts.mft_lcn; - /* We already rounded mft size up to a cluster. */ - j = opts.mft_size / vol->cluster_size; + /* rounded up division by cluster size */ + j = (opts.mft_size + vol->cluster_size - 1 ) / vol->cluster_size; rl_mft[1].vcn = rl_mft[0].length = j; rl_mft[1].lcn = -1LL; rl_mft[1].length = 0LL; @@ -4278,7 +4275,6 @@ static void mkntfs_create_root_structure MFT_RECORD *m; MFT_REF root_ref, extend_ref; int i, j, err; - unsigned mft_total_cluster_size; u8 *sd; FILE_ATTR_FLAGS extend_flags; VOLUME_FLAGS volume_flags = 0; @@ -4307,32 +4303,6 @@ static void mkntfs_create_root_structure if ( i == 0) m->sequence_number = cpu_to_le16(1); } /* - * If a cluster contains more than the 16 (ntfs 1.2) or - * 28 (ntfs 3.0+) system files, fill the rest - * with empty, formatted records. - */ - mft_total_cluster_size = vol->cluster_size * - (((16 + 12 * (vol->major_ver >= 3) -1) - * vol->mft_record_size) / vol->cluster_size + 1); - if (mft_total_cluster_size > (16 + 12 * (vol->major_ver >= 3))* - vol->mft_record_size) { - for (i = 16 + 12 * (vol->major_ver >= 3); - i * vol->mft_record_size < mft_total_cluster_size; i++) - { - if (ntfs_mft_record_layout(vol, 0, m = - (MFT_RECORD *)(buf + i * vol->mft_record_size))) - err_exit("Error: Failed to layout mft" - " record.\n"); -#if 0 - if (!opts.quiet && opts.verbose > 1) - dump_mft_record((MFT_RECORD*)buf + - i * vol->mft_record_size); -#endif - m->flags = cpu_to_le16(0); - m->sequence_number = cpu_to_le16(i); - } - } - /* * Create the 16 system files, adding the system information attribute * to each as well as marking them in use in the mft bitmap. */ |
|
From: Szabolcs S. <sz...@us...> - 2005-11-02 20:47:26
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9106 Modified Files: ChangeLog Log Message: mkntfs: don't fill the last $MFT cluster with empty MFT records. This is needed to conform to Windows' format behavior for NTFS v3.1 Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.328 retrieving revision 1.329 diff -u -p -r1.328 -r1.329 --- ChangeLog 30 Oct 2005 23:31:44 -0000 1.328 +++ ChangeLog 2 Nov 2005 20:47:19 -0000 1.329 @@ -56,6 +56,8 @@ xx/xx/2005 - 1.12.2-WIP the device argument: no -d or --device option is needed. (Szaka) - ntfsinfo: figure out and dump index attribute types. (Szaka) - ntfsinfo: dump index attribute keys. (Szaka) + - mkntfs: don't fill the last $MFT cluster with empty MFT records. + This is needed to conform to Windows' format behavior. (Szaka) 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs. |
|
From: Richard R. <fl...@us...> - 2005-11-02 18:06:59
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3019/libntfs Modified Files: attrib.c collate.c dir.c index.c logfile.c volume.c Log Message: a few typos Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.192 retrieving revision 1.193 diff -u -p -r1.192 -r1.193 --- attrib.c 2 Nov 2005 17:34:08 -0000 1.192 +++ attrib.c 2 Nov 2005 18:06:48 -0000 1.193 @@ -2130,7 +2130,7 @@ not_found: * If @type is AT_END, seek to the end of the base mft record ignoring the * attribute list completely and return -1 with errno set to ENOENT. AT_END is * not a valid attribute, its length is zero for example, thus it is safer to - * return error instead of success in this case. It should never ne needed to + * return error instead of success in this case. It should never be needed to * do this, but we implement the functionality because it allows for simpler * code inside ntfs_external_attr_find(). * @@ -3000,7 +3000,7 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T /* Attribute can't be resident. */ is_resident = FALSE; } - /* Calculate atribute record size. */ + /* Calculate attribute record size. */ if (is_resident) attr_rec_size = offsetof(ATTR_RECORD, resident_end) + ((name_len * sizeof(ntfschar) + 7) & ~7) + Index: collate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- collate.c 2 Nov 2005 17:34:08 -0000 1.13 +++ collate.c 2 Nov 2005 18:06:48 -0000 1.14 @@ -156,7 +156,7 @@ static ntfs_collate_func_t ntfs_do_colla * @data2_len: length in bytes of @data2 * * Collate the two data items @data1 and @data2 using the collation rule @cr - * and return -1, 0, ir 1 if @data1 is found, respectively, to collate before, + * and return -1, 0, or 1 if @data1 is found, respectively, to collate before, * to match, or to collate after @data2. * * For speed we use the collation rule @cr as an index into two tables of Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- dir.c 2 Nov 2005 17:34:08 -0000 1.38 +++ dir.c 2 Nov 2005 18:06:48 -0000 1.39 @@ -1216,7 +1216,7 @@ err_out: ntfs_log_trace("Failed.\n"); if (ntfs_mft_record_free(ni->vol, ni)) ntfs_log_error("Failed to free MFT record. " - "Leaving inconsist metadata. Run chkdsk."); + "Leaving inconsistent metadata. Run chkdsk."); free(fn); free(si); errno = err; @@ -1386,20 +1386,20 @@ search: } if (errno != ENOENT) { err = errno; - ntfs_log_error("Atribute enumeration failed. " - "Probably leaving inconsist metadata."); + ntfs_log_error("Attribute enumeration failed. " + "Probably leaving inconsistent metadata."); } /* All extents should be attached after attribute walk. */ while (ni->nr_extents) if (ntfs_mft_record_free(ni->vol, *(ni->extent_nis))) { err = errno; ntfs_log_error("Failed to free extent MFT record. " - "Leaving inconsist metadata."); + "Leaving inconsistent metadata."); } if (ntfs_mft_record_free(ni->vol, ni)) { err = errno; ntfs_log_error("Failed to free base MFT record. " - "Leaving inconsist metadata."); + "Leaving inconsistent metadata."); } ni = NULL; out: @@ -1505,7 +1505,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode ntfs_log_trace("Done.\n"); return 0; rollback_failed: - ntfs_log_error("Rollback failed. Leaving inconsist metadata."); + ntfs_log_error("Rollback failed. Leaving inconsistent metadata."); err_out: ntfs_log_error("Failed.\n"); free(fn); Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- index.c 2 Nov 2005 17:34:08 -0000 1.22 +++ index.c 2 Nov 2005 18:06:49 -0000 1.23 @@ -109,7 +109,7 @@ void ntfs_index_ctx_put(ntfs_index_conte * ntfs_index_ctx_reinit - reinitialize an index context * @ictx: index context to reinitialize * - * Reintialize the index context @ictx so it can be used for ntfs_index_lookup. + * Reinitialize the index context @ictx so it can be used for ntfs_index_lookup. */ void ntfs_index_ctx_reinit(ntfs_index_context *ictx) { @@ -630,14 +630,14 @@ int ntfs_index_rm(ntfs_index_context *ic if (!na) { err = errno; ntfs_log_error("Failed to open INDEX_ROOT attribute. " - "Leaving inconsist metadata."); + "Leaving inconsistent metadata."); goto err_out; } if (ntfs_attr_truncate(na, new_index_length + offsetof( INDEX_ROOT, index))) { err = errno; ntfs_log_error("Failed to truncate INDEX_ROOT " - "attribute. Leaving inconsist " + "attribute. Leaving inconsistent " "metadata."); goto err_out; } Index: logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- logfile.c 27 Oct 2005 20:42:10 -0000 1.14 +++ logfile.c 2 Nov 2005 18:06:49 -0000 1.15 @@ -339,7 +339,7 @@ err_out: * copy of the complete multi sector transfer deprotected page. On failure, * *@wrp is undefined. * - * Simillarly, if @lsn is not NULL, on succes *@lsn will be set to the current + * Similarly, if @lsn is not NULL, on success *@lsn will be set to the current * logfile lsn according to this restart page. On failure, *@lsn is undefined. * * The following error codes are defined: Index: volume.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- volume.c 2 Nov 2005 17:34:08 -0000 1.63 +++ volume.c 2 Nov 2005 18:06:49 -0000 1.64 @@ -626,8 +626,8 @@ exit: * ntfs_hiberfile_open - Find and open '/hiberfil.sys' * @vol: An ntfs volume obtained from ntfs_mount * - * Return: inode Success, hibefil.sys is valid - * NULL hibefil.sys doesn't exist or some other error occurred + * Return: inode Success, hiberfil.sys is valid + * NULL hiberfil.sys doesn't exist or some other error occurred */ static ntfs_inode *ntfs_hiberfile_open(ntfs_volume *vol) { |
|
From: Richard R. <fl...@us...> - 2005-11-02 18:06:59
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3019/ntfsprogs Modified Files: mkntfs.c Log Message: a few typos Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -p -r1.85 -r1.86 --- mkntfs.c 1 Nov 2005 21:09:52 -0000 1.85 +++ mkntfs.c 2 Nov 2005 18:06:49 -0000 1.86 @@ -1448,7 +1448,7 @@ static int mkntfs_attr_find(const ATTR_T * If @type is AT_END, seek to the end of the base mft record ignoring the * attribute list completely and return -1 with errno set to ENOENT. AT_END is * not a valid attribute, its length is zero for example, thus it is safer to - * return error instead of success in this case. It should never ne needed to + * return error instead of success in this case. It should never be needed to * do this, but we implement the functionality because it allows for simpler * code inside ntfs_external_attr_find(). * |
|
From: Richard R. <fl...@us...> - 2005-11-02 17:34:19
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24966/ntfsprogs Modified Files: utils.c Log Message: provide some meaningful function descriptions Index: utils.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- utils.c 30 Oct 2005 22:41:20 -0000 1.58 +++ utils.c 2 Nov 2005 17:34:08 -0000 1.59 @@ -165,7 +165,7 @@ int utils_valid_device(const char *name, } /** - * utils_mount_volume + * utils_mount_volume - Mount an NTFS volume */ ntfs_volume * utils_mount_volume(const char *device, unsigned long flags, BOOL force) { |
|
From: Richard R. <fl...@us...> - 2005-11-02 17:34:17
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24966/libntfs Modified Files: attrib.c bitmap.c collate.c compat.c dir.c index.c inode.c mft.c rich.c runlist.c tree.c unistr.c unix_io.c volume.c Log Message: provide some meaningful function descriptions Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.191 retrieving revision 1.192 diff -u -p -r1.191 -r1.192 --- attrib.c 30 Oct 2005 16:12:22 -0000 1.191 +++ attrib.c 2 Nov 2005 17:34:08 -0000 1.192 @@ -59,7 +59,7 @@ ntfschar AT_UNNAMED[] = { const_cpu_to_le16('\0') }; /** - * ntfs_get_attribute_value_length - + * ntfs_get_attribute_value_length - Find the length of an attribute * @a: * * Description... @@ -82,7 +82,7 @@ s64 ntfs_get_attribute_value_length(cons } /** - * ntfs_get_attribute_value - + * ntfs_get_attribute_value - Get a copy of an attribute * @vol: * @a: * @b: @@ -2967,7 +2967,7 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T /* @val is mandatory. */ if (!val) { ntfs_log_trace("val is mandatory for always resident " - "atributes.\n"); + "attributes.\n"); errno = EINVAL; return -1; } Index: bitmap.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bitmap.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- bitmap.c 30 Oct 2005 16:12:23 -0000 1.17 +++ bitmap.c 2 Nov 2005 17:34:08 -0000 1.18 @@ -228,7 +228,7 @@ int ntfs_bitmap_clear_run(ntfs_attr *na, #include "rich.h" /** - * ntfs_bmp_rollback - + * ntfs_bmp_rollback - Discard the in-memory bitmap changes * @bmp: * * Description... @@ -257,7 +257,7 @@ int ntfs_bmp_rollback(struct ntfs_bmp *b } /** - * ntfs_bmp_commit - + * ntfs_bmp_commit - Write the cached bitmap data to disk * @bmp: * * Description... @@ -311,7 +311,7 @@ int ntfs_bmp_commit(struct ntfs_bmp *bmp } /** - * ntfs_bmp_free - + * ntfs_bmp_free - Destroy a bitmap object * @bmp: * * Description... @@ -332,7 +332,7 @@ void ntfs_bmp_free(struct ntfs_bmp *bmp) } /** - * ntfs_bmp_create - + * ntfs_bmp_create - Create a representation of a bitmap * @inode: * @type: * @name: @@ -372,7 +372,7 @@ struct ntfs_bmp * ntfs_bmp_create(ntfs_i } /** - * ntfs_bmp_add_data - + * ntfs_bmp_add_data - Add a bitmap block to the current cache * @bmp: * @vcn: * @data: @@ -416,7 +416,7 @@ int ntfs_bmp_add_data(struct ntfs_bmp *b } /** - * ntfs_bmp_get_data - + * ntfs_bmp_get_data - Ask for a bitmap block from the cache * @bmp: * @vcn: * @@ -466,7 +466,7 @@ u8 * ntfs_bmp_get_data(struct ntfs_bmp * } /** - * ntfs_bmp_set_range - + * ntfs_bmp_set_range - Set a range of bits in the bitmap * @bmp: * @vcn: * @length: @@ -563,7 +563,7 @@ int ntfs_bmp_set_range(struct ntfs_bmp * } /** - * ntfs_bmp_find_last_set - + * ntfs_bmp_find_last_set - Find the last set bit in the bitmap * @bmp: * * Description... @@ -632,7 +632,7 @@ s64 ntfs_bmp_find_last_set(struct ntfs_b } /** - * ntfs_bmp_find_space - + * ntfs_bmp_find_space - Find an unused block of bits in a bitmap * @bmp: * @start: * @size: Index: collate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- collate.c 30 Oct 2005 16:12:23 -0000 1.12 +++ collate.c 2 Nov 2005 17:34:08 -0000 1.13 @@ -34,7 +34,7 @@ #include "logging.h" /** - * ntfs_collate_binary - + * ntfs_collate_binary - Which of two binary objects should be listed first * @vol: unused * @data1: * @data1_len: @@ -64,7 +64,7 @@ static int ntfs_collate_binary(ntfs_volu } /** - * ntfs_collate_ntofs_ulong - + * ntfs_collate_ntofs_ulong - Which of two long ints should be listed first * @vol: unused * @data1: * @data1_len: @@ -102,7 +102,7 @@ static int ntfs_collate_ntofs_ulong(ntfs } /** - * ntfs_collate_file_name - + * ntfs_collate_file_name - Which of two filenames should be listed first * @vol: * @data1: * @data1_len: unused Index: compat.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/compat.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- compat.c 30 Oct 2005 16:12:23 -0000 1.9 +++ compat.c 2 Nov 2005 17:34:08 -0000 1.10 @@ -32,7 +32,7 @@ #ifndef HAVE_FFS /** - * ffs - + * ffs - Find the first set bit in an int * @x: * * Description... Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- dir.c 31 Oct 2005 01:15:12 -0000 1.37 +++ dir.c 2 Nov 2005 17:34:08 -0000 1.38 @@ -1358,7 +1358,7 @@ search: /* * If hard link count is not equal to zero then we are done. In other * case there are no reference to this inode left, so we should free all - * non-resident atributes and mark inode as not in use. + * non-resident attributes and mark inode as not in use. */ if (ni->mrec->link_count) goto out; @@ -1372,13 +1372,13 @@ search: if (!rl) { err = errno; ntfs_log_error("Failed to decompress runlist. " - "Leaving inconsist metadata."); + "Leaving inconsistent metadata."); continue; } if (ntfs_cluster_free_from_rl(ni->vol, rl)) { err = errno; ntfs_log_error("Failed to free clusters. " - "Leaving inconsist metadata."); + "Leaving inconsistent metadata."); continue; } free(rl); @@ -1522,7 +1522,7 @@ err_out: #include "rich.h" /** - * ntfs_dir_rollback - + * ntfs_dir_rollback - Discard the in-memory directory changes * @dir: * * Description... @@ -1554,7 +1554,7 @@ int ntfs_dir_rollback(struct ntfs_dir *d } /** - * ntfs_dir_truncate - + * ntfs_dir_truncate - Shrink an index allocation * @vol: * @dir: * @@ -1707,7 +1707,7 @@ int ntfs_dir_truncate(ntfs_volume *vol, } /** - * ntfs_dir_commit - + * ntfs_dir_commit - Write to disk the in-memory directory changes * @dir: * * Description... @@ -1744,7 +1744,7 @@ int ntfs_dir_commit(struct ntfs_dir *dir } /** - * ntfs_dir_free - + * ntfs_dir_free - Destroy a directory object * @dir: * * Description... @@ -1789,7 +1789,7 @@ void ntfs_dir_free(struct ntfs_dir *dir) } /** - * ntfs_dir_create - + * ntfs_dir_create - Create a representation of a directory * @vol: * @mft_num: * @@ -1863,7 +1863,7 @@ struct ntfs_dir * ntfs_dir_create(ntfs_v } /** - * ntfs_dir_add - + * ntfs_dir_add - Add a directory to another as a child * @parent: * @child: * @@ -1890,7 +1890,7 @@ void ntfs_dir_add(struct ntfs_dir *paren } /** - * ntfs_dir_find2 - + * ntfs_dir_find2 - Find a directory by name * @dir: * @name: * @name_len: Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- index.c 30 Oct 2005 16:12:23 -0000 1.21 +++ index.c 2 Nov 2005 17:34:08 -0000 1.22 @@ -662,7 +662,7 @@ err_out: #include "rich.h" /** - * ntfs_ie_free - + * ntfs_ie_free - Destroy an index entry object * @ie: * * Description... @@ -676,7 +676,7 @@ void ntfs_ie_free(INDEX_ENTRY *ie) } /** - * ntfs_ie_create - + * ntfs_ie_create - Create a representation of an directory index entry * * Description... * @@ -702,7 +702,7 @@ INDEX_ENTRY * ntfs_ie_create(void) } /** - * ntfs_ie_get_vcn - + * ntfs_ie_get_vcn - Get the VCN associated with an index entry * @ie: * * Description... @@ -721,7 +721,7 @@ VCN ntfs_ie_get_vcn(INDEX_ENTRY *ie) } /** - * ntfs_ie_copy - + * ntfs_ie_copy - Create a copy of an index entry * @ie: * * Description... @@ -745,7 +745,7 @@ INDEX_ENTRY * ntfs_ie_copy(INDEX_ENTRY * } /** - * ntfs_ie_set_vcn - + * ntfs_ie_set_vcn - Set VCN associated with an index entry * @ie: * @vcn: * @@ -773,7 +773,7 @@ INDEX_ENTRY * ntfs_ie_set_vcn(INDEX_ENTR } /** - * ntfs_ie_remove_vcn - + * ntfs_ie_remove_vcn - Remove the VCN associated with an index entry * @ie: * * Description... @@ -795,7 +795,7 @@ INDEX_ENTRY * ntfs_ie_remove_vcn(INDEX_E } /** - * ntfs_ie_set_name - + * ntfs_ie_set_name - Associate a name with an index entry * @ie: * @name: * @namelen: @@ -891,7 +891,7 @@ INDEX_ENTRY * ntfs_ie_set_name(INDEX_ENT } /** - * ntfs_ie_remove_name - + * ntfs_ie_remove_name - Remove the name from an index-entry * @ie: * * Description... Index: inode.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- inode.c 30 Oct 2005 16:12:23 -0000 1.74 +++ inode.c 2 Nov 2005 17:34:08 -0000 1.75 @@ -50,7 +50,7 @@ #include "logging.h" /** - * __ntfs_inode_allocate - + * __ntfs_inode_allocate - Create and initialise an NTFS inode object * @vol: * * Description... @@ -68,7 +68,7 @@ static __inline__ ntfs_inode *__ntfs_ino } /** - * ntfs_inode_allocate - + * ntfs_inode_allocate - Create an NTFS inode object * @vol: * * Description... @@ -81,7 +81,7 @@ ntfs_inode *ntfs_inode_allocate(ntfs_vol } /** - * __ntfs_inode_release - + * __ntfs_inode_release - Destroy an NTFS inode object * @ni: * * Description... @@ -1073,7 +1073,7 @@ put_err_out: #include "rich.h" /** - * ntfs_inode_close2 - + * ntfs_inode_close2 - Close an inode, freeing any resources * @ni: * * Description... @@ -1101,7 +1101,7 @@ int ntfs_inode_close2(ntfs_inode *ni) } /** - * ntfs_inode_open2 - + * ntfs_inode_open2 - Open an inode and initialise it * @vol: * @mref: * @@ -1156,7 +1156,7 @@ ntfs_inode * ntfs_inode_open2(ntfs_volum } /** - * ntfs_inode_open3 - + * ntfs_inode_open3 - Open an inode and initialise it * @vol: * @mref: * Index: mft.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- mft.c 30 Oct 2005 16:12:23 -0000 1.40 +++ mft.c 2 Nov 2005 17:34:08 -0000 1.41 @@ -392,7 +392,7 @@ static const char *es = " Leaving incon #endif /** - * ntfs_ffz - + * ntfs_ffz - Find the first unset (zero) bit in a word * @word: * * Description... @@ -1566,7 +1566,7 @@ sync_rollback: #include "rich.h" /** - * ntfs_mft_remove_attr - + * ntfs_mft_remove_attr - Remove an attribute from an MFT record * @bmp: * @inode: * @type: @@ -1632,7 +1632,7 @@ int ntfs_mft_remove_attr(struct ntfs_bmp } /** - * ntfs_mft_add_attr - + * ntfs_mft_add_attr - Add an attribute to an MFT record * @inode: * @type: * @data: @@ -1710,7 +1710,7 @@ ATTR_RECORD * ntfs_mft_add_attr(ntfs_ino } /** - * ntfs_mft_resize_resident - + * ntfs_mft_resize_resident - Resize a resident attribute in an MFT record * @inode: * @type: * @name: @@ -1819,7 +1819,7 @@ done: } /** - * ntfs_mft_free_space - + * ntfs_mft_free_space - Calculate the free space (bytes) in an MFT record * @dir: * * Description... @@ -1843,7 +1843,7 @@ int ntfs_mft_free_space(struct ntfs_dir } /** - * ntfs_mft_add_index - + * ntfs_mft_add_index - Add an index (directory) to an MFT record * @dir: * * Description... Index: rich.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/rich.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- rich.c 30 Oct 2005 16:12:23 -0000 1.5 +++ rich.c 2 Nov 2005 17:34:08 -0000 1.6 @@ -112,7 +112,7 @@ ATTR_RECORD * find_first_attribute(const } /** - * ntfs_name_print - + * ntfs_name_print - Send a Unicode name to the debug log * @name: * @name_len: * @@ -134,7 +134,7 @@ void ntfs_name_print(ntfschar *name, int } /** - * utils_free_non_residents3 - + * utils_free_non_residents3 - Free all the non-resident attributes of an inode * @bmp: * @inode: * @attr: @@ -178,7 +178,7 @@ int utils_free_non_residents3(struct ntf } /** - * utils_free_non_residents2 - + * utils_free_non_residents2 - Find all the non-resident attributes of an inode * @inode: * @bmp: * Index: runlist.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -p -r1.65 -r1.66 --- runlist.c 31 Oct 2005 01:15:12 -0000 1.65 +++ runlist.c 2 Nov 2005 17:34:08 -0000 1.66 @@ -1718,7 +1718,7 @@ s64 ntfs_rl_get_compressed_size(ntfs_vol } */ /** - * test_rl_dump_runlist - + * test_rl_dump_runlist - Runlist test: Display the contents of a runlist * @rl: * * Description... @@ -1770,7 +1770,7 @@ static void test_rl_dump_runlist(const r } /** - * test_rl_runlists_merge - + * test_rl_runlists_merge - Runlist test: Merge two runlists * @drl: * @srl: * @@ -1796,7 +1796,7 @@ static runlist_element * test_rl_runlist } /** - * test_rl_read_buffer - + * test_rl_read_buffer - Runlist test: Read a file containing a runlist * @file: * @buf: * @bufsize: @@ -1825,7 +1825,7 @@ static int test_rl_read_buffer(const cha } /** - * test_rl_pure_src - + * test_rl_pure_src - Runlist test: Complicate the simple tests a little * @contig: * @multi: * @vcn: @@ -1860,7 +1860,7 @@ static runlist_element * test_rl_pure_sr } /** - * test_rl_pure_test - + * test_rl_pure_test - Runlist test: Perform tests using simple runlists * @test: * @contig: * @multi: @@ -1891,7 +1891,7 @@ static void test_rl_pure_test(int test, } /** - * test_rl_pure - + * test_rl_pure - Runlist test: Create tests using simple runlists * @contig: * @multi: * @@ -1991,7 +1991,7 @@ static void test_rl_pure(char *contig, c } /** - * test_rl_zero - + * test_rl_zero - Runlist test: Merge a zero-length runlist * * Description... * @@ -2017,7 +2017,7 @@ static void test_rl_zero(void) } /** - * test_rl_frag_combine - + * test_rl_frag_combine - Runlist test: Perform tests using fragmented files * @vol: * @attr1: * @attr2: @@ -2053,7 +2053,7 @@ static void test_rl_frag_combine(ntfs_vo } /** - * test_rl_frag - + * test_rl_frag - Runlist test: Create tests using very fragmented files * @test: * * Description... @@ -2098,7 +2098,7 @@ out: } /** - * test_rl_main - + * test_rl_main - Runlist test: Program start (main) * @argc: * @argv: * Index: tree.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/tree.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- tree.c 30 Oct 2005 16:12:23 -0000 1.8 +++ tree.c 2 Nov 2005 17:34:08 -0000 1.9 @@ -42,7 +42,7 @@ #include "rich.h" /** - * ntfs_dt_free - + * ntfs_dt_free - Destroy a directory-tree object * @dt: * * Description... @@ -71,7 +71,7 @@ void ntfs_dt_free(struct ntfs_dt *dt) } /** - * ntfs_dt_rollback - + * ntfs_dt_rollback - Discard the in-memory directory-tree changes * @dt: * * Description... @@ -123,7 +123,7 @@ int ntfs_dt_rollback(struct ntfs_dt *dt) } /** - * ntfs_dt_commit - + * ntfs_dt_commit - Write to disk the in-memory directory-tree changes * @dt: * * Description... @@ -186,7 +186,7 @@ int ntfs_dt_commit(struct ntfs_dt *dt) } /** - * ntfs_dt_create_children2 - + * ntfs_dt_create_children2 - Allocate space for the directory-tree's children * @dt: * @count: * @@ -220,7 +220,7 @@ BOOL ntfs_dt_create_children2(struct ntf } /** - * ntfs_dt_resize_children3 - + * ntfs_dt_resize_children3 - Resize a directory-tree's children arrays * @dt: * @new: * @@ -266,7 +266,7 @@ BOOL ntfs_dt_resize_children3(struct ntf } /** - * ntfs_dt_root_count - + * ntfs_dt_root_count - Count the index entries in an index root * @dt: * * Description... @@ -334,7 +334,7 @@ int ntfs_dt_root_count(struct ntfs_dt *d } /** - * ntfs_dt_alloc_count - + * ntfs_dt_alloc_count - Count the index entries in an index allocation * @dt: * * Description... @@ -398,7 +398,7 @@ int ntfs_dt_alloc_count(struct ntfs_dt * } /** - * ntfs_dt_initialise2 - + * ntfs_dt_initialise2 - Setup a directory-tree object * @vol: * @dt: * @@ -447,7 +447,7 @@ int ntfs_dt_initialise2(ntfs_volume *vol } /** - * ntfs_dt_create - + * ntfs_dt_create - Create a representation of a directory index * @dir: * @parent: * @vcn: @@ -554,7 +554,7 @@ struct ntfs_dt * ntfs_dt_create(struct n } /** - * ntfs_dt_find - + * ntfs_dt_find - Find an index entry by name * @dt: * @name: * @name_len: @@ -634,7 +634,7 @@ MFT_REF ntfs_dt_find(struct ntfs_dt *dt, } /** - * ntfs_dt_find2 - + * ntfs_dt_find2 - Find an index entry by name * @dt: * @name: * @name_len: @@ -718,7 +718,7 @@ struct ntfs_dt * ntfs_dt_find2(struct nt } /** - * ntfs_dt_find3 - + * ntfs_dt_find3 - Find an index entry by name * @dt: * @name: * @name_len: @@ -784,7 +784,7 @@ struct ntfs_dt * ntfs_dt_find3(struct nt } /** - * ntfs_dt_find4 - + * ntfs_dt_find4 - Find an index entry by name * @dt: * @name: * @name_len: @@ -858,7 +858,7 @@ struct ntfs_dt * ntfs_dt_find4(struct nt } /** - * ntfs_dt_find_all - + * ntfs_dt_find_all - Recurse the directory-tree, mapping all elements * @dt: * * maps all dt's into memory @@ -887,7 +887,7 @@ void ntfs_dt_find_all(struct ntfs_dt *dt } /** - * ntfs_dt_find_parent - + * ntfs_dt_find_parent - Find the index of ourself in the parent's array * @dt: * * Description... @@ -915,7 +915,7 @@ int ntfs_dt_find_parent(struct ntfs_dt * } /** - * ntfs_dt_isroot - + * ntfs_dt_isroot - Does this directory-tree represent an index root * @dt: * * Description... @@ -931,7 +931,7 @@ BOOL ntfs_dt_isroot(struct ntfs_dt *dt) } /** - * ntfs_dt_root_freespace - + * ntfs_dt_root_freespace - Give the free space (bytes) in an index root * @dt: * * Description... @@ -957,7 +957,7 @@ int ntfs_dt_root_freespace(struct ntfs_d } /** - * ntfs_dt_alloc_freespace - + * ntfs_dt_alloc_freespace - Give the free space (bytes) in an index allocation * @dt: * * Description... @@ -983,7 +983,7 @@ int ntfs_dt_alloc_freespace(struct ntfs_ } /** - * ntfs_dt_transfer - + * ntfs_dt_transfer - Transfer several index entries between directory-trees * @old: * @new: * @start: @@ -1141,7 +1141,7 @@ int ntfs_dt_transfer(struct ntfs_dt *old } /** - * ntfs_dt_alloc_insert - + * ntfs_dt_alloc_insert - Insert an index entry into an index allocation * @dt: * @first: * @count: @@ -1212,7 +1212,7 @@ int ntfs_dt_alloc_insert(struct ntfs_dt } /** - * ntfs_dt_alloc_insert2 - + * ntfs_dt_alloc_insert2 - Insert an index entry into an index allocation * @dt: * @before: * @count: @@ -1287,7 +1287,7 @@ INDEX_ENTRY * ntfs_dt_alloc_insert2(stru } /** - * ntfs_dt_root_insert - + * ntfs_dt_root_insert - Insert an index entry into an index root * @dt: * @first: * @count: @@ -1308,7 +1308,7 @@ int ntfs_dt_root_insert(struct ntfs_dt * } /** - * ntfs_dt_alloc_remove2 - + * ntfs_dt_alloc_remove2 - Remove an index entry from an index allocation * @dt: * @start: * @count: @@ -1335,7 +1335,7 @@ int ntfs_dt_alloc_remove2(struct ntfs_dt } /** - * ntfs_dt_root_remove2 - + * ntfs_dt_root_remove2 - Remove an index entry from an index root * @dt: * @start: * @count: @@ -1384,7 +1384,7 @@ int ntfs_dt_root_remove2(struct ntfs_dt } /** - * ntfs_dt_transfer2 - + * ntfs_dt_transfer2 - Transfer several index entries between directory-trees * @old: * @new: * @start: @@ -1553,7 +1553,7 @@ int ntfs_dt_transfer2(struct ntfs_dt *ol } /** - * ntfs_dt_root_replace - + * ntfs_dt_root_replace - Replace an index entry in an index root * @del: * @del_num: * @del_ie: @@ -1641,7 +1641,7 @@ int ntfs_dt_root_replace(struct ntfs_dt } /** - * ntfs_dt_alloc_replace - + * ntfs_dt_alloc_replace - Replace an index entry in an index allocation * @del: * @del_num: * @del_ie: @@ -1712,7 +1712,7 @@ BOOL ntfs_dt_alloc_replace(struct ntfs_d } /** - * ntfs_dt_root_remove - + * ntfs_dt_root_remove - Remove an index entry from an index root * @del: * @del_num: * @@ -1840,7 +1840,7 @@ BOOL ntfs_dt_root_remove(struct ntfs_dt } /** - * ntfs_dt_alloc_remove - + * ntfs_dt_alloc_remove - Remove an index entry from an index allocation * @del: * @del_num: * @@ -1969,7 +1969,7 @@ BOOL ntfs_dt_alloc_remove(struct ntfs_dt } /** - * ntfs_dt_alloc_add - + * ntfs_dt_alloc_add - Add an index entry to an index allocation * @parent: * @index_num: * @ie: @@ -2066,7 +2066,7 @@ int ntfs_dt_alloc_add(struct ntfs_dt *pa } /** - * ntfs_dt_root_add - + * ntfs_dt_root_add - Add an index entry to an index root * @parent: * @index_num: * @ie: @@ -2177,7 +2177,7 @@ int ntfs_dt_root_add(struct ntfs_dt *par } /** - * ntfs_dt_add2 - + * ntfs_dt_add2 - Add an index entry to a directory-tree * @ie: * @suc: * @suc_num: Index: unistr.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- unistr.c 30 Oct 2005 16:12:23 -0000 1.32 +++ unistr.c 2 Nov 2005 17:34:08 -0000 1.33 @@ -307,7 +307,7 @@ ntfschar *ntfs_ucsndup(const ntfschar *s } /** - * ntfs_name_upcase - + * ntfs_name_upcase - Map an Unicode name to its uppercase equivalent * @name: * @name_len: * @upcase: @@ -329,7 +329,7 @@ void ntfs_name_upcase(ntfschar *name, u3 } /** - * ntfs_file_value_upcase - + * ntfs_file_value_upcase - Convert a filename to upper case * @file_name_attr: * @upcase: * @upcase_len: @@ -346,7 +346,7 @@ void ntfs_file_value_upcase(FILE_NAME_AT } /** - * ntfs_file_values_compare - + * ntfs_file_values_compare - Which of two filenames should be listed first * @file_name_attr1: * @file_name_attr2: * @err_val: Index: unix_io.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unix_io.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- unix_io.c 30 Oct 2005 16:12:23 -0000 1.7 +++ unix_io.c 2 Nov 2005 17:34:08 -0000 1.8 @@ -67,7 +67,7 @@ #define DEV_FD(dev) (*(int *)dev->d_private) /** - * ntfs_device_unix_io_open - + * ntfs_device_unix_io_open - Open a device and lock it exclusively * @dev: * @flags: * @@ -122,7 +122,7 @@ err_out: } /** - * ntfs_device_unix_io_close - + * ntfs_device_unix_io_close - Close the device, releasing the lock * @dev: * * Description... @@ -157,7 +157,7 @@ static int ntfs_device_unix_io_close(str } /** - * ntfs_device_unix_io_seek - + * ntfs_device_unix_io_seek - Seek to a place on the device * @dev: * @offset: * @whence: @@ -173,7 +173,7 @@ static s64 ntfs_device_unix_io_seek(stru } /** - * ntfs_device_unix_io_read - + * ntfs_device_unix_io_read - Read from the device, from the current location * @dev: * @buf: * @count: @@ -189,7 +189,7 @@ static s64 ntfs_device_unix_io_read(stru } /** - * ntfs_device_unix_io_write - + * ntfs_device_unix_io_write - Write to the device, at the current location * @dev: * @buf: * @count: @@ -210,7 +210,7 @@ static s64 ntfs_device_unix_io_write(str } /** - * ntfs_device_unix_io_pread - + * ntfs_device_unix_io_pread - Perform a positioned read from the device * @dev: * @buf: * @count: @@ -227,7 +227,7 @@ static s64 ntfs_device_unix_io_pread(str } /** - * ntfs_device_unix_io_pwrite - + * ntfs_device_unix_io_pwrite - Perform a positioned write to the device * @dev: * @buf: * @count: @@ -249,7 +249,7 @@ static s64 ntfs_device_unix_io_pwrite(st } /** - * ntfs_device_unix_io_sync - + * ntfs_device_unix_io_sync - Flush any buffered changes to the device * @dev: * * Description... @@ -268,7 +268,7 @@ static int ntfs_device_unix_io_sync(stru } /** - * ntfs_device_unix_io_stat - + * ntfs_device_unix_io_stat - Get information about the device * @dev: * @buf: * @@ -282,7 +282,7 @@ static int ntfs_device_unix_io_stat(stru } /** - * ntfs_device_unix_io_ioctl - + * ntfs_device_unix_io_ioctl - Perform an ioctl on the device * @dev: * @request: * @argp: Index: volume.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- volume.c 30 Oct 2005 16:12:23 -0000 1.62 +++ volume.c 2 Nov 2005 17:34:08 -0000 1.63 @@ -67,7 +67,7 @@ #endif /** - * ntfs_volume_alloc - + * ntfs_volume_alloc - Create an NTFS volume object and initialise it * * Description... * @@ -95,7 +95,7 @@ ntfs_volume *ntfs_volume_alloc(void) } /** - * __ntfs_volume_release - + * __ntfs_volume_release - Destroy an NTFS volume object * @v: * * Description... @@ -1606,7 +1606,7 @@ int utils_valid_device(const char *name, } /** - * utils_mount_volume - + * utils_mount_volume - Mount an NTFS volume * @device: * @flags: * @force: @@ -1660,7 +1660,7 @@ ntfs_volume * utils_mount_volume(const c } /** - * ntfs_volume_commit - + * ntfs_volume_commit - Write to disk the in-memory volume changes * @vol: * * Description... @@ -1687,7 +1687,7 @@ int ntfs_volume_commit(ntfs_volume *vol) } /** - * ntfs_volume_rollback - + * ntfs_volume_rollback - Discard the in-memory volume changes * @vol: * * Description... @@ -1713,7 +1713,7 @@ int ntfs_volume_rollback(ntfs_volume *vo } /** - * ntfs_volume_umount2 - + * ntfs_volume_umount2 - Unmount an NTFS volume, using the new directory support * @vol: * @force: * @@ -1748,7 +1748,7 @@ int ntfs_volume_umount2(ntfs_volume *vol } /** - * ntfs_volume_mount2 - + * ntfs_volume_mount2 - Mount an NTFS volume, using the new directory support * @device: * @flags: * @force: |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 23:14:44
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26146/ntfsprogs Modified Files: ntfsinfo.c Log Message: Fix $Quota::$O key sub authority dumping; dump authorities in hexa Index: ntfsinfo.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -p -r1.90 -r1.91 --- ntfsinfo.c 30 Oct 2005 23:31:44 -0000 1.90 +++ ntfsinfo.c 1 Nov 2005 23:14:34 -0000 1.91 @@ -1153,15 +1153,15 @@ static void ntfs_dump_index_key(INDEX_EN entry->key.sid.revision); ntfs_log_verbose("\t\tKey sub authority count: %u\n", entry->key.sid.sub_authority_count); - ntfs_log_verbose("\t\tKey ident. auth. high: %u\n", + ntfs_log_verbose("\t\tKey ident. auth. high: 0x%04x\n", le16_to_cpu(entry->key.sid. identifier_authority.high_part)); - ntfs_log_verbose("\t\tKey ident. auth. low: %u\n", + ntfs_log_verbose("\t\tKey ident. auth. low: 0x%08x\n", le32_to_cpu(entry->key.sid. identifier_authority.low_part)); for (i = 0; i < entry->key.sid.sub_authority_count; i++) - ntfs_log_verbose("\t\tKey sub authority:\t %u\n", - le32_to_cpu(entry->key.sid.sub_authority)); + ntfs_log_verbose("\t\tKey sub authority:\t 0x%08x\n", + le32_to_cpu(entry->key.sid.sub_authority[i])); break; case INDEX_ATTR_QUOTA_Q: ntfs_log_verbose("\t\tKey owner id:\t\t %u\n", |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 21:10:03
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31257/libntfs Modified Files: security.c Log Message: simplified ntfs_generate_guid() Index: security.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/security.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- security.c 1 Nov 2005 20:24:37 -0000 1.14 +++ security.c 1 Nov 2005 21:09:52 -0000 1.15 @@ -252,26 +252,21 @@ err_out: /** * ntfs_generate_guid - generatates a random current guid. - * @guid: a pointer to a GUID struct to hold the generated guid. + * @guid: [OUT] pointer to a GUID struct to hold the generated guid. * * perhaps not a very good random number generator though... - * - * Returns: The same pointer it was given as a parameter (guid). */ -GUID *ntfs_generate_guid(GUID *guid) +void ntfs_generate_guid(GUID *guid) { - int i; - static u8 array[16]; + u8 *p = (u8 *)guid; - for (i = 0; i < 16; i++) { - array[i] = (u8)(random() & 0xFF); + for (i = 0; i < sizeof(GUID); i++) { + p[i] = (u8)(random() & 0xFF); if (i == 7) - array[7] = (array[7] & 0x0F) | 0x40; + p[7] = (p[7] & 0x0F) | 0x40; if (i == 8) - array[8] = (array[8] & 0x3F) | 0x80; + p[8] = (p[8] & 0x3F) | 0x80; } - memcpy(guid, array, sizeof(guid)); - return guid; } |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 21:10:03
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31257/ntfsprogs Modified Files: mkntfs.c Log Message: simplified ntfs_generate_guid() Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -p -r1.84 -r1.85 --- mkntfs.c 1 Nov 2005 20:24:37 -0000 1.84 +++ mkntfs.c 1 Nov 2005 21:09:52 -0000 1.85 @@ -4202,7 +4202,7 @@ static void create_file_volume(MFT_RECOR } if (!err && vol->major_ver>=3) { volume_obj_id=(OBJECT_ID_ATTR*)calloc(1,0x10); - volume_obj_id->object_id = *ntfs_generate_guid(&volume_obj_id->object_id); + ntfs_generate_guid(&volume_obj_id->object_id); err = add_attr_object_id(m, volume_obj_id, 0x10); } if (!err) |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 21:10:03
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31257/include/ntfs Modified Files: security.h Log Message: simplified ntfs_generate_guid() Index: security.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/security.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- security.h 1 Nov 2005 20:24:37 -0000 1.7 +++ security.h 1 Nov 2005 21:09:52 -0000 1.8 @@ -50,6 +50,6 @@ static __inline__ BOOL ntfs_sid_is_valid extern int ntfs_sid_to_mbs_size(const SID *sid); extern char *ntfs_sid_to_mbs(const SID *sid, char *sid_str, size_t sid_str_size); -extern GUID *ntfs_generate_guid(GUID *guid); +extern void ntfs_generate_guid(GUID *guid); #endif /* defined _NTFS_SECURITY_H */ |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 20:24:46
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20837/ntfsprogs Modified Files: mkntfs.c Log Message: ntfs_ prefix generate_guid() Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -p -r1.83 -r1.84 --- mkntfs.c 1 Nov 2005 20:19:32 -0000 1.83 +++ mkntfs.c 1 Nov 2005 20:24:37 -0000 1.84 @@ -4202,7 +4202,7 @@ static void create_file_volume(MFT_RECOR } if (!err && vol->major_ver>=3) { volume_obj_id=(OBJECT_ID_ATTR*)calloc(1,0x10); - volume_obj_id->object_id = *generate_guid(&volume_obj_id->object_id); + volume_obj_id->object_id = *ntfs_generate_guid(&volume_obj_id->object_id); err = add_attr_object_id(m, volume_obj_id, 0x10); } if (!err) |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 20:24:45
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20837/include/ntfs Modified Files: security.h Log Message: ntfs_ prefix generate_guid() Index: security.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/security.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- security.h 31 Oct 2005 01:15:12 -0000 1.6 +++ security.h 1 Nov 2005 20:24:37 -0000 1.7 @@ -50,6 +50,6 @@ static __inline__ BOOL ntfs_sid_is_valid extern int ntfs_sid_to_mbs_size(const SID *sid); extern char *ntfs_sid_to_mbs(const SID *sid, char *sid_str, size_t sid_str_size); -extern GUID *generate_guid(GUID *guid); +extern GUID *ntfs_generate_guid(GUID *guid); #endif /* defined _NTFS_SECURITY_H */ |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 20:24:45
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20837/libntfs Modified Files: security.c Log Message: ntfs_ prefix generate_guid() Index: security.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/security.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- security.c 30 Oct 2005 16:12:23 -0000 1.13 +++ security.c 1 Nov 2005 20:24:37 -0000 1.14 @@ -251,14 +251,14 @@ err_out: } /** - * generate_guid - generatates a random current guid. + * ntfs_generate_guid - generatates a random current guid. * @guid: a pointer to a GUID struct to hold the generated guid. * * perhaps not a very good random number generator though... * * Returns: The same pointer it was given as a parameter (guid). */ -GUID *generate_guid(GUID *guid) +GUID *ntfs_generate_guid(GUID *guid) { int i; |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 20:19:43
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19674/ntfsprogs Modified Files: mkntfs.c Log Message: fix casting to quota's owner_id Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.82 retrieving revision 1.83 diff -u -p -r1.82 -r1.83 --- mkntfs.c 1 Nov 2005 19:56:08 -0000 1.82 +++ mkntfs.c 1 Nov 2005 20:19:32 -0000 1.83 @@ -2993,7 +2993,7 @@ static int initialize_quota(MFT_RECORD * idx_entry_q1->key_length = cpu_to_le16(0x04); idx_entry_q1->flags = cpu_to_le16(0x00); idx_entry_q1->reserved = cpu_to_le16(0x00); - idx_entry_q1->key.owner_id = cpu_to_le16(0x01); + idx_entry_q1->key.owner_id = cpu_to_le32(0x01); idx_entry_q1_data = (QUOTA_CONTROL_ENTRY*)((char*)idx_entry_q1 + idx_entry_q1->data_offset); idx_entry_q1_data->version = cpu_to_le32(0x02); |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 20:18:36
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19525/include/ntfs Modified Files: layout.h Log Message: fix type of owner_id in QUOTA_O_INDEX_DATA Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- layout.h 1 Nov 2005 20:01:03 -0000 1.39 +++ layout.h 1 Nov 2005 20:18:27 -0000 1.40 @@ -1899,7 +1899,7 @@ typedef struct { * struct QUOTA_O_INDEX_DATA - */ typedef struct { - u64 owner_id; + u32 owner_id; } __attribute__((__packed__)) QUOTA_O_INDEX_DATA; /** |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 20:01:16
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14568/include/ntfs Modified Files: layout.h Log Message: Add missing full stops; rename SDS to $SDS Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- layout.h 1 Nov 2005 19:56:08 -0000 1.38 +++ layout.h 1 Nov 2005 20:01:03 -0000 1.39 @@ -1880,9 +1880,9 @@ typedef struct { typedef struct { u32 hash; /* Hash of the security descriptor. */ u32 security_id; /* The security_id assigned to the descriptor. */ - u64 offset_in_sds; /* Offset of the descriptor in SDS data stream */ - u32 size_in_sds; /* Size of the descriptor in SDS data stream */ - u32 reserved_II; /* Padding - always unicode "II" */ + u64 offset_in_sds; /* Offset of the descriptor in $SDS data stream. */ + u32 size_in_sds; /* Size of the descriptor in $SDS data stream. */ + u32 reserved_II; /* Padding - always unicode "II". */ } __attribute__((__packed__)) SDH_INDEX_DATA; /** @@ -1891,8 +1891,8 @@ typedef struct { typedef struct { u32 hash; /* Hash of the security descriptor. */ u32 security_id; /* The security_id assigned to the descriptor. */ - u64 offset_in_sds; /* Offset of the descriptor in SDS data stream */ - u32 size_in_sds; /* Size of the descriptor in SDS data stream */ + u64 offset_in_sds; /* Offset of the descriptor in $SDS data stream. */ + u32 size_in_sds; /* Size of the descriptor in $SDS data stream. */ } __attribute__((__packed__)) SII_INDEX_DATA; /** @@ -2309,7 +2309,6 @@ typedef struct { control entry in the data part of the index. */ } __attribute__((__packed__)) key; - /* The (optional) index data is inserted here when creating. */ // VCN vcn; /* If INDEX_ENTRY_NODE bit in flags is set, the last // eight bytes of this index entry contain the virtual |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 19:56:23
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13674/include/ntfs Modified Files: layout.h Log Message: Fix type of reserved_II in SDH_INDEX_DATA; resolve some magic constants Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- layout.h 31 Oct 2005 01:15:12 -0000 1.37 +++ layout.h 1 Nov 2005 19:56:08 -0000 1.38 @@ -1882,7 +1882,7 @@ typedef struct { u32 security_id; /* The security_id assigned to the descriptor. */ u64 offset_in_sds; /* Offset of the descriptor in SDS data stream */ u32 size_in_sds; /* Size of the descriptor in SDS data stream */ - u64 reserved_II; /* Padding - always unicode "II" */ + u32 reserved_II; /* Padding - always unicode "II" */ } __attribute__((__packed__)) SDH_INDEX_DATA; /** |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 19:56:23
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13674/ntfsprogs Modified Files: mkntfs.c Log Message: Fix type of reserved_II in SDH_INDEX_DATA; resolve some magic constants Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -p -r1.81 -r1.82 --- mkntfs.c 1 Nov 2005 00:12:08 -0000 1.81 +++ mkntfs.c 1 Nov 2005 19:56:08 -0000 1.82 @@ -2871,8 +2871,10 @@ static int initialize_secure(char *sds, SII_INDEX_DATA *sii_data; sds_header = (SECURITY_DESCRIPTOR_HEADER*)sds; - sdh_size = cpu_to_le32(0x30); - sii_size = cpu_to_le32(0x28); + sdh_size = sizeof(INDEX_ENTRY_HEADER); + sdh_size += sizeof(SDH_INDEX_KEY) + sizeof(SDH_INDEX_DATA); + sii_size = sizeof(INDEX_ENTRY_HEADER); + sii_size += sizeof(SII_INDEX_KEY) + sizeof(SII_INDEX_DATA); idx_entry_sdh = (INDEX_ENTRY*)calloc(1, sizeof(INDEX_ENTRY)); idx_entry_sii = (INDEX_ENTRY*)calloc(1, sizeof(INDEX_ENTRY)); err = 0; @@ -2896,7 +2898,7 @@ static int initialize_secure(char *sds, sdh_data->offset_in_sds = sds_header->offset; sdh_data->size_in_sds = sds_header->length; - sdh_data->reserved_II = cpu_to_le64(0x00490049); + sdh_data->reserved_II = cpu_to_le32(0x00490049); //SII index entry idx_entry_sii->data_offset = cpu_to_le16(0x14); |
|
From: Szabolcs S. <sz...@us...> - 2005-11-01 00:12:16
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6016/ntfsprogs Modified Files: mkntfs.c Log Message: Fix NTFS version 3.x index entries creation. Everybody is MUCH happier now! Erik got this right in his patch, it got non-functional due to libntfs changes. Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- mkntfs.c 28 Oct 2005 12:55:42 -0000 1.80 +++ mkntfs.c 1 Nov 2005 00:12:08 -0000 1.81 @@ -2767,7 +2767,7 @@ static int insert_index_entry_in_res_dir err = -ENOMEM; goto err_out; } - if (ntfs_attr_lookup(AT_INDEX_ROOT, name, name_size, 0, 0, + if (mkntfs_attr_lookup(AT_INDEX_ROOT, name, name_size, 0, 0, NULL, 0, ctx)) { err = EEXIST; goto err_out; |
