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
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv13537/ntfstools
Modified Files:
Makefile.am Makefile.in mkntfs.c ntfsdump_logfile.c ntfsfix.c
Added Files:
attrdef.c boot.c sd.c upcase.c
Log Message:
It has been a long time since last commit. At moment have done a lot of work
on mkntfs but also at the moment ntfsfix and ntfsdump_logfile and libntfs are
broken. Basically only mkntfs works and that is not complete either.
--- NEW FILE ---
const unsigned char attrdef_ntfs12_array[2400] = {
36, 0, 83, 0, 84, 0, 65, 0, 78, 0, 68, 0, 65, 0, 82, 0,
68, 0, 95, 0, 73, 0, 78, 0, 70, 0, 79, 0, 82, 0, 77, 0,
65, 0, 84, 0, 73, 0, 79, 0, 78, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
48, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0,
36, 0, 65, 0, 84, 0, 84, 0, 82, 0, 73, 0, 66, 0, 85, 0,
84, 0, 69, 0, 95, 0, 76, 0, 73, 0, 83, 0, 84, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
36, 0, 70, 0, 73, 0, 76, 0, 69, 0, 95, 0, 78, 0, 65, 0,
77, 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0,
68, 0, 0, 0, 0, 0, 0, 0, 66, 2, 0, 0, 0, 0, 0, 0,
36, 0, 86, 0, 79, 0, 76, 0, 85, 0, 77, 0, 69, 0, 95, 0,
86, 0, 69, 0, 82, 0, 83, 0, 73, 0, 79, 0, 78, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
36, 0, 83, 0, 69, 0, 67, 0, 85, 0, 82, 0, 73, 0, 84, 0,
89, 0, 95, 0, 68, 0, 69, 0, 83, 0, 67, 0, 82, 0, 73, 0,
80, 0, 84, 0, 79, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
36, 0, 86, 0, 79, 0, 76, 0, 85, 0, 77, 0, 69, 0, 95, 0,
78, 0, 65, 0, 77, 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
36, 0, 86, 0, 79, 0, 76, 0, 85, 0, 77, 0, 69, 0, 95, 0,
73, 0, 78, 0, 70, 0, 79, 0, 82, 0, 77, 0, 65, 0, 84, 0,
73, 0, 79, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
12, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0,
36, 0, 68, 0, 65, 0, 84, 0, 65, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
36, 0, 73, 0, 78, 0, 68, 0, 69, 0, 88, 0, 95, 0, 82, 0,
79, 0, 79, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
36, 0, 73, 0, 78, 0, 68, 0, 69, 0, 88, 0, 95, 0, 65, 0,
76, 0, 76, 0, 79, 0, 67, 0, 65, 0, 84, 0, 73, 0, 79, 0,
78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
36, 0, 66, 0, 73, 0, 84, 0, 77, 0, 65, 0, 80, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
36, 0, 83, 0, 89, 0, 77, 0, 66, 0, 79, 0, 76, 0, 73, 0,
67, 0, 95, 0, 76, 0, 73, 0, 78, 0, 75, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
36, 0, 69, 0, 65, 0, 95, 0, 73, 0, 78, 0, 70, 0, 79, 0,
82, 0, 77, 0, 65, 0, 84, 0, 73, 0, 79, 0, 78, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
36, 0, 69, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
--- NEW FILE ---
/* The first 3429 bytes of $Boot. The rest is just zero. Total 8192 bytes. */
const unsigned char boot_array[3429] = {
235, 91, 144, 78, 84, 70, 83, 32, 32, 32, 32, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 250, 51, 192,
142, 208, 188, 0, 124, 251, 184, 192, 7, 142, 216, 199, 6, 84, 0, 0,
0, 199, 6, 86, 0, 0, 0, 199, 6, 91, 0, 16, 0, 184, 0, 13,
142, 192, 43, 219, 232, 7, 0, 104, 0, 13, 104, 102, 2, 203, 80, 83,
81, 82, 6, 102, 161, 84, 0, 102, 3, 6, 28, 0, 102, 51, 210, 102,
15, 183, 14, 24, 0, 102, 247, 241, 254, 194, 136, 22, 90, 0, 102, 139,
208, 102, 193, 234, 16, 247, 54, 26, 0, 136, 22, 37, 0, 163, 88, 0,
161, 24, 0, 42, 6, 90, 0, 64, 59, 6, 91, 0, 118, 3, 161, 91,
0, 80, 180, 2, 139, 22, 88, 0, 177, 6, 210, 230, 10, 54, 90, 0,
139, 202, 134, 233, 138, 54, 37, 0, 178, 128, 205, 19, 88, 114, 42, 1,
6, 84, 0, 131, 22, 86, 0, 0, 41, 6, 91, 0, 118, 11, 193, 224,
5, 140, 194, 3, 208, 142, 194, 235, 138, 7, 90, 89, 91, 88, 195, 190,
89, 1, 235, 8, 190, 227, 1, 235, 3, 190, 57, 1, 232, 9, 0, 190,
173, 1, 232, 3, 0, 251, 235, 254, 172, 60, 0, 116, 9, 180, 14, 187,
7, 0, 205, 16, 235, 242, 195, 29, 0, 65, 32, 100, 105, 115, 107, 32,
114, 101, 97, 100, 32, 101, 114, 114, 111, 114, 32, 111, 99, 99, 117, 114,
114, 101, 100, 46, 13, 10, 0, 41, 0, 65, 32, 107, 101, 114, 110, 101,
108, 32, 102, 105, 108, 101, 32, 105, 115, 32, 109, 105, 115, 115, 105, 110,
103, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 100, 105, 115, 107, 46,
13, 10, 0, 37, 0, 65, 32, 107, 101, 114, 110, 101, 108, 32, 102, 105,
108, 101, 32, 105, 115, 32, 116, 111, 111, 32, 100, 105, 115, 99, 111, 110,
116, 105, 103, 117, 111, 117, 115, 46, 13, 10, 0, 51, 0, 73, 110, 115,
101, 114, 116, 32, 97, 32, 115, 121, 115, 116, 101, 109, 32, 100, 105, 115,
107, 101, 116, 116, 101, 32, 97, 110, 100, 32, 114, 101, 115, 116, 97, 114,
116, 13, 10, 116, 104, 101, 32, 115, 121, 115, 116, 101, 109, 46, 13, 10,
0, 23, 0, 92, 78, 84, 76, 68, 82, 32, 105, 115, 32, 99, 111, 109,
112, 114, 101, 115, 115, 101, 100, 46, 13, 10, 0, 0, 0, 0, 85, 170,
5, 0, 78, 0, 84, 0, 76, 0, 68, 0, 82, 0, 4, 0, 36, 0,
73, 0, 51, 0, 48, 0, 0, 224, 0, 0, 0, 48, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 140, 200, 142, 216, 193, 224, 4, 250, 139, 224,
251, 102, 15, 183, 6, 11, 0, 102, 15, 182, 30, 13, 0, 102, 247, 227,
102, 163, 78, 2, 102, 139, 14, 64, 0, 128, 249, 0, 15, 143, 14, 0,
246, 217, 102, 184, 1, 0, 0, 0, 102, 211, 224, 235, 8, 144, 102, 161,
78, 2, 102, 247, 225, 102, 163, 82, 2, 102, 15, 183, 30, 11, 0, 102,
51, 210, 102, 247, 243, 102, 163, 86, 2, 232, 44, 4, 102, 139, 14, 74,
2, 102, 137, 14, 34, 2, 102, 3, 14, 82, 2, 102, 137, 14, 38, 2,
102, 3, 14, 82, 2, 102, 137, 14, 42, 2, 102, 3, 14, 82, 2, 102,
137, 14, 58, 2, 102, 3, 14, 82, 2, 102, 137, 14, 66, 2, 102, 184,
144, 0, 0, 0, 102, 139, 14, 34, 2, 232, 65, 9, 102, 11, 192, 15,
132, 22, 254, 102, 163, 46, 2, 102, 184, 160, 0, 0, 0, 102, 139, 14,
38, 2, 232, 40, 9, 102, 163, 50, 2, 102, 184, 176, 0, 0, 0, 102,
139, 14, 42, 2, 232, 22, 9, 102, 163, 54, 2, 102, 161, 46, 2, 102,
11, 192, 15, 132, 227, 253, 103, 128, 120, 8, 0, 15, 133, 218, 253, 103,
102, 141, 80, 16, 103, 3, 66, 4, 103, 102, 15, 182, 72, 12, 102, 137,
14, 94, 2, 103, 102, 139, 72, 8, 102, 137, 14, 90, 2, 102, 161, 90,
2, 102, 15, 183, 14, 11, 0, 102, 51, 210, 102, 247, 241, 102, 163, 98,
2, 102, 161, 66, 2, 102, 3, 6, 90, 2, 102, 163, 70, 2, 102, 131,
62, 50, 2, 0, 15, 132, 25, 0, 102, 131, 62, 54, 2, 0, 15, 132,
135, 253, 102, 139, 30, 54, 2, 30, 7, 102, 139, 62, 70, 2, 232, 177,
1, 102, 15, 183, 14, 0, 2, 102, 184, 2, 2, 0, 0, 232, 153, 6,
102, 11, 192, 15, 132, 88, 253, 103, 102, 139, 0, 30, 7, 102, 139, 62,
58, 2, 232, 209, 4, 102, 161, 58, 2, 102, 187, 128, 0, 0, 0, 102,
185, 0, 0, 0, 0, 102, 186, 0, 0, 0, 0, 232, 203, 0, 102, 11,
192, 15, 132, 42, 253, 103, 102, 15, 183, 88, 12, 102, 129, 227, 255, 0,
0, 0, 15, 133, 30, 253, 102, 139, 216, 104, 0, 32, 7, 102, 43, 255,
232, 79, 1, 138, 22, 36, 0, 184, 232, 3, 142, 192, 141, 54, 11, 0,
43, 192, 104, 0, 32, 80, 203, 80, 83, 81, 82, 6, 255, 54, 91, 0,
255, 54, 84, 0, 255, 54, 86, 0, 139, 195, 193, 232, 4, 140, 193, 3,
193, 37, 255, 15, 45, 0, 16, 247, 216, 139, 14, 91, 0, 193, 225, 5,
81, 59, 193, 118, 2, 139, 193, 80, 193, 232, 5, 163, 91, 0, 232, 61,
252, 88, 89, 43, 200, 118, 11, 140, 194, 3, 208, 142, 194, 184, 0, 16,
235, 222, 143, 6, 86, 0, 143, 6, 84, 0, 143, 6, 91, 0, 7, 90,
89, 91, 88, 195, 6, 30, 102, 96, 102, 139, 218, 102, 15, 182, 14, 13,
0, 102, 247, 225, 102, 163, 84, 0, 102, 139, 195, 102, 247, 225, 163, 91,
0, 139, 223, 131, 227, 15, 140, 192, 102, 193, 239, 4, 3, 199, 80, 7,
232, 116, 255, 102, 97, 144, 31, 7, 195, 103, 3, 64, 20, 103, 102, 131,
56, 255, 15, 132, 76, 0, 103, 102, 57, 24, 15, 133, 51, 0, 102, 11,
201, 15, 133, 10, 0, 103, 128, 120, 9, 0, 15, 133, 35, 0, 195, 103,
58, 72, 9, 15, 133, 26, 0, 102, 139, 240, 103, 3, 112, 10, 232, 61,
5, 102, 81, 30, 7, 102, 139, 250, 243, 167, 102, 89, 15, 133, 1, 0,
195, 103, 102, 131, 120, 4, 0, 15, 132, 7, 0, 103, 102, 3, 64, 4,
235, 171, 102, 43, 192, 195, 102, 139, 243, 232, 18, 5, 103, 102, 3, 0,
103, 247, 64, 12, 2, 0, 15, 133, 52, 0, 103, 102, 141, 80, 16, 103,
58, 74, 64, 15, 133, 24, 0, 103, 102, 141, 114, 66, 232, 239, 4, 102,
81, 30, 7, 102, 139, 251, 243, 167, 102, 89, 15, 133, 1, 0, 195, 103,
131, 120, 8, 0, 15, 132, 6, 0, 103, 3, 64, 8, 235, 194, 102, 51,
192, 195, 103, 128, 123, 8, 0, 15, 133, 28, 0, 6, 30, 102, 96, 103,
102, 141, 83, 16, 103, 102, 139, 10, 102, 139, 243, 103, 3, 114, 4, 243,
164, 102, 97, 144, 31, 7, 195, 103, 102, 141, 83, 16, 103, 102, 139, 74,
8, 102, 65, 102, 43, 192, 232, 1, 0, 195, 6, 30, 102, 96, 103, 128,
123, 8, 1, 15, 132, 3, 0, 233, 127, 251, 102, 131, 249, 0, 15, 133,
6, 0, 102, 97, 144, 31, 7, 195, 102, 83, 102, 80, 102, 81, 102, 87,
6, 232, 87, 3, 102, 139, 209, 7, 102, 95, 102, 89, 102, 59, 202, 15,
141, 3, 0, 102, 139, 209, 232, 171, 254, 102, 43, 202, 102, 139, 218, 102,
139, 194, 102, 15, 182, 22, 13, 0, 102, 247, 226, 102, 15, 183, 22, 11,
0, 102, 247, 226, 102, 3, 248, 102, 88, 102, 3, 195, 102, 91, 235, 170,
6, 30, 102, 96, 103, 128, 123, 8, 1, 15, 132, 3, 0, 233, 25, 251,
102, 131, 249, 0, 15, 133, 6, 0, 102, 97, 144, 31, 7, 195, 102, 83,
102, 80, 102, 81, 102, 87, 6, 102, 81, 102, 51, 210, 102, 15, 182, 14,
13, 0, 102, 247, 241, 102, 82, 232, 225, 2, 102, 15, 182, 30, 13, 0,
102, 247, 227, 102, 90, 102, 3, 194, 102, 80, 102, 15, 182, 6, 13, 0,
102, 247, 225, 102, 139, 208, 102, 88, 102, 89, 7, 102, 95, 102, 89, 102,
59, 202, 15, 141, 3, 0, 102, 139, 209, 102, 163, 84, 0, 137, 22, 91,
0, 6, 30, 102, 96, 139, 223, 131, 227, 15, 140, 192, 102, 193, 239, 4,
3, 199, 80, 7, 232, 160, 253, 102, 97, 144, 31, 7, 102, 43, 202, 102,
139, 218, 102, 139, 194, 102, 15, 183, 22, 11, 0, 102, 247, 226, 102, 3,
248, 102, 88, 102, 3, 195, 102, 91, 233, 101, 255, 6, 30, 102, 96, 38,
103, 102, 15, 183, 95, 4, 38, 103, 102, 15, 183, 79, 6, 102, 11, 201,
15, 132, 101, 250, 102, 3, 223, 102, 131, 195, 2, 102, 129, 199, 254, 1,
0, 0, 102, 73, 102, 11, 201, 15, 132, 23, 0, 38, 103, 139, 3, 38,
103, 137, 7, 102, 131, 195, 2, 102, 129, 199, 0, 2, 0, 0, 102, 73,
235, 226, 102, 97, 144, 31, 7, 195, 6, 30, 102, 96, 102, 184, 1, 0,
0, 0, 102, 163, 30, 2, 102, 161, 26, 2, 102, 3, 6, 82, 2, 102,
163, 74, 2, 102, 161, 48, 0, 102, 15, 182, 30, 13, 0, 102, 247, 227,
102, 163, 84, 0, 102, 161, 86, 2, 163, 91, 0, 102, 139, 30, 26, 2,
30, 7, 232, 242, 252, 102, 15, 183, 251, 232, 111, 255, 102, 161, 26, 2,
102, 187, 32, 0, 0, 0, 102, 185, 0, 0, 0, 0, 102, 186, 0, 0,
0, 0, 232, 100, 253, 102, 11, 192, 15, 132, 87, 0, 102, 139, 216, 30,
7, 102, 139, 62, 22, 2, 232, 249, 253, 102, 139, 30, 22, 2, 103, 102,
129, 59, 128, 0, 0, 0, 15, 132, 6, 0, 103, 3, 91, 4, 235, 238,
103, 102, 129, 59, 128, 0, 0, 0, 15, 133, 39, 0, 102, 83, 103, 102,
139, 67, 16, 102, 139, 62, 74, 2, 30, 7, 232, 9, 1, 102, 91, 102,
161, 82, 2, 102, 1, 6, 74, 2, 102, 255, 6, 30, 2, 103, 3, 91,
4, 235, 205, 102, 97, 144, 31, 7, 195, 102, 139, 208, 102, 139, 14, 30,
2, 102, 161, 26, 2, 102, 82, 102, 80, 102, 81, 102, 82, 102, 187, 128,
0, 0, 0, 102, 185, 0, 0, 0, 0, 102, 186, 0, 0, 0, 0, 232,
215, 252, 102, 11, 192, 15, 132, 64, 249, 102, 139, 216, 102, 88, 232, 42,
1, 102, 11, 192, 15, 132, 7, 0, 102, 91, 102, 91, 102, 91, 195, 102,
89, 102, 88, 102, 90, 102, 3, 6, 82, 2, 226, 185, 102, 51, 192, 195,
6, 30, 102, 96, 102, 80, 102, 81, 102, 51, 210, 102, 15, 182, 30, 13,
0, 102, 247, 243, 102, 82, 232, 144, 255, 102, 11, 192, 15, 132, 249, 248,
102, 15, 182, 30, 13, 0, 102, 247, 227, 102, 90, 102, 3, 194, 102, 163,
84, 0, 102, 89, 102, 15, 182, 30, 13, 0, 102, 59, 203, 15, 142, 19,
0, 137, 30, 91, 0, 102, 43, 203, 102, 88, 102, 3, 195, 102, 80, 102,
81, 235, 20, 144, 102, 88, 102, 3, 193, 102, 80, 137, 14, 91, 0, 102,
185, 0, 0, 0, 0, 102, 81, 6, 102, 87, 139, 223, 131, 227, 15, 140,
192, 102, 193, 239, 4, 3, 199, 80, 7, 232, 155, 251, 102, 95, 7, 102,
3, 62, 78, 2, 102, 89, 102, 88, 102, 131, 249, 0, 15, 143, 116, 255,
102, 97, 144, 31, 7, 195, 6, 30, 102, 96, 102, 247, 38, 86, 2, 102,
139, 14, 86, 2, 232, 89, 255, 232, 241, 253, 102, 97, 144, 31, 7, 195,
6, 30, 102, 96, 102, 247, 38, 98, 2, 102, 139, 30, 50, 2, 102, 139,
14, 98, 2, 30, 7, 102, 139, 62, 66, 2, 232, 35, 253, 232, 203, 253,
102, 97, 144, 31, 7, 195, 102, 80, 102, 83, 102, 81, 102, 139, 30, 70,
2, 102, 139, 200, 102, 193, 232, 3, 102, 131, 225, 7, 102, 3, 216, 102,
184, 1, 0, 0, 0, 102, 211, 224, 103, 132, 3, 15, 132, 4, 0, 248,
235, 2, 144, 249, 102, 89, 102, 91, 102, 88, 195, 103, 128, 123, 8, 1,
15, 132, 4, 0, 102, 43, 192, 195, 103, 102, 141, 115, 16, 103, 102, 139,
86, 8, 102, 59, 194, 15, 135, 11, 0, 103, 102, 139, 22, 102, 59, 194,
15, 131, 4, 0, 102, 43, 192, 195, 103, 3, 94, 16, 102, 43, 246, 103,
128, 59, 0, 15, 132, 62, 0, 232, 129, 0, 102, 3, 241, 232, 57, 0,
102, 3, 202, 102, 59, 193, 15, 140, 33, 0, 102, 139, 209, 102, 80, 103,
102, 15, 182, 11, 102, 139, 193, 102, 131, 224, 15, 102, 193, 233, 4, 102,
3, 217, 102, 3, 216, 102, 67, 102, 88, 235, 196, 102, 43, 200, 102, 43,
194, 102, 3, 198, 195, 102, 43, 192, 195, 102, 43, 201, 103, 138, 11, 128,
225, 15, 102, 131, 249, 0, 15, 133, 4, 0, 102, 43, 201, 195, 102, 83,
102, 82, 102, 3, 217, 103, 102, 15, 190, 19, 102, 73, 102, 75, 102, 131,
249, 0, 15, 132, 13, 0, 102, 193, 226, 8, 103, 138, 19, 102, 75, 102,
73, 235, 235, 102, 139, 202, 102, 90, 102, 91, 195, 102, 83, 102, 82, 102,
43, 210, 103, 138, 19, 102, 131, 226, 15, 102, 43, 201, 103, 138, 11, 192,
233, 4, 102, 131, 249, 0, 15, 133, 8, 0, 102, 43, 201, 102, 90, 102,
91, 195, 102, 3, 218, 102, 3, 217, 103, 102, 15, 190, 19, 102, 73, 102,
75, 102, 131, 249, 0, 15, 132, 13, 0, 102, 193, 226, 8, 103, 138, 19,
102, 75, 102, 73, 235, 235, 102, 139, 202, 102, 90, 102, 91, 195, 102, 11,
201, 15, 133, 1, 0, 195, 102, 81, 102, 86, 103, 131, 62, 97, 15, 140,
12, 0, 103, 131, 62, 122, 15, 143, 4, 0, 103, 131, 46, 32, 102, 131,
198, 2, 226, 230, 102, 94, 102, 89, 195, 102, 80, 102, 81, 102, 139, 208,
102, 161, 46, 2, 103, 102, 141, 88, 16, 103, 3, 67, 4, 103, 102, 141,
64, 16, 102, 139, 218, 232, 158, 250, 102, 11, 192, 15, 132, 5, 0, 102,
89, 102, 89, 195, 102, 161, 50, 2, 102, 11, 192, 15, 133, 8, 0, 102,
89, 102, 89, 102, 51, 192, 195, 102, 139, 22, 50, 2, 103, 102, 141, 82,
16, 103, 102, 139, 66, 8, 102, 64, 102, 139, 30, 78, 2, 102, 247, 227,
102, 51, 210, 102, 247, 54, 90, 2, 102, 80, 102, 88, 102, 11, 192, 15,
132, 48, 0, 102, 72, 102, 80, 232, 28, 254, 114, 238, 232, 241, 253, 102,
90, 102, 89, 102, 91, 102, 83, 102, 81, 102, 82, 102, 161, 66, 2, 103,
102, 141, 64, 24, 232, 47, 250, 102, 11, 192, 116, 206, 102, 89, 102, 89,
102, 89, 195, 102, 89, 102, 89, 102, 51, 192, 195, 6, 30, 102, 96, 102,
139, 54, 66, 2, 102, 185, 32, 0, 0, 0, 102, 247, 193, 3, 0, 0,
0, 15, 133, 3, 0, 232, 13, 0, 102, 173, 232, 105, 0, 226, 235, 102,
97, 144, 31, 7, 195, 6, 30, 102, 96, 102, 51, 192, 102, 51, 219, 176,
13, 180, 14, 187, 7, 0, 205, 16, 176, 10, 180, 14, 187, 7, 0, 205,
16, 102, 97, 144, 31, 7, 195, 6, 30, 102, 96, 102, 11, 201, 15, 133,
9, 0, 232, 208, 255, 102, 97, 144, 31, 7, 195, 102, 51, 192, 102, 51,
219, 173, 180, 14, 187, 7, 0, 205, 16, 226, 240, 232, 183, 255, 102, 97,
144, 31, 7, 195, 96, 172, 60, 0, 116, 9, 180, 14, 187, 7, 0, 205,
16, 235, 242, 97, 144, 195, 6, 30, 102, 96, 102, 185, 8, 0, 0, 0,
102, 139, 208, 102, 131, 226, 15, 102, 82, 102, 193, 232, 4, 226, 241, 102,
185, 8, 0, 0, 0, 102, 88, 102, 131, 248, 9, 15, 143, 7, 0, 102,
131, 192, 48, 235, 9, 144, 102, 131, 232, 10, 102, 131, 192, 65, 102, 51,
219, 180, 14, 187, 7, 0, 205, 16, 226, 219, 176, 32, 180, 14, 187, 7,
0, 205, 16, 102, 97, 144, 31, 7, 232, 96, 0, 195, 6, 30, 102, 96,
102, 190, 22, 13, 0, 0, 232, 79, 245, 102, 97, 144, 31, 7, 195, 6,
30, 102, 96, 102, 190, 38, 13, 0, 0, 232, 60, 245, 102, 97, 144, 31,
7, 195, 6, 30, 102, 96, 102, 190, 54, 13, 0, 0, 232, 41, 245, 102,
97, 144, 31, 7, 195, 6, 30, 102, 96, 102, 190, 70, 13, 0, 0, 232,
22, 245, 102, 97, 144, 31, 7, 195, 6, 30, 102, 96, 102, 190, 86, 13,
0, 0, 232, 3, 245, 102, 97, 144, 31, 7, 195, 102, 80, 102, 184, 0,
0, 245, 255, 102, 64, 102, 11, 192, 117, 249, 102, 88, 195, 102, 81, 102,
80, 102, 184, 5, 0, 0, 0, 30, 7, 102, 139, 249, 232, 71, 252, 102,
139, 193, 102, 91, 102, 83, 102, 15, 183, 14, 12, 2, 102, 186, 14, 2,
0, 0, 232, 68, 248, 102, 91, 102, 89, 102, 11, 192, 15, 133, 47, 0,
102, 139, 193, 102, 139, 203, 102, 80, 102, 83, 232, 35, 0, 102, 91, 102,
95, 102, 11, 192, 15, 132, 23, 0, 30, 7, 232, 9, 252, 102, 139, 199,
102, 15, 183, 14, 12, 2, 102, 186, 14, 2, 0, 0, 232, 10, 248, 195,
102, 81, 102, 187, 32, 0, 0, 0, 102, 185, 0, 0, 0, 0, 102, 186,
0, 0, 0, 0, 232, 242, 247, 102, 11, 192, 15, 132, 82, 0, 102, 139,
216, 30, 7, 102, 139, 62, 22, 2, 232, 135, 248, 30, 7, 102, 139, 30,
22, 2, 102, 89, 38, 102, 57, 15, 15, 132, 46, 0, 38, 102, 131, 63,
255, 15, 132, 45, 0, 38, 131, 127, 4, 0, 15, 132, 36, 0, 38, 102,
15, 183, 71, 4, 3, 216, 139, 195, 37, 0, 128, 116, 215, 140, 192, 5,
0, 8, 142, 192, 129, 227, 255, 127, 235, 202, 38, 102, 139, 71, 16, 195,
102, 89, 102, 51, 192, 195, 68, 101, 98, 117, 103, 32, 80, 111, 105, 110,
116, 32, 48, 13, 10, 0, 68, 101, 98, 117, 103, 32, 80, 111, 105, 110,
116, 32, 49, 13, 10, 0, 68, 101, 98, 117, 103, 32, 80, 111, 105, 110,
116, 32, 50, 13, 10, 0, 68, 101, 98, 117, 103, 32, 80, 111, 105, 110,
116, 32, 51, 13, 10, 0, 68, 101, 98, 117, 103, 32, 80, 111, 105, 110,
116, 32, 52, 13, 10 };
--- NEW FILE ---
#include "types.h"
/*
* NTFS 1.2 - System files security decriptors
* ===========================================
*
* Create the security descriptor for system file number @sys_file_no and
* return a pointer to the descriptor.
*
* $MFT, $MFTMirr, $LogFile, $AttrDef, $Bitmap, $Boot, $BadClus, and $UpCase
* are the same.
*
* $Volume, $Quota, and system files 0xb-0xf are the same. They are almost the
* same as the above, the only difference being that the two SIDs present in
* the DACL grant GENERIC_WRITE and GENERIC_READ equivalent priviledges while
* the above only grant GENERIC_READ equivalent priviledges. (For some reason
* the flags for GENERIC_READ/GENERIC_WRITE are not set by NT4, even though
* the permissions are equivalent, so we comply.
*
* Root directory system file (".") is different altogether.
*
* The sd is recturned in *@sd_val and has length *@sd_val_len.
*
* Do NOT free *@sd_val as it is static memory. This also means that you can
* only use *@sd_val until the next call to this function.
*
*/
void init_system_file_sd(int sys_file_no, char **sd_val, int *sd_val_len)
{
static char sd_array[0x68];
SECURITY_DESCRIPTOR_RELATIVE *sd;
ACL *acl;
ACE_HEADER *ace_hdr;
ACCESS_ALLOWED_ACE *aa_ace;
SID *sid;
if (sys_file_no < 0 || sys_file_no > 0xf) {
*sd_val = NULL;
*sd_val_len = 0;
return;
}
*sd_val = (char*)&sd_array;
sd = (SECURITY_DESCRIPTOR_RELATIVE*)&sd_array;
sd->revision = 1;
sd->alignment = 0;
sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
if (sys_file_no == FILE_$root) {
*sd_val_len = 0x50;
sd->owner = cpu_to_le32(0x30);
sd->group = cpu_to_le32(0x40);
} else {
*sd_val_len = 0x68;
sd->owner = cpu_to_le32(0x48);
sd->group = cpu_to_le32(0x58);
}
sd->sacl = cpu_to_le32(0);
sd->dacl = cpu_to_le32(0x14);
/*
* Now at offset 0x14, as specified in the security descriptor, we have
* the DACL.
*/
acl = (ACL*)((char*)sd + le32_to_cpu(sd->dacl));
acl->revision = 2;
acl->alignment1 = 0;
if (sys_file_no == FILE_$root) {
acl->size = cpu_to_le16(0x1c);
acl->ace_count = cpu_to_le16(1);
} else {
acl->size = cpu_to_le16(0x34);
acl->ace_count = cpu_to_le16(2);
}
acl->alignment2 = cpu_to_le16(0);
/*
* Now at offset 0x1c, just after the DACL's ACL, we have the first
* ACE of the DACL. The type of the ACE is access allowed.
*/
aa_ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(acl));
aa_ace->type = ACCESS_ALLOWED_ACE_TYPE;
if (sys_file_no == FILE_$root)
aa_ace->flags = CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE;
else
aa_ace->flags = 0;
aa_ace->size = cpu_to_le16(0x14);
switch (sys_file_no) {
case FILE_$MFT: case FILE_$MFTMirr: case FILE_$LogFile:
case FILE_$AttrDef: case FILE_$Bitmap: case FILE_$Boot:
case FILE_$BadClus: case FILE_$UpCase:
aa_ace->mask = SYNCHRONIZE | STANDARD_RIGHTS_READ |
FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_READ_DATA;
break;
case FILE_$Volume: case FILE_$Secure: case 0xb ... 0xf:
aa_ace->mask = SYNCHRONIZE | STANDARD_RIGHTS_WRITE |
FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES |
FILE_WRITE_EA | FILE_READ_EA | FILE_APPEND_DATA |
FILE_WRITE_DATA | FILE_READ_DATA;
break;
case FILE_$root:
aa_ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
FILE_READ_ATTRIBUTES | FILE_DELETE_CHILD |
FILE_TRAVERSE | FILE_WRITE_EA | FILE_READ_EA |
FILE_ADD_SUBDIRECTORY | FILE_ADD_FILE |
FILE_LIST_DIRECTORY;
break;
}
aa_ace->sid.revision = 1;
aa_ace->sid.sub_authority_count = 1;
aa_ace->sid.identifier_authority.value[0] = 0;
aa_ace->sid.identifier_authority.value[1] = 0;
aa_ace->sid.identifier_authority.value[2] = 0;
aa_ace->sid.identifier_authority.value[3] = 0;
aa_ace->sid.identifier_authority.value[4] = 0;
if (sys_file_no == FILE_$root) {
/* SECURITY_WORLD_SID_AUTHORITY (S-1-1) */
aa_ace->sid.identifier_authority.value[5] = 1;
aa_ace->sid.sub_authority[0] =
cpu_to_le32(SECURITY_WORLD_RID);
/* This is S-1-1-0, the WORLD_SID. */
} else {
/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
aa_ace->sid.identifier_authority.value[5] = 5;
aa_ace->sid.sub_authority[0] =
cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
}
/*
* Now at offset 0x30 within security descriptor, just after the first
* ACE of the DACL. All system files, except the root directory, have
* a second ACE.
*/
if (sys_file_no != FILE_$root) {
/* The second ACE of the DACL. Type is access allowed. */
aa_ace = (ACCESS_ALLOWED_ACE*)((char*)aa_ace +
le16_to_cpu(aa_ace->size));
aa_ace->type = ACCESS_ALLOWED_ACE_TYPE;
aa_ace->flags = 0;
aa_ace->size = cpu_to_le16(0x18);
switch (sys_file_no) {
case FILE_$MFT: case FILE_$MFTMirr:
case FILE_$LogFile: case FILE_$AttrDef:
case FILE_$Bitmap: case FILE_$Boot:
case FILE_$BadClus: case FILE_$UpCase:
aa_ace->mask = SYNCHRONIZE | STANDARD_RIGHTS_READ |
FILE_READ_ATTRIBUTES | FILE_READ_EA |
FILE_READ_DATA;
break;
case FILE_$Volume: case FILE_$Secure:
case 0xb ... 0xf:
aa_ace->mask = SYNCHRONIZE | STANDARD_RIGHTS_READ |
FILE_WRITE_ATTRIBUTES |
FILE_READ_ATTRIBUTES | FILE_WRITE_EA |
FILE_READ_EA | FILE_APPEND_DATA |
FILE_WRITE_DATA | FILE_READ_DATA;
break;
}
aa_ace->sid.revision = 1;
aa_ace->sid.sub_authority_count = 2;
/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
aa_ace->sid.identifier_authority.value[0] = 0;
aa_ace->sid.identifier_authority.value[1] = 0;
aa_ace->sid.identifier_authority.value[2] = 0;
aa_ace->sid.identifier_authority.value[3] = 0;
aa_ace->sid.identifier_authority.value[4] = 0;
aa_ace->sid.identifier_authority.value[5] = 5;
aa_ace->sid.sub_authority[0] =
cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
aa_ace->sid.sub_authority[1] =
cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
/* Now at offset 0x48 into the security descriptor. */
}
/* As specified in the security descriptor, we now have the owner SID.*/
sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
sid->revision = 1;
sid->sub_authority_count = 2;
/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
sid->identifier_authority.value[0] = 0;
sid->identifier_authority.value[1] = 0;
sid->identifier_authority.value[2] = 0;
sid->identifier_authority.value[3] = 0;
sid->identifier_authority.value[4] = 0;
sid->identifier_authority.value[5] = 5;
sid->sub_authority[0] = cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
sid->sub_authority[1] = cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
/*
* Now at offset 0x40 or 0x58 (root directory and the other system
* files, respectively) into the security descriptor, as specified in
* the security descriptor, we have the group SID.
*/
sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
sid->revision = 1;
sid->sub_authority_count = 2;
/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
sid->identifier_authority.value[0] = 0;
sid->identifier_authority.value[1] = 0;
sid->identifier_authority.value[2] = 0;
sid->identifier_authority.value[3] = 0;
sid->identifier_authority.value[4] = 0;
sid->identifier_authority.value[5] = 5;
sid->sub_authority[0] = cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
sid->sub_authority[1] = cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
}
--- NEW FILE ---
const unsigned char upcase_array[131072] = {
0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0,
8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0,
16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22, 0, 23, 0,
24, 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, 0, 30, 0, 31, 0,
32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38, 0, 39, 0,
40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46, 0, 47, 0,
48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54, 0, 55, 0,
56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62, 0, 63, 0,
64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70, 0, 71, 0,
72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78, 0, 79, 0,
80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86, 0, 87, 0,
88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94, 0, 95, 0,
96, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70, 0, 71, 0,
72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78, 0, 79, 0,
80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86, 0, 87, 0,
88, 0, 89, 0, 90, 0, 123, 0, 124, 0, 125, 0, 126, 0, 127, 0,
128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134, 0, 135, 0,
136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142, 0, 143, 0,
[...8156 lines suppressed...]
112, 255, 113, 255, 114, 255, 115, 255, 116, 255, 117, 255, 118, 255, 119, 255,
120, 255, 121, 255, 122, 255, 123, 255, 124, 255, 125, 255, 126, 255, 127, 255,
128, 255, 129, 255, 130, 255, 131, 255, 132, 255, 133, 255, 134, 255, 135, 255,
136, 255, 137, 255, 138, 255, 139, 255, 140, 255, 141, 255, 142, 255, 143, 255,
144, 255, 145, 255, 146, 255, 147, 255, 148, 255, 149, 255, 150, 255, 151, 255,
152, 255, 153, 255, 154, 255, 155, 255, 156, 255, 157, 255, 158, 255, 159, 255,
160, 255, 161, 255, 162, 255, 163, 255, 164, 255, 165, 255, 166, 255, 167, 255,
168, 255, 169, 255, 170, 255, 171, 255, 172, 255, 173, 255, 174, 255, 175, 255,
176, 255, 177, 255, 178, 255, 179, 255, 180, 255, 181, 255, 182, 255, 183, 255,
184, 255, 185, 255, 186, 255, 187, 255, 188, 255, 189, 255, 190, 255, 191, 255,
192, 255, 193, 255, 194, 255, 195, 255, 196, 255, 197, 255, 198, 255, 199, 255,
200, 255, 201, 255, 202, 255, 203, 255, 204, 255, 205, 255, 206, 255, 207, 255,
208, 255, 209, 255, 210, 255, 211, 255, 212, 255, 213, 255, 214, 255, 215, 255,
216, 255, 217, 255, 218, 255, 219, 255, 220, 255, 221, 255, 222, 255, 223, 255,
224, 255, 225, 255, 226, 255, 227, 255, 228, 255, 229, 255, 230, 255, 231, 255,
232, 255, 233, 255, 234, 255, 235, 255, 236, 255, 237, 255, 238, 255, 239, 255,
240, 255, 241, 255, 242, 255, 243, 255, 244, 255, 245, 255, 246, 255, 247, 255,
248, 255, 249, 255, 250, 255, 251, 255, 252, 255, 253, 255, 254, 255, 255, 255
};
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.am 2001/04/02 02:04:37 1.4
+++ Makefile.am 2001/06/01 02:07:26 1.5
@@ -1,4 +1,11 @@
-bin_PROGRAMS = ntfsfix ntfsdump_logfile #mkntfs
+# Need this to enable 64-bit (device) file access functions and parameters.
+if DEBUG
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
+else
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64
+endif
+bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs
+
linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -14,6 +21,6 @@
ntfsdump_logfile_LDFLAGS= $(all_libraries)
-#mkntfs_SOURCES = mkntfs.c
-#mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
-#mkntfs_LDFLAGS = $(all_libraries)
+mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c mkntfs.c
+mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
+mkntfs_LDFLAGS = $(all_libraries)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.in 2001/04/02 02:04:37 1.3
+++ Makefile.in 2001/06/01 02:07:26 1.4
@@ -1,3 +1,3 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
@@ -11,5 +11,7 @@
# PARTICULAR PURPOSE.
+# Need this to enable 64-bit (device) file access functions and parameters.
+
SHELL = @SHELL@
@@ -71,17 +73,24 @@
CXX = @CXX@
DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
LDFLAGS = @LDFLAGS@
LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
+STRIP = @STRIP@
VERSION = @VERSION@
all_includes = @all_includes@
all_libraries = @all_libraries@
+@DEBUG_TRUE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
+@DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64
-bin_PROGRAMS = ntfsfix ntfsdump_logfile #mkntfs
+bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs
linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -97,7 +106,13 @@
ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la
ntfsdump_logfile_LDFLAGS = $(all_libraries)
+
+mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c mkntfs.c
+mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
+mkntfs_LDFLAGS = $(all_libraries)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
+bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsdump_logfile$(EXEEXT) \
+mkntfs$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -105,8 +120,11 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I..
LIBS = @LIBS@
-ntfsfix_OBJECTS = ntfsfix.o
+ntfsfix_OBJECTS = ntfsfix.$(OBJEXT)
ntfsfix_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
-ntfsdump_logfile_OBJECTS = ntfsdump_logfile.o
+ntfsdump_logfile_OBJECTS = ntfsdump_logfile.$(OBJEXT)
ntfsdump_logfile_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
+mkntfs_OBJECTS = attrdef.$(OBJEXT) upcase.$(OBJEXT) boot.$(OBJEXT) \
+sd.$(OBJEXT) mkntfs.$(OBJEXT)
+mkntfs_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -120,11 +138,12 @@
TAR = gtar
GZIP_ENV = --best
-DEP_FILES = .deps/ntfsdump_logfile.P .deps/ntfsfix.P
-SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES)
-OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS)
+DEP_FILES = .deps/attrdef.P .deps/boot.P .deps/mkntfs.P \
+.deps/ntfsdump_logfile.P .deps/ntfsfix.P .deps/sd.P .deps/upcase.P
+SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES) $(mkntfs_SOURCES)
+OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(mkntfs_OBJECTS)
all: all-redirect
.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu ntfstools/Makefile
@@ -160,4 +179,9 @@
done
+# FIXME: We should only use cygpath when building on Windows,
+# and only if it is available.
+.c.obj:
+ $(COMPILE) -c `cygpath -w $<`
+
.s.o:
$(COMPILE) -c $<
@@ -168,4 +192,5 @@
mostlyclean-compile:
-rm -f *.o core *.core
+ -rm -f *.$(OBJEXT)
clean-compile:
@@ -192,12 +217,16 @@
maintainer-clean-libtool:
-ntfsfix: $(ntfsfix_OBJECTS) $(ntfsfix_DEPENDENCIES)
- @rm -f ntfsfix
+ntfsfix$(EXEEXT): $(ntfsfix_OBJECTS) $(ntfsfix_DEPENDENCIES)
+ @rm -f ntfsfix$(EXEEXT)
$(LINK) $(ntfsfix_LDFLAGS) $(ntfsfix_OBJECTS) $(ntfsfix_LDADD) $(LIBS)
-ntfsdump_logfile: $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_DEPENDENCIES)
- @rm -f ntfsdump_logfile
+ntfsdump_logfile$(EXEEXT): $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_DEPENDENCIES)
+ @rm -f ntfsdump_logfile$(EXEEXT)
$(LINK) $(ntfsdump_logfile_LDFLAGS) $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_LDADD) $(LIBS)
+mkntfs$(EXEEXT): $(mkntfs_OBJECTS) $(mkntfs_DEPENDENCIES)
+ @rm -f mkntfs$(EXEEXT)
+ $(LINK) $(mkntfs_LDFLAGS) $(mkntfs_OBJECTS) $(mkntfs_LDADD) $(LIBS)
+
tags: TAGS
@@ -358,8 +387,4 @@
mostlyclean distclean maintainer-clean
-
-#mkntfs_SOURCES = mkntfs.c
-#mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
-#mkntfs_LDFLAGS = $(all_libraries)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- mkntfs.c 2001/04/08 03:02:55 1.2
+++ mkntfs.c 2001/06/01 02:07:26 1.3
@@ -1,4 +1,2 @@
-const char *EXEC_NAME = "mkntfs";
-const char *EXEC_VERSION = "0.0.1";
/*
* $Id$
@@ -43,60 +41,1804 @@
*/
-//#include <unistd.h>
-//#include <stdlib.h>
-//#include <stdio.h>
-//#include <linux/types.h>
[...2618 lines suppressed...]
+ if (usn-- <= 1)
+ usn = 0xfffe;
+ if (!opt.no_action)
+ lw = mst_pwrite(f, buf + i * opt.mft_record_size,
+ opt.mft_record_size, pos);
+ if (lw != opt.mft_record_size)
+ err_exit("%s\n", lw == -1 ? strerror(errno) :
+ "unknown error");
+ pos += opt.mft_record_size;
+ }
+ Dprintf("Syncing device.\n");
+ if (fdatasync(f) == -1)
+ err_exit("Syncing device. FAILED: %s", strerror(errno));
+ Dprintf("mkntfs completed successfully. Have a nice day.\n");
+ /*
+ * Device is unlocked and closed by the registered exit function
+ * mkntfs_exit().
+ */
return 0;
}
Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ntfsdump_logfile.c 2001/04/11 15:36:54 1.6
+++ ntfsdump_logfile.c 2001/06/01 02:07:26 1.7
@@ -48,9 +48,9 @@
#include <stdlib.h>
#include <stdio.h>
-#include <linux/types.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
+#include "types.h"
#include "attrib.h"
#include "endians.h"
@@ -64,5 +64,5 @@
MFT_RECORD *m = NULL;
ATTR_RECORD *a;
- __u64 l;
+ __s64 l;
unsigned char *lfd;
ntfs_volume *vol = NULL;
@@ -127,5 +127,5 @@
ctx.mrec = m;
/* Find the $DATA attribute of the $LogFile. */
- if (!find_first_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
+ if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
fprintf(stderr, "Error: Attribute $DATA was not found in" \
"$LogFile!\n");
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- ntfsfix.c 2001/04/11 15:47:36 1.14
+++ ntfsfix.c 2001/06/01 02:07:26 1.15
@@ -49,9 +49,9 @@
#include <stdlib.h>
#include <stdio.h>
-#include <linux/types.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
+#include "types.h"
#include "attrib.h"
#include "endians.h"
@@ -72,5 +72,5 @@
ssize_t br;
ATTR_RECORD *a;
- __u64 l;
+ __s64 l;
unsigned char *lfd;
ntfs_volume *vol = NULL;
@@ -84,5 +84,5 @@
printf("\n");
if (argc != 2) {
- printf("NtfsFix v%s - Attempt to fix an NTFS parition that "
+ printf("%s v%s - Attempt to fix an NTFS parition that "
"has been damaged by the\nLinux NTFS driver. Note that "
"you should run it every time after you have used\nthe "
@@ -104,6 +104,6 @@
/* Generic part ends here. */
"Syntax: ntfsfix partition_or_file_name\n"
- " e.g. ntfsfix /dev/hda6\n\n", EXEC_VERSION,
- EXEC_NAME, EXEC_NAME);
+ " e.g. ntfsfix /dev/hda6\n\n", EXEC_NAME,
+ EXEC_VERSION, EXEC_NAME, EXEC_NAME);
fprintf(stderr, "Error: incorrect syntax\n");
free(EXEC_REVISION);
@@ -133,5 +133,5 @@
/* Read $MFT and $MFTmirr. */
printf("Going to read $Mft... ");
- *(__u64*)&mref = FILE_$Mft;
+ *(__u64*)&mref = FILE_$MFT;
br = get_mft_records(vol, (MFT_RECORD*)b1, &mref, 4);
if (br != 4) {
@@ -347,5 +347,5 @@
memset(&ctx, 0, sizeof(attr_search_context));
ctx.mrec = (MFT_RECORD*)(b1 + (2 * mrs));
- if (!find_first_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
+ if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "Error: Attribute $DATA was not found in" \
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv13537/libntfs
Modified Files:
Makefile.am Makefile.in attrib.c bitmap.c bootsect.c disk_io.c
mft.c ntfs_rec.c ntfsd.c unistr.c volume.c
Log Message:
It has been a long time since last commit. At moment have done a lot of work
on mkntfs but also at the moment ntfsfix and ntfsdump_logfile and libntfs are
broken. Basically only mkntfs works and that is not complete either.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- Makefile.am 2001/04/07 00:53:37 1.5
+++ Makefile.am 2001/06/01 02:07:25 1.6
@@ -9,4 +9,11 @@
LTVERSION = 1:0:0
+# Need this to enable 64-bit (device) file access functions and parameters.
+if DEBUG
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
+else
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64
+endif
+
linux_ntfsincludedir = -I$(top_srcdir)/include
lib_LTLIBRARIES = libntfs.la
@@ -24,3 +31,6 @@
INCLUDES = $(linux_ntfsincludedir) $(all_includes)
+
+EXTRA_DIST = \
+ attrib_RE.c
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.in 2001/04/07 00:53:37 1.4
+++ Makefile.in 2001/06/01 02:07:25 1.5
@@ -1,3 +1,3 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
@@ -79,12 +79,17 @@
CXX = @CXX@
DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
LDFLAGS = @LDFLAGS@
LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
+STRIP = @STRIP@
VERSION = @VERSION@
all_includes = @all_includes@
@@ -92,4 +97,6 @@
LTVERSION = 1:0:0
+@DEBUG_TRUE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
+@DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64
linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -100,4 +107,7 @@
INCLUDES = $(linux_ntfsincludedir) $(all_includes)
+
+EXTRA_DIST = attrib_RE.c
+
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
@@ -130,5 +140,5 @@
all: all-redirect
.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu libntfs/Makefile
@@ -164,4 +174,9 @@
done
+# FIXME: We should only use cygpath when building on Windows,
+# and only if it is available.
+.c.obj:
+ $(COMPILE) -c `cygpath -w $<`
+
.s.o:
$(COMPILE) -c $<
@@ -172,4 +187,5 @@
mostlyclean-compile:
-rm -f *.o core *.core
+ -rm -f *.$(OBJEXT)
clean-compile:
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- attrib.c 2001/04/12 22:37:21 1.13
+++ attrib.c 2001/06/01 02:07:25 1.14
@@ -24,23 +24,116 @@
#include <stddef.h>
#include <stdio.h>
-#include <linux/types.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
-#include "attrib.h"
-#include "layout.h"
#include "types.h"
+#include "attrib.h"
#include "unistr.h"
#include "endians.h"
#include "disk_io.h"
#include "support.h"
+#include "mft.h"
+
+int write_non_resident_attr(attr *a)
+{
+ return -ENOTSUP;
+}
+
+int ntfs_flush_attr(attr *a)
+{
+ int err = 0;
+
+ if (!AttrDirty(a) || !AttrMapped(a))
+ return 0;
+ if (!AttrNonResident(a)) {
+ /* Resident, just flush the mft entry. */
+ if (err = ntfs_flush_mft_entry(a->a_m_entry))
+ return err;
+ ClearAttrDirty(a);
+ } else /* Non-resident, write out to disk. */
+ err = write_non_resident_attr(a);
+ ntfs_flush();
+ return err;
+}
+
+BOOL __set_attr_dirty(attr *a)
+{
+ ntfs_volume *v;
+
+ /* If resident just mark mft entry as dirty. */
+ if (!AttrNonResident(a)) {
+ ntfs_set_mft_entry_dirty(a->a_m_entry);
+ return;
+ }
+ /* It is non-resident so add to dirty list. */
+ v = a->a_vol;
+ list_add_tail(&a->a_dirty_list, &v->dirty_attrs);
+ v->nr_dirty_attrs++;
+ return TRUE;
+}
+
+__inline__ attr *__allocate_attr(void)
+{
+ attr *a = (attr *)malloc(sizeof(attr));
+ if (!a)
+ return NULL;
+ memset(a, 0, sizeof(attr));
+ INIT_LIST_HEAD(&a->a_dirty_list);
+ return a;
+}
+
+__inline__ int __free_attr(attr *a)
+{
+ if (a->a_count || AttrDirty(a) || AttrMapped(a))
+ return -EBUSY;
+ if (a->a_run_list)
+ free(a->a_run_list);
+ free(a);
+ return 0;
+}
+
+int __map_attr_value(attr *a)
+{
+ if (!AttrNonResident(a)) {
+ }
+ return -ENOTSUP;
+}
-int __map_attribute_value(attr *a)
+int __unmap_attr_value(attr *a)
{
+ if (!AttrMapped(a))
+ return 0;
return -ENOTSUP;
}
+
+int insert_attr(mft_entry *me, attr **a, ATTR_RECORD *arec, attr_val *aval,
+ const BOOL dirty, const BOOL nonresident, run_list *arl,
+ const BOOL inattrlist, ATTR_LIST_ENTRY *alist,
+ ATTR_LIST_ENTRY *alistentry, const BOOL inextrecord)
+{
+ attr *aent;
+
+ if (!*a && !(*a = __allocate_attr()))
+ return -errno;
+ aent = *a;
+ aent->a_rec = arec;
+ if (aval) {
+ if (nonresident) {
+ aent->a_run_list = arl;
+ SetAttrNonResident(aent);
+ }
+ aent->a_val = aval;
+
+ } else {
+ if (__map_attr_value(aent)) {
+ // error
+ }
+ }
+
+ return -ENOTSUP;
+}
-int __unmap_attribute_value(attr *a)
+int remove_attr(attr *a)
{
return -ENOTSUP;
@@ -49,9 +142,10 @@
/**
* find_attr - find (next) attribute in mft record
- * @vol: volume on which @a resides (used to find the upcase table)
* @type: attribute type to find
* @name: attribute name to find (optional, i.e. NULL means don't care)
* @name_len: attribute name length (only needed if @name present)
* @ic: IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
+ * @upcase: unicode upcase table
+ * @ucpase_len: length of upcase table in unicode characters
* @val: attribute value to find (optional, resident attributes only)
* @val_len: attribute value length
@@ -72,7 +166,6 @@
* @name_len is the @name length in Unicode characters.
*
- * If @name is not present (NULL), no attribute name checking is performed at
- * all. Thus, to find an unnamed attribute specifically, specify a @name
- * pointing to a zero length string.
+ * If @name is not present (NULL), we assume that the unnamed attribute is
+ * being searched for.
*
* Finally, the resident attribute value @val is looked for, if present. If @val
@@ -84,13 +177,15 @@
* lookup_attr() instead (see below). This also means that you cannot use
* find_attr() to search for extent records of non-resident attributes, as
- * extents with lowest_vcn != 0 are invariably described by the attribute list
- * attribute only.
+ * extents with lowest_vcn != 0 are usually described by the attribute list
+ * attribute only. - Note that it is possible that the first extent is only in
+ * the attribute list while the last extent is in the base mft record, so don't
+ * rely on being able to find the first extent in the base mft record.
*
* Warning: Never use @val when looking for attribute types which can be
* non-resident as this most likely will result in a crash!
*/
-BOOL find_attr(const ntfs_volume *vol, const ATTR_TYPES type,
- const wchar_t *name, const __u32 name_len,
- const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len,
+BOOL find_attr(const ATTR_TYPES type, const uchar_t *name, const __u32 name_len,
+ const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
+ const __u32 upcase_len, const __u8 *val, const __u32 val_len,
attr_search_context *ctx)
{
@@ -98,6 +193,6 @@
#ifdef DEBUG
- if (!vol || !ctx || !ctx->mrec || !ctx->attr) {
- printf(stderr, "find_attr() received NULL pointer!\n");
+ if (!ctx || !ctx->mrec || !ctx->attr) {
+ fprintf(stderr, "find_attr() received NULL pointer!\n");
return FALSE;
}
@@ -113,9 +208,7 @@
a = (ATTR_RECORD*)((char*)ctx->attr +
le32_to_cpu(ctx->attr->length));
- for (; p2n(a) >= p2n(ctx->mrec) &&
- (char*)a <= (char*)ctx->mrec + vol->mft_record_size;
- a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length))) {
- if (p2n(a) < p2n(ctx->mrec) ||
- (char*)a > (char*)ctx->mrec + vol->mft_record_size)
+ for (;; a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length))) {
+ if (p2n(a) < p2n(ctx->mrec) || (char*)a > (char*)ctx->mrec +
+ le32_to_cpu(ctx->mrec->bytes_allocated))
break;
ctx->attr = a;
@@ -127,12 +220,19 @@
if (a->type != type)
continue;
- /* If @name is present, compare the two names. */
- if (name && !ntfs_are_names_equal(name, name_len,
- (wchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
- a->name_length, ic, vol->upcase, vol->upcase_len)) {
+ /*
+ * If @name is present, compare the two names. If @name is
+ * missing, assume we want an unnamed attribute.
+ */
+ if (!name) {
+ /* The search failed if the found attribute is named. */
+ if (a->name_length)
+ return FALSE;
+ } else if (!ntfs_are_names_equal(name, name_len,
+ (uchar_t*)((char*)a + le16_to_cpu(a->name_offset)),
+ a->name_length, ic, upcase, upcase_len)) {
register int rc;
- rc = ntfs_collate_names(vol->upcase, vol->upcase_len,
- name, name_len, (wchar_t*)((char*)a +
+ rc = ntfs_collate_names(upcase, upcase_len,
+ name, name_len, (uchar_t*)((char*)a +
le16_to_cpu(a->name_offset)),
a->name_length, IGNORE_CASE, 1);
@@ -146,6 +246,6 @@
if (rc)
continue;
- rc = ntfs_collate_names(vol->upcase, vol->upcase_len,
- name, name_len, (wchar_t*)((char*)a +
+ rc = ntfs_collate_names(upcase, upcase_len,
+ name, name_len, (uchar_t*)((char*)a +
le16_to_cpu(a->name_offset)),
a->name_length, CASE_SENSITIVE, 1);
@@ -156,6 +256,7 @@
}
/*
- * The names match or @name not present. If no @val specified,
- * we have found the attribute and are done.
+ * The names match or @name not present and attribute is
+ * unnamed. If no @val specified, we have found the attribute
+ * and are done.
*/
if (!val)
@@ -183,5 +284,5 @@
}
#ifdef DEBUG
- printf(stderr, "find_attr(): File is corrupt. Run chkdsk.\n");
+ fprintf(stderr, "find_attr(): File is corrupt. Run chkdsk.\n");
#endif
return FALSE;
@@ -190,9 +291,10 @@
/**
* find_first_attr - find first attribute in mft record
- * @vol: volume on which @a resides (used to find the upcase table)
* @type: attribute type to find
* @name: attribute name to find (optional, i.e. NULL means don't care)
* @name_len: attribute name length (only needed if @name present)
* @ic: IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
+ * @upcase: unicode upcase table
+ * @ucpase_len: length of upcase table in unicode characters
* @val: attribute value to find (optional, resident attributes only)
* @val_len: attribute value length
@@ -202,8 +304,8 @@
* see description of find_attr() above.
*/
-__inline__ BOOL find_first_attr(const ntfs_volume *vol, const ATTR_TYPES type,
- const wchar_t *name, const __u32 name_len,
- const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len,
- attr_search_context *ctx)
+__inline__ BOOL find_first_attr(const ATTR_TYPES type, const uchar_t *name,
+ const __u32 name_len, const IGNORE_CASE_BOOL ic,
+ const uchar_t *upcase, const __u32 upcase_len,
+ const __u8 *val, const __u32 val_len, attr_search_context *ctx)
{
MFT_RECORD *m;
@@ -211,21 +313,22 @@
#ifdef DEBUG
- if (!vol || !ctx || !ctx->mrec) {
- printf(stderr, "find_first_attr() received NULL pointer!\n");
+ if (!ctx || !ctx->mrec) {
+ fprintf(stderr, "find_first_attr() received NULL pointer!\n");
return FALSE;
}
if (ctx->attr)
- printf(stderr, "find_first_attr(): received non-NULL attribute "
- "pointer.\nThis will be overwritten resulting "
- "in possible memory leakage.\n");
+ fprintf(stderr, "find_first_attr(): received non-NULL "
+ "attribute pointer.\nThis will be overwritten "
+ "resulting in possible memory leakage.\n");
#endif
m = ctx->mrec;
ctx->is_first = TRUE;
ctx->attr = a = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset));
- if (p2n(a) >= p2n(m) && (char*)a <= (char*)m + vol->mft_record_size)
- return find_attr(vol, type, name, name_len, ic, val, val_len,
- ctx);
+ if (p2n(a) >= p2n(m) && (char*)a <= (char*)m +
+ le32_to_cpu(m->bytes_allocated))
+ return find_attr(type, name, name_len, ic, upcase, upcase_len,
+ val, val_len, ctx);
#ifdef DEBUG
- printf(stderr, "find_first_attr(): file is corrupt.");
+ fprintf(stderr, "find_first_attr(): file is corrupt.");
#endif
return FALSE;
@@ -246,5 +349,5 @@
memset(&ctx, 0, sizeof(attr_search_context));
ctx.mrec = b;
- if (!find_first_attr(v, $VOLUME_INFORMATION, NULL, 0, 0, NULL, 0,
+ if (!find_first_attr($VOLUME_INFORMATION, NULL, 0, 0, NULL, 0, NULL, 0,
&ctx)) {
fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION was " \
@@ -317,5 +420,5 @@
return (__s64)le32_to_cpu(a->value_length);
} else { /* Attribute is not resident. */
- run_list rl;
+ run_list *rl;
__s64 total;
int r, i;
@@ -365,4 +468,5 @@
perror("Couldn't allocate memory for "
"internal buffer.\n");
+ free(rl);
errno = eo;
return 0;
@@ -399,4 +503,5 @@
}
#undef ESTR
+ free(rl);
return 0;
}
@@ -478,5 +583,5 @@
return 1;
} else { /* Attribute is not resident. */
- run_list rl;
+ run_list *rl;
__s64 total;
int w, i;
@@ -540,11 +645,11 @@
}
-run_list decompress_run_list(const ATTR_RECORD *attr)
+run_list *decompress_run_list(const ATTR_RECORD *attr)
{
VCN vcn; /* Current vcn. */
LCN lcn; /* Current lcn. */
__s64 deltaxcn; /* Change in [vl]cn. */
- run_list rl = NULL; /* The output run_list. */
- run_list rl2; /* Temporary run_list. */
+ run_list *rl = NULL; /* The output run_list. */
+ run_list *rl2; /* Temporary run_list. */
__u8* buf; /* Current position in mapping pairs array. */
int rlsize; /* Size of run_list buffer. */
@@ -597,6 +702,15 @@
* length as a signed value so that's how it is...
*/
- for (b = *buf & 0xf, deltaxcn = (__s8)buf[b--]; b; b--) {
- deltaxcn = (deltaxcn << 8) + buf[b];
+ b = *buf & 0xf;
+ if (b) {
+ for (deltaxcn = (__s8)buf[b--]; b; b--)
+ deltaxcn = (deltaxcn << 8) + buf[b];
+ } else { /* The length entry is compulsory. */
+#ifdef DEBUG
+ fprintf(stderr, "DEBUG Linux-NTFS: No length entry in "
+ "mapping pairs array.\n"
+ "decompress_run_list() failed.\n");
+#endif
+ deltaxcn = (__s64)-1;
}
/* Assume a negative length to indicate data corruption and
@@ -612,15 +726,30 @@
vcn += deltaxcn;
/* There might be no lcn change at all, as is the case for
- sparse clusters, in which case we set the lcn to -1. */
+ * sparse clusters on NTFS 3.0+, in which case we set the lcn
+ * to -1. */
if (!(*buf & 0xf0))
(rl + rlpos)->lcn = -1;
else {
/* Get the lcn change which really can be negative. */
- for (b = (*buf & 0xf) + ((*buf >> 4) & 0xf),
- deltaxcn = (__s8)buf[b--]; b > (*buf & 0xf); b--) {
+ for (b = (*buf & 0xf) + ((*buf >> 4) & 0xf), deltaxcn =
+ (__s8)buf[b--]; b > (*buf & 0xf); b--)
deltaxcn = (deltaxcn << 8) + buf[b];
- }
/* Change the current lcn to it's new value. */
lcn += deltaxcn;
+#ifdef DEBUG
+ /*
+ * On NTFS 1.2-, apparently can have lcn == -1 to
+ * indicate a hole. But we haven't verified ourselves
+ * whether it is really the lcn or the deltaxcn that is
+ * -1. So if either is found give us a message so we
+ * can investigate it further! (AIA)
+ */
+ if (deltaxcn == -1)
+ fprintf(stderr, "DEBUG Linux-NTFS: lcn delta "
+ "== -1\n");
+ else if (lcn == -1)
+ fprintf(stderr, "DEBUG Linux-NTFS: lcn "
+ "== -1\n");
+#endif
/* Enter the current lcn into the run_list_element. */
(rl + rlpos)->lcn = lcn;
@@ -670,7 +799,14 @@
puts("VCN LCN Run length");
for (i = 0; ; i++) {
- printf("%-16Lx %-16Lx %-16Lx\n", (rl + i)->vcn,
- (rl + i)->lcn,
- (rl + i)->length);
+ if ((rl + i)->lcn == -1)
+ printf("%-16Lx %-16i %-16Lx (%s)\n",
+ (rl + i)->vcn, -1, (rl + i)->length,
+ (rl + i)->length ? "sparse run" :
+ "run list end");
+ else
+ printf("%-16Lx %-16Lx %-16Lx%s\n",
+ (rl + i)->vcn, (rl + i)->lcn,
+ (rl + i)->length, (rl + i)->length ?
+ "" : " (run list end)");
if (!(rl + i)->length)
break;
@@ -682,5 +818,5 @@
}
-LCN vcn_to_lcn(const run_list rl, const VCN vcn)
+LCN vcn_to_lcn(const run_list *rl, const VCN vcn)
{
int i = 0;
Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bitmap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- bitmap.c 2001/04/08 03:02:55 1.4
+++ bitmap.c 2001/06/01 02:07:25 1.5
@@ -22,4 +22,5 @@
*/
+#include "types.h"
#include "bitmap.h"
@@ -37,4 +38,5 @@
const __u8 new_value)
{
+// printf("bitmap %p, bit 0x%Lx, new_value %i\n", bitmap, bit, new_value);
if (!bitmap || new_value > 1)
return;
@@ -52,20 +54,23 @@
}
+__inline__ void ntfs_change_bit(__u8 *bitmap, const __u64 bit)
+{
+ if (!bitmap)
+ return;
+ bitmap[bit >> 3] ^= 1 << (bit & 7);
+}
+
__inline__ char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
const __u8 new_value)
{
- __u8 b, old_value;
+ register __u8 old_bit, shift;
if (!bitmap || new_value > 1)
return -1;
- b = bitmap[bit >> 3];
- old_value = (b >> (bit & 7)) & 1;
- if (new_value != old_value) {
- if (!new_value)
- bitmap[bit >> 3] = b & ~(1 << (bit & 7));
- else
- bitmap[bit >> 3] = b | (1 << (bit & 7));
- }
- return old_value;
+ shift = bit & 7;
+ old_bit = (bitmap[bit >> 3] >> shift) & 1;
+ if (new_value != old_bit)
+ bitmap[bit >> 3] ^= 1 << shift;
+ return old_bit;
}
Index: bootsect.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bootsect.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- bootsect.c 2001/04/08 03:02:55 1.4
+++ bootsect.c 2001/06/01 02:07:26 1.5
@@ -24,6 +24,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <linux/types.h>
+#include "types.h"
#include "bootsect.h"
#include "endians.h"
@@ -86,5 +86,5 @@
puts("OK");
- /* Check the sector size is not above 65536 bytes. */
+ /* Check the cluster size is not above 65536 bytes. */
if (!silent)
printf("Checking cluster size... ");
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- disk_io.c 2001/04/11 15:29:39 1.13
+++ disk_io.c 2001/06/01 02:07:26 1.14
@@ -24,16 +24,14 @@
#include <unistd.h>
#include <stdlib.h>
-#include <linux/types.h>
#include <string.h>
#include <errno.h>
#include <stdio.h>
-#include "layout.h"
#include "types.h"
#include "disk_io.h"
-__u64 ntfs_pwrite(int fd, const void *b, __u64 count, const __u64 pos)
+__s64 ntfs_pwrite(int fd, const void *b, __s64 count, const __s64 pos)
{
- __u64 written, total;
+ __s64 written, total;
char retry;
@@ -75,7 +73,7 @@
* mst read on the written data. This way cache coherency is achieved.
*/
-__u64 mst_pwrite(int fd, const void *b, __u64 count, const __u64 pos)
+__s64 mst_pwrite(int fd, const void *b, __s64 count, const __s64 pos)
{
- __u64 written, total, error;
+ __s64 written, total, error;
char retry;
@@ -124,8 +122,8 @@
}
-__u64 ntfs_pread(const int fd, void *b, const __u32 bksize, __u64 count,
- const __u64 pos)
+__s64 ntfs_pread(const int fd, void *b, const __u32 bksize, __s64 count,
+ const __s64 pos)
{
- __u64 br, btr, total;
+ __s64 br, btr, total;
char bksize_bits;
@@ -183,8 +181,8 @@
}
-__u64 mst_pread(const int fd, void *b, const __u32 bksize, __u64 count,
- const __u64 pos)
+__s64 mst_pread(const int fd, void *b, const __u32 bksize, __s64 count,
+ const __s64 pos)
{
- __u64 br, i;
+ __s64 br, i;
char bksize_bits;
@@ -209,5 +207,5 @@
const int count)
{
- __u64 br;
+ __s64 br;
if (!vol || !buf || count < 0 || lcn < 0)
@@ -238,5 +236,5 @@
int put_clusters(ntfs_volume *vol, const __u8 *buf, const __s64 lcn, int count)
{
- __u64 bw;
+ __s64 bw;
if (!vol || !buf || count < 0 || lcn < 0)
@@ -265,5 +263,5 @@
/**
- * get_mft_records - read records from the mft
+ * get_mft_records - read records from the mft from disk
* @vol: volume to read from
* @mrec: output data buffer
@@ -281,5 +279,5 @@
const MFT_REF *mref, const int count)
{
- __u64 br, ofs;
+ __s64 br, ofs;
LCN lcn;
VCN m;
@@ -294,24 +292,11 @@
if (!ntfs_get_bit(vol->mft_bitmap, m))
return -ENOENT;
- /* Size of mft record != size of cluster thus need to work with
- offsets into clusters. */
- if (vol->mft_records_per_cluster) {
- lcn = vcn_to_lcn(vol->mft_runlist,
- m / vol->mft_records_per_cluster);
- /* FIXME: Change "/" above and "%" below to ">>" and "&"
- respectively! */
- ofs = m % vol->mft_records_per_cluster;
- ofs <<= vol->mft_record_size_bits;
- } else {
- lcn = vcn_to_lcn(vol->mft_runlist,
- m * vol->clusters_per_mft_record);
- /* FIXME: Change "*" above to "<<"! */
- ofs = 0;
+ lcn = vcn_to_lcn(vol->mft_runlist, m << vol->mft_record_size_bits >>
+ vol->cluster_size_bits);
+ if (lcn == -1) {
+ perror("Error sparse $Mft records are not supported");
+ return -ENOTSUP;
}
- if (lcn < 0) {
- int eo = errno;
- perror("Error determining on disk location of $Mft record");
- return -eo;
- }
+ ofs = m << vol->mft_record_size_bits & vol->cluster_size - 1;
br = mst_pread(vol->fd, (__u8*)mrec, vol->mft_record_size, count,
(lcn << vol->cluster_size_bits) + ofs);
@@ -354,5 +339,5 @@
/**
- * read_file_record - read a FILE record from the mft
+ * __read_file_record - read a FILE record from the mft from disk
* @vol: volume to read from
* @mref: mft reference specifying mft record to read
@@ -360,8 +345,9 @@
* @attr: address of pointer in which to return the first attribute
*
- * Read a FILE record from the mft of @vol. @mref specifies the mft record
- * to read, including the sequence number. When the function returns, @mrec and
- * @attr will contain pointers to the read mft record and to the first attribute
- * within the mft record, respectively. @attr is optional (can be NULL).
+ * Read a FILE record from the mft of @vol from the storage medium. @mref
+ * specifies the mft record to read, including the sequence number. When the
+ * function returns, @mrec and @attr will contain pointers to the read mft
+ * record and to the first attribute within the mft record, respectively.
+ * @attr is optional (can be NULL).
*
* The read mft record is checked for having the magic FILE, for being in use,
@@ -373,6 +359,6 @@
* Note: Caller has to free *@mrec when finished.
*/
-int read_file_record(const ntfs_volume *vol, const MFT_REF *mref,
- MFT_RECORD **mrec, ATTR_RECORD **attr)
+int __read_file_record(const ntfs_volume *vol, const MFT_REF *mref,
+ MFT_RECORD **mrec, ATTR_RECORD **attr)
{
MFT_RECORD *m;
@@ -413,7 +399,37 @@
}
+/**
+ * read_file_record - read a FILE record from the mft from @vol
+ * @vol: volume to read from
+ * @mref: mft reference specifying mft record to read
+ * @mrec: address of pointer in which to return the mft record
+ * @attr: address of pointer in which to return the first attribute
+ *
+ * Return the FILE record @mref from the mft of @vol. @mref, the mft record to
+ * return, includes the sequence number, which can be 0 if no sequence number
+ * checking is to be performed. If the mft record is already loaded in the
+ * volume's mft cache this is returned straight away. Otherwise a new mft entry
+ * is allocated and inserted into the cache and the mft record is within the
+ * entry is returned. When the function returns, @mrec and @attr will contain
+ * pointers to the mft record and to the first attribute within the mft record,
+ * respectively. @attr is optional (can be NULL).
+ *
+ * The mft record is checked for having the magic FILE, for being in use,
+ * and for having a matching sequence number (if MSEQNO(*@mref) != 0).
+ * If either of these fails, return -EIO.
+ *
+ * Return 0 on success, or -ERRNO on error, where ERRNO is the error code.
+ *
+ * Note: Caller has to free *@mrec when finished.
+ */
+int read_file_record(const ntfs_volume *vol, const MFT_REF *mref,
+ MFT_RECORD **mrec, ATTR_RECORD **attr)
+{
+ return -ENOTSUP;
+}
+
int put_mft_record(ntfs_volume *vol, const __u8 *buf, const MFT_REF *mref)
{
- __u64 bw, m;
+ __s64 bw, m;
__s64 lcn, ofs;
@@ -427,20 +443,12 @@
if (!ntfs_get_bit(vol->mft_bitmap, m))
return -ENOENT;
- /* Size of mft record != size of cluster thus need to work with offsets
- into clusters. */
- if (vol->mft_records_per_cluster) {
- lcn = vcn_to_lcn(vol->mft_runlist,
- m / vol->mft_records_per_cluster);
- /* FIXME: Change "/" above and "%" below to ">>" and "&"
- respectively! */
- ofs = m % vol->mft_records_per_cluster;
- ofs <<= vol->mft_record_size_bits;
- } else {
- lcn = vcn_to_lcn(vol->mft_runlist,
- m * vol->clusters_per_mft_record);
- /* FIXME: Change "*" above to "<<"! */
- ofs = 0;
+ lcn = vcn_to_lcn(vol->mft_runlist, m << vol->mft_record_size_bits >>
+ vol->cluster_size_bits);
+ if (lcn == -1) {
+ perror("Error sparse $Mft records are not supported");
+ return -ENOTSUP;
}
- if (lcn < 0) {
+ ofs = m << vol->mft_record_size_bits & vol->cluster_size - 1;
+ if (lcn == -1) {
int eo = errno;
perror("Error determining on disk location of $Mft record");
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- mft.c 2001/04/11 14:29:12 1.9
+++ mft.c 2001/06/01 02:07:26 1.10
@@ -25,14 +25,12 @@
#include <stdio.h>
#include <errno.h>
-#include <linux/types.h>
-#include <linux/bitops.h>
+#include "types.h"
#include "list.h"
#include "mft.h"
-#include "layout.h"
-#include "types.h"
#include "endians.h"
[...1283 lines suppressed...]
ntfs_volume *v;
- if (f->f_count > 0 && --f->f_count)
- return 0;
- f->f_count = 0;
- list_del(&f->f_list);
- v = f->f_vol;
- v->nr_open_files--;
- list_add(&f->f_list, &v->closed_files);
- v->nr_closed_files++;
- return 0;
+
+ if (--f->f_count > 1)
+ return 0;
+ /* Remove all mft_refs/_entries from @f and, if no errors, remove @f
+ * from its volume and kill the file. */
+ if (!__remove_all_mft_entries_from_file(f))
+ return __free_ntfs_file(f);
+ return -1;
}
Index: ntfs_rec.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfs_rec.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- ntfs_rec.c 2001/04/11 15:48:41 1.8
+++ ntfs_rec.c 2001/06/01 02:07:26 1.9
@@ -23,9 +23,8 @@
#include <stdio.h>
-#include <linux/types.h>
+#include "types.h"
#include "volume.h"
#include "ntfs_rec.h"
-#include "layout.h"
#include "endians.h"
@@ -63,5 +62,6 @@
/* Setup the variables. */
usa_ofs = le16_to_cpu(b->usa_ofs);
- usa_count = le16_to_cpu(b->usa_count);
+ /* Decrement usa_count to get number of fixups. */
+ usa_count = le16_to_cpu(b->usa_count) - 1;
/* Size and alignement checks. */
if ( size & (NTFS_SECTOR_SIZE - 1) ||
@@ -70,6 +70,4 @@
(size >> NTFS_SECTOR_SIZE_BITS) != usa_count)
return 1;
- /* Decrement usa_count to get number of fixups. */
- --usa_count;
/* Position of usn in update sequence array. */
usa_pos = (__u16*)b + usa_ofs/sizeof(__u16);
@@ -127,13 +125,12 @@
/* Setup the variables. */
usa_ofs = le16_to_cpu(b->usa_ofs);
- usa_count = le16_to_cpu(b->usa_count);
+ /* Decrement usa_count to get number of fixups. */
+ usa_count = le16_to_cpu(b->usa_count) - 1;
/* Size and alignement checks. */
if ( size & (NTFS_SECTOR_SIZE - 1) ||
- usa_ofs & 1 ||
+ usa_ofs & 1 ||
usa_ofs + (usa_count * 2) > size ||
(size >> NTFS_SECTOR_SIZE_BITS) != usa_count)
return 0;
- /* Decrement usa_count to get number of fixups. */
- --usa_count;
/* Position of usn in update sequence array. */
usa_pos = (__u16*)((__u8*)b + usa_ofs);
Index: ntfsd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfsd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- ntfsd.c 2001/04/11 15:29:39 1.5
+++ ntfsd.c 2001/06/01 02:07:26 1.6
@@ -37,10 +37,34 @@
*/
LIST_HEAD(ntfs_mounted_volumes);
-int nr_ntfs_mounted_volumes = 0;
-BOOL ntfs_need_sync = FALSE;
+atomic_t ntfs_nr_mounted_volumes = ATOMIC_INIT(0);
/*
- * Keep track of how many times the timer has been starter.
+ * Private global flags for NTFS.
+ *
+ * NF_need_sync bit is set by ntfsd every 5 seconds and cleared by ntfs_flush(),
+ * when it is called.
+ *
+ * NF_ntfsd_running is set by ntfs_flush() when it initiates the sync to disk
+ * and cleared when it finishes. This prevents reentry and loops where
+ * ntfs_flush() will call a function which will have an ntfs_flush() call in
+ * its code path.
*/
+static unsigned long ntfs_flags = 0;
+
+#define NF_need_sync 0
+#define NF_ntfsd_running 1
+ /* bits 2-31 reserved for future use */
+
+#define NtfsNeedSync(n) test_bit(NF_need_sync, &(n))
+#define SetNtfsNeedSync(n) set_bit(NF_need_sync, &(n))
+#define ClearNtfsNeedSync(n) clear_bit(NF_need_sync, &(n))
+
+#define NtfsdRunning(n) test_bit(NF_ntfsd_running, &(n))
+#define SetNtfsdRunning(n) set_bit(NF_ntfsd_running, &(n))
+#define ClearNtfsdRunning(n) clear_bit(NF_ntfsd_running, &(n))
+
+/*
+ * Keep track of how many times the timer has been started.
+ */
static atomic_t ntfsd_times_started = ATOMIC_INIT(0);
@@ -53,39 +77,38 @@
/* Convenience strings. */
static const char *ntfsd_internal_error = "Internal error.";
-static const char *ntfsd_sigalrm_not_supported = "The system does not support "
+static const char *ntfsd_sigalrm_not_supported = "This system does not support "
"the SIGALRM signal.";
-int ntfs_sync_volumes(void)
+static void ntfs_flush_all_volumes(void)
{
- int i = 0;
struct list_head *tmp;
ntfs_volume *vol;
- ntfs_need_sync = FALSE;
- if (!nr_ntfs_mounted_volumes)
- return 0;
+ if (!atomic_read(&ntfs_nr_mounted_volumes))
+ return;
list_for_each(tmp, &ntfs_mounted_volumes) {
vol = list_entry(tmp, ntfs_volume, v_list);
- i = 0;
-repeat_sync:
- if (!ntfs_sync_volume(vol)) {
- switch (errno) {
- case EINTR:
- case EAGAIN:
- if (i++ < 3)
- goto repeat_sync;
- break;
- }
- fprintf(stderr, "Linux-NTFS: sync_volume() "
+ if (ntfs_sync_volume(vol) < 0) {
+#ifdef DEBUG
+ fprintf(stderr, "DEBUG Linux-NTFS: ntfs_sync_volume() "
"failed for volume %s (%s): %s",
vol->vol_name, vol->dev_name,
strerror(errno));
+#endif
}
+ }
+}
+
+__inline__ void ntfs_flush(void)
+{
+ if (test_and_clear_bit(NF_need_sync, &ntfs_flags) &&
+ !test_and_set_bit(NF_ntfsd_running, &ntfs_flags)) {
+ ntfs_flush_all_volumes();
+ ClearNtfsdRunning(ntfs_flags);
}
- return;
}
/*
- * The signal handler which sets the ntfs_need_sync to true every time it is
+ * The signal handler which sets ntfs_need_sync to true every time it is
* called. (Every 5 seconds. Only if it is started and there are some mounted
* volumes.)
@@ -93,6 +116,7 @@
static void ntfsd_thread(int i)
{
- if (atomic_read(&ntfsd_times_started) && nr_ntfs_mounted_volumes)
- ntfs_need_sync = TRUE;
+ if (atomic_read(&ntfsd_times_started) &&
+ atomic_read(&ntfs_nr_mounted_volumes))
+ SetNtfsNeedSync(ntfs_flags);
}
Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/unistr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- unistr.c 2001/04/08 03:02:55 1.4
+++ unistr.c 2001/06/01 02:07:26 1.5
@@ -22,4 +22,7 @@
*/
+#include <stdio.h>
+
+#include "types.h"
#include "unistr.h"
@@ -56,8 +59,8 @@
* the @upcase table is used to performa a case insensitive comparison.
*/
-BOOL ntfs_are_names_equal(const wchar_t *s1, size_t s1_len,
- const wchar_t *s2, size_t s2_len,
+BOOL ntfs_are_names_equal(const uchar_t *s1, size_t s1_len,
+ const uchar_t *s2, size_t s2_len,
const IGNORE_CASE_BOOL ic,
- const wchar_t *upcase, const __u32 upcase_size)
+ const uchar_t *upcase, const __u32 upcase_size)
{
if (s1_len != s2_len)
@@ -87,15 +90,15 @@
* The following characters are considered invalid: '"', '*', '<', '>' and '?'.
*/
-int ntfs_collate_names(const wchar_t *upcase, const __u32 upcase_len,
- const wchar_t *name1, const __u32 name1_len,
- const wchar_t *name2, const __u32 name2_len,
+int ntfs_collate_names(const uchar_t *upcase, const __u32 upcase_len,
+ const uchar_t *name1, const __u32 name1_len,
+ const uchar_t *name2, const __u32 name2_len,
const IGNORE_CASE_BOOL ic, const int err_val)
{
__u32 cnt;
- wchar_t c1, c2;
+ uchar_t c1, c2;
#ifdef DEBUG
if (!name1 || !name2 || ic && !upcase && upcase_len) {
- printf(stderr, "ntfs_wcsncmp() received NULL pointer!\n");
+ fprintf(stderr, "ntfs_wcsncmp() received NULL pointer!\n");
exit(1);
}
@@ -145,12 +148,12 @@
* to be less than, to match, or be greater than @s2.
*/
-int ntfs_wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n)
+int ntfs_wcsncmp(const uchar_t *s1, const uchar_t *s2, size_t n)
{
- wchar_t c1, c2;
+ uchar_t c1, c2;
size_t i;
#ifdef DEBUG
if (!s1 || !s2) {
- printf(stderr, "ntfs_wcsncmp() received NULL pointer!\n");
+ fprintf(stderr, "ntfs_wcsncmp() received NULL pointer!\n");
exit(1);
}
@@ -187,13 +190,13 @@
* to be less than, to match, or be greater than @s2.
*/
-int ntfs_wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n,
- const wchar_t *upcase, const __u32 upcase_size)
+int ntfs_wcsncasecmp(const uchar_t *s1, const uchar_t *s2, size_t n,
+ const uchar_t *upcase, const __u32 upcase_size)
{
- wchar_t c1, c2;
+ uchar_t c1, c2;
size_t i;
#ifdef DEBUG
if (!s1 || !s2 || !upcase) {
- printf(stderr, "ntfs_wcsncasecmp() received NULL pointer!\n");
+ fprintf(stderr, "ntfs_wcsncasecmp() received NULL pointer!\n");
exit(1);
}
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- volume.c 2001/04/11 14:29:12 1.15
+++ volume.c 2001/06/01 02:07:26 1.16
@@ -28,10 +28,8 @@
#include <fcntl.h>
#include <unistd.h>
-#include <linux/types.h>
+#include "types.h"
#include "list.h"
-#include "layout.h"
#include "volume.h"
-#include "types.h"
#include "support.h"
#include "bootsect.h"
@@ -41,30 +39,104 @@
#include "mft.h"
-BOOL ntfs_sync_volume(ntfs_volume *vol)
+/**
+ * ntfs_sync_volume - sync a mounted ntfs volume to physical storage
+ * @vol: ntfs volume to sync
+ *
+ * Sync a mounted ntfs volumes to physical storage.
+ *
+ * Return zero on success and -1 if one or more mft records and/or
+ * non-resident attributes were busy, and could not be committed to disk.
+ */
+int ntfs_sync_volume(ntfs_volume *vol)
{
struct list_head *tmp;
- int i, nr_err;
+ int s = 0;
- i = nr_err = 0;
- list_for_each(tmp, &vol->dirty_mft_entries)
- if (flush_mft_entry(list_entry(tmp, mft_entry, m_dirty_list)))
- nr_err++;
- if (!nr_err)
- return TRUE;
- errno = EBUSY;
- return FALSE;
+ list_for_each(tmp, &vol->dirty_attrs) {
+ if (!ntfs_flush_attr(list_entry(tmp, attr, a_dirty_list)) || s)
+ continue;
+ s = -1;
+ }
+ list_for_each(tmp, &vol->dirty_mft_entries) {
+ if (!ntfs_flush_mft_entry(list_entry(tmp, mft_entry,
+ m_dirty_list)) || s)
+ continue;
+ s = -1;
+ }
+ return s;
+}
+
+static __inline__ ntfs_volume *__allocate_ntfs_volume()
+{
+ ntfs_volume *v = (ntfs_volume *)malloc(sizeof(ntfs_volume));
+ if (!v)
+ return NULL;
+ memset(v, 0, sizeof(ntfs_volume));
+ INIT_LIST_HEAD(&v->open_files);
+ INIT_LIST_HEAD(&v->mft_entries);
+ INIT_LIST_HEAD(&v->dirty_mft_entries);
+ INIT_LIST_HEAD(&v->dirty_attrs);
+ return v;
+}
+
+static __inline__ int __free_ntfs_volume(ntfs_volume *v)
+{
+ if (v->nr_open_files || v->nr_mft_entries || v->nr_dirty_attrs)
+ return -1;
+ if (v->dev_name)
+ free(v->dev_name);
+ if (v->vol_name)
+ free(v->vol_name);
+ if (v->lcn_bitmap)
+ free(v->lcn_bitmap);
+ if (v->mft_bitmap)
+ free(v->mft_bitmap);
+ if (v->mft_runlist)
+ free(v->mft_runlist);
+ if (v->upcase)
+ free(v->upcase);
+ free(v);
+ return 0;
+}
+
+/**
+ * __init_ntfs_volume - initialize an ntfs_volume
+ * @v: ntfs_volume to initialize
+ *
+ * Before we can use any of the libntfs higher level functions to open files,
+ * load mft records and such like, we need to load the system files but these
+ * are files. Catch 22!
+ *
+ * So we have to cheat, i.e. we setup a minumum set of fields in @v to more or
+ * less faked values, just to allow us to use the library functions to open the
+ * system files. Perhaps not the most beautiful solution but IMO the most
+ * elegant one. Otherwise we would have to keep around special functions to work
+ * without all the information required or we would need to do everything
+ * manually (as it used to be in the early days of Linux-NTFS).
+ *
+ * Using a fake-it approach means we still use the same code for everything,
+ * even for meta data, which is way cool. It does mean we have some uglyness in
+ * the mount code path but hey, it's just the mount... All the real fun comes
+ * after mounting anyway.
+ *
+ * Once we have opened the system files we do the proper initialisation of @v,
+ * disposing off the faked info as we go along.
+ */
+int __init_ntfs_volume(ntfs_volume *v)
+{
+ return 0;
}
ntfs_volume *ntfs_mount(const char *name)
{
- const char *OK = "OK";
- const char *FAILED = "FAILED";
+ const char *OK = "OK";
+ const char *FAILED = "FAILED";
ntfs_volume *vol = NULL;
- NTFS_BOOT_SECTOR *bs = NULL;
+ NTFS_BOOT_SECTOR *bs = NULL;
MFT_RECORD *mb = NULL;
ATTR_RECORD *a;
VOLUME_INFORMATION *vinf;
__u32 u;
- __u64 l;
+ __s64 l;
ssize_t br;
__u8 sectors_per_cluster, bits;
@@ -73,5 +145,5 @@
MFT_REF mref;
int err;
-
+
if (!name) {
errno = EINVAL;
@@ -79,11 +151,10 @@
}
/* Allocate the volume structure. */
- if (!(vol = (ntfs_volume *)malloc(sizeof(ntfs_volume)))) {
+ vol = __allocate_ntfs_volume();
+ if (!vol) {
perror("Error allocating memory for ntfs volume structure");
errno = ENOMEM;
goto error_exit;
}
- /* Zero the volume structure. */
- memset(vol, 0, sizeof(ntfs_volume));
/* Make a copy of the partition name. */
if (!(vol->dev_name = strdup(name))) {
@@ -93,131 +164,129 @@
}
/* Allocate the boot sector structure. */
- if (!(bs = (NTFS_BOOT_SECTOR *)malloc(sizeof(NTFS_BOOT_SECTOR)))) {
- puts(FAILED);
- perror("Error allocating memory for bootsector");
+ if (!(bs = (NTFS_BOOT_SECTOR *)malloc(sizeof(NTFS_BOOT_SECTOR)))) {
+ puts(FAILED);
+ perror("Error allocating memory for bootsector");
errno = ENOMEM;
goto error_exit;
- }
- printf("Reading bootsector... ");
- if ((vol->fd = open(name, O_RDWR)) == -1) {
+ }
+ printf("Reading bootsector... ");
+ if ((vol->fd = open(name, O_RDWR)) == -1) {
int eo = errno;
- puts(FAILED);
- perror("Error opening partition file");
+ puts(FAILED);
+ perror("Error opening partition file");
errno = eo;
goto error_exit;
- }
- /* Now read the bootsector. */
- br = ntfs_pread(vol->fd, bs, sizeof(NTFS_BOOT_SECTOR), 1, 0);
- if (br != 1) {
+ }
+ /* Now read the bootsector. */
+ br = ntfs_pread(vol->fd, bs, sizeof(NTFS_BOOT_SECTOR), 1, 0);
+ if (br != 1) {
int eo = errno;
- puts(FAILED);
+ puts(FAILED);
#define ESTR "Error reading bootsector"
- if (br == -1) {
- perror(ESTR);
+ if (br == -1) {
+ perror(ESTR);
errno = eo;
} else if (!br) {
- fprintf(stderr, "Error: partition is smaller than " \
- "bootsector size. Weird!\n");
+ fprintf(stderr, "Error: partition is smaller than " \
+ "bootsector size. Weird!\n");
errno = EINVAL;
} else {
- fprintf(stderr, ESTR ": unknown error\n");
+ fprintf(stderr, ESTR ": unknown error\n");
errno = EINVAL;
}
#undef ESTR
- goto error_exit;
- }
- puts(OK);
- if (!is_boot_sector_ntfs(bs, 0)) {
- fprintf(stderr, "Error: %s is not a valid NTFS partition!\n",
- name);
+ goto error_exit;
+ }
+ puts(OK);
+ if (!is_boot_sector_ntfs(bs, 0)) {
+ fprintf(stderr, "Error: %s is not a valid NTFS partition!\n",
+ name);
errno = EINVAL;
- goto error_exit;
- }
- /* The bounds checks on mft_lcn and mft_mirr_lcn (i.e. them being
- below or equal the number_of_clusters) really belong in the
- is_boot_sector_ntfs but in this way we can just do this once. */
- sectors_per_cluster = bs->bpb.sectors_per_cluster;
+ goto error_exit;
+ }
+ /* The bounds checks on mft_lcn and mft_mirr_lcn (i.e. them being
+ * below or equal the number_of_clusters) really belong in the
+ * is_boot_sector_ntfs but in this way we can just do this once. */
+ sectors_per_cluster = bs->bpb.sectors_per_cluster;
#ifdef DEBUG
printf("NumberOfSectors = %Li\n", sle64_to_cpu(bs->number_of_sectors));
- printf("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
+ printf("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
#endif
- for (bits = 0; sectors_per_cluster > 1; sectors_per_cluster >>= 1)
- bits++;
- sectors_per_cluster = bs->bpb.sectors_per_cluster;
-
- vol->number_of_clusters = sle64_to_cpu(bs->number_of_sectors) >> bits;
-
- vol->mft_lcn = sle64_to_cpu(bs->mft_lcn);
- vol->mftmirr_lcn = sle64_to_cpu(bs->mftmirr_lcn);
-
- if ((vol->mft_lcn > vol->number_of_clusters) ||
- (vol->mftmirr_lcn > vol->number_of_clusters)) {
- fprintf(stderr, "Error: %s is not a valid NTFS partition! " \
- "($Mft LCN or\n$MftMirr LCN is greater than " \
- "the number of clusters!\n", name);
+ if (sectors_per_cluster & sectors_per_cluster - 1) {
+ fprintf(stderr, "Error: %s is not a valid NTFS partition! "
+ "sectors_per_cluster is not a power of 2.\n",
+ name);
errno = EINVAL;
- goto error_exit;
- }
- vol->cluster_size = sectors_per_cluster *
- le16_to_cpu(bs->bpb.bytes_per_sector);
- u = vol->cluster_size;
- for (bits = 0; u > 1; u >>= 1)
- bits++;
- vol->cluster_size_bits = bits;
-
- /* Need to get the clusters per mft record and handle it if it is
- negative. Then calculate the mft_record_size and replace the
- cluster_size with the mft_record_size where applicable below!
- A value of 0x80 is illegal, thus signed char is actually ok! */
- c = bs->clusters_per_mft_record;
+ goto error_exit;
+ }
+ vol->number_of_clusters = sle64_to_cpu(bs->number_of_sectors) >>
+ ffs(sectors_per_cluster) - 1;
+
+ vol->mft_lcn = sle64_to_cpu(bs->mft_lcn);
+ vol->mftmirr_lcn = sle64_to_cpu(bs->mftmirr_lcn);
#ifdef DEBUG
- printf("ClusterSize = 0x%x\n", vol->cluster_size);
+ printf("MFT LCN = %Li\n", vol->mft_lcn);
+ printf("MFTMirr LCN = 0x%Li\n", vol->mftmirr_lcn);
+#endif
+ if ((vol->mft_lcn > vol->number_of_clusters) ||
+ (vol->mftmirr_lcn > vol->number_of_clusters)) {
+ fprintf(stderr, "Error: %s is not a valid NTFS partition! "
+ "($Mft LCN or\n$MftMirr LCN is greater than "
+ "the number of clusters!\n", name);
+ errno = EINVAL;
+ goto error_exit;
+ }
+ vol->cluster_size = sectors_per_cluster *
+ le16_to_cpu(bs->bpb.bytes_per_sector);
+ if (vol->cluster_size & vol->cluster_size - 1) {
+ fprintf(stderr, "Error: %s is not a valid NTFS partition! "
+ "cluster_size is not a power of 2.\n", name);
+ errno = EINVAL;
+ goto error_exit;
+ }
+ vol->cluster_size_bits = ffs(vol->cluster_size) - 1;
+ /*
+ * Need to get the clusters per mft record and handle it if it is
+ * negative. Then calculate the mft_record_size. A value of 0x80 is
+ * illegal, thus signed char is actually ok!
+ */
+ c = bs->clusters_per_mft_record;
+#ifdef DEBUG
+ printf("ClusterSize = 0x%x\n", vol->cluster_size);
printf("ClusterSizeBits = %u\n", vol->cluster_size_bits);
- printf("ClustersPerMftRecord = 0x%x\n", c);
+ printf("ClustersPerMftRecord = 0x%x\n", c);
#endif
- /* When clusters_per_mft_record is negative, it means that it is to
- be taken to be the negative base 2 logarithm of the mft_record_size
- in bytes. Then:
- mft_record_size = 2^(-clusters_per_mft_record) bytes. */
- if (c < 0)
- vol->mft_record_size = 1 << -c;
- else
- vol->mft_record_size = vol->cluster_size * c;
- u = vol->mft_record_size;
- for (bits = 0; u > 1; u >>= 1)
- bits++;
- vol->mft_record_size_bits = bits;
- if (vol->cluster_size > vol->mft_record_size) {
- vol->mft_records_per_cluster = vol->cluster_size /
- vol->mft_record_size;
- vol->clusters_per_mft_record = 0;
- } else {
- vol->mft_records_per_cluster = 0;
- vol->clusters_per_mft_record = vol->mft_record_size /
- vol->cluster_size;
+ /*
+ * When clusters_per_mft_record is negative, it means that it is to
+ * be taken to be the negative base 2 logarithm of the mft_record_size
+ * min bytes. Then:
+ * mft_record_size = 2^(-clusters_per_mft_record) bytes.
+ */
+ if (c < 0)
+ vol->mft_record_size = 1 << -c;
+ else
+ vol->mft_record_size = vol->cluster_size * c;
+ if (vol->mft_record_size & vol->mft_record_size - 1) {
+ fprintf(stderr, "Error: %s is not a valid NTFS partition! "
+ "mft_record_size is not a power of 2.\n", name);
+ errno = EINVAL;
+ goto error_exit;
}
+ vol->mft_record_size_bits = ffs(vol->mft_record_size) - 1;
+ vol->max_open_files = 10000;
#ifdef DEBUG
- printf("MftRecordSize = 0x%x\n", vol->mft_record_size);
+ printf("MftRecordSize = 0x%x\n", vol->mft_record_size);
printf("MftRecordSizeBits = %u\n", vol->mft_record_size_bits);
- printf("There are %i mft records in each cluster.\n",
- vol->mft_records_per_cluster);
- printf("There are %i clusters in each mft record.\n",
- vol->clusters_per_mft_record);
+ printf("max_open_files set to %u\n", vol->max_open_files);
#endif
- /* Initialize files and mft records lists and associated variables. */
- INIT_LIST_HEAD(&vol->open_files);
- INIT_LIST_HEAD(&vol->closed_files);
- vol->max_files = 1000;
- INIT_LIST_HEAD(&vol->mft_entries);
- INIT_LIST_HEAD(&vol->dirty_mft_entries);
/* Start with $Mft. */
printf("Loading $Mft... ");
if (!(mb = (MFT_RECORD *)malloc(vol->mft_record_size))) {
- puts(FAILED);
- perror("Error allocating memory for $Mft");
+ puts(FAILED);
+ perror("Error allocating memory for $Mft");
errno = ENOMEM;
goto error_exit;
- }
- /* Can't use get_mft_records yet!!! */
+ }
+ /* Can't use any of the higher level functions yet! */
br = mst_pread(vol->fd, (char *)mb, vol->mft_record_size, 1,
vol->mft_lcn << vol->cluster_size_bits);
@@ -238,5 +307,5 @@
if (is_baad_record(mb)) {
puts(FAILED);
- fprintf(stderr, "Error: Incomplete multi sector "
+ fprintf(stderr, "Error: Incomplete multi sector "
"transfer detected in $Mft.\nCannot "
"handle this yet. )-:\n");
@@ -244,11 +313,11 @@
goto error_exit;
}
- if (!is_mft_recordp(mb)) {
- puts(FAILED);
- fprintf(stderr, "Error: Invalid mft record for $Mft.\n"
- "Cannot handle this yet. )-:\n");
+ if (!is_mft_recordp(mb)) {
+ puts(FAILED);
+ fprintf(stderr, "Error: Invalid mft record for $Mft.\n"
+ "Cannot handle this yet. )-:\n");
errno = EIO;
goto error_exit;
- }
+ }
/* Find the bitmap attribute. */
memset(&ctx, 0, sizeof(attr_search_context));
@@ -257,12 +326,12 @@
if (p2n(ctx.attr) < p2n(mb) ||
(char*)ctx.attr > (char*)mb + vol->mft_record_size) {
- puts(FAILED);
- fprintf(stderr, "Error: corrupt mft record for $Mft.\n"
- "Cannot handle this yet. )-:\n");
+ puts(FAILED);
+ fprintf(stderr, "Error: corrupt mft record for $Mft.\n"
+ "Cannot handle this yet. )-:\n");
errno = EIO;
goto error_exit;
}
ctx.is_first = TRUE;
- if (!find_attr(vol, $BITMAP, NULL, 0, 0, NULL, 0, &ctx)) {
+ if (!find_attr($BITMAP, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "$bitmap attribute not found in $Mft?!?\n");
@@ -279,4 +348,5 @@
goto error_exit;
}
+ printf("$MFT $DATA attribute value length = %Li\n", l);
vol->mft_bitmap = (__u8*)malloc(l);
if (!vol->mft_bitmap) {
@@ -294,4 +364,13 @@
goto error_exit;
}
+#ifdef DEBUG
+ { int _i_;
+ printf("$MFT $BITMAP =\n");
+ for (_i_ = 0; _i_ < l; _i_++)
+ printf("0x%s%x%s", vol->mft_bitmap[_i_] < 0x10 ? "0" : "",
+ vol->mft_bitmap[_i_], _i_ % 8 ? ", " : "\n");
+ printf("\n");
+ }
+#endif
/* Find the $DATA attribute in $Mft. */
memset(&ctx, 0, sizeof(attr_search_context));
@@ -299,5 +378,5 @@
ctx.attr = (ATTR_RECORD*)((char*)mb + le16_to_cpu(mb->attrs_offset));
ctx.is_first = TRUE;
- if (!find_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
+ if (!find_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "$DATA attribute not found in $Mft?!?\n");
@@ -330,8 +409,8 @@
/* Now load the bitmap from $Bitmap. */
printf("Loading $Bitmap... ");
- mref = (MFT_REF)FILE_$BitMap;
+ mref = (MFT_REF)FILE_$Bitmap;
if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
- errno = err;
+ errno = -err;
goto error_exit;
}
@@ -339,5 +418,5 @@
ctx.mrec = mb;
/* Find the bitmap (it is in the $DATA attribute). */
- if (!find_first_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
+ if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "bitmap attribute not found in $Bitmap?!?\n");
@@ -378,5 +457,5 @@
if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
- errno = err;
+ errno = -err;
goto error_exit;
}
@@ -384,5 +463,5 @@
ctx.mrec = mb;
/* Find the bitmap (it is in the $DATA attribute). */
- if (!find_first_attr(vol, $DATA, NULL, 0, 0, NULL, 0, &ctx)) {
+ if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
puts(FAILED);
fprintf(stderr, "$DATA attribute not found in $UpCase?!?\n");
@@ -410,5 +489,5 @@
}
vol->upcase_len = l >> 1;
- vol->upcase = (wchar_t*)malloc(l);
+ vol->upcase = (uchar_t*)malloc(l);
if (!vol->upcase) {
puts(FAILED);
@@ -435,5 +514,5 @@
if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
- errno = err;
+ errno = -err;
goto error_exit;
}
@@ -441,5 +520,5 @@
ctx.mrec = mb;
/* Find the $VOLUME_INFORMATION attribute. */
- if (!find_first_attr(vol, $VOLUME_INFORMATION, NULL, 0, 0, NULL, 0,
+ if (!find_first_attr($VOLUME_INFORMATION, NULL, 0, 0, NULL, 0, NULL, 0,
&ctx)) {
puts(FAILED);
@@ -450,11 +529,11 @@
}
a = ctx.attr;
- /* Has to be resident. */
- if (a->non_resident) {
- fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION must " \
- "be resident (and it isn't)!\n");
- errno = EIO;
+ /* Has to be resident. */
+ if (a->non_resident) {
+ fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION must " \
+ "be resident (and it isn't)!\n");
+ errno = EIO;
goto error_exit;
- }
+ }
/* Get a pointer to the value of the attribute. */
vinf = (VOLUME_INFORMATION*)(le16_to_cpu(a->value_offset) + (char*)a);
@@ -471,5 +550,5 @@
}
/* Setup vol from the volume information attribute value. */
- vol->major_ver = vinf->major_ver;
+ vol->major_ver = vinf->major_ver;
vol->minor_ver = vinf->minor_ver;
/* Do not use le16_to_cpu() macro here as our VOLUME_FLAGS are
@@ -483,5 +562,5 @@
free(mb);
mb = NULL;
-
+
/* FIXME: Need to deal with FILE_$AttrDef. */
|
|
From: Anton A. <an...@us...> - 2001-06-01 02:07:27
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv13537/include
Modified Files:
Makefile.am Makefile.in attrib.h bitmap.h bootsect.h disk_io.h
endians.h layout.h list.h logfile.h mft.h ntfs_rec.h ntfsd.h
types.h unistr.h volume.h
Added Files:
mft_old.h
Log Message:
It has been a long time since last commit. At moment have done a lot of work
on mkntfs but also at the moment ntfsfix and ntfsdump_logfile and libntfs are
broken. Basically only mkntfs works and that is not complete either.
--- NEW FILE ---
/*
* $Id: mft_old.h,v 1.1 2001/06/01 02:07:24 antona Exp $
*
* mft.h - Exports for MFT record handling. Part of the Linux-NTFS project.
*
* Copyright (c) 2000,2001 Anton Altaparmakov.
*
* This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef MFT_H
#define MFT_H
#include "types.h"
#include "list.h"
#include "support.h"
/**
* get_mft_record_data_size - return number of bytes used in mft record @b
* @b: mft record to get the data size of
*
* Takes the mft record @b and returns the number of bytes used in the record
* or 0 on error (i.e. b is not a valid mft record). Zero is not a valid size
* for an mft record as it at least has to have the MFT_RECORD, thus making the
* minimum size:
* (sizeof(MFT_RECORD) + 7) & ~7 + sizeof(ATTR_TYPES) = 52 bytes
* Aside: The 8-byte alignment and the 4 bytes for the attribute type are needed
* as each mft record has to have a list of attributes even if it only contains
* the attribute $END which doesn't contain anything else apart from it's type.
* Also, you would expect every mft record to contain an update sequence array
* as well but that could in theory be non-existent (don't know if Windows NTFS
* wouldn't view this as corruption in itself though!).
*/
extern __inline__ __u32 get_mft_record_data_size(const MFT_RECORD *b);
/* Mft entry flag bit values */
#define ME_mapped 0
#define ME_dirty 1
#define ME_error 2
#define ME_is_base_record 3
#define ME_attr_list_present 4
#define ME_attr_list_mapped 5
/* bits 6-31 reserved for future use */
#define MftEntryMapped(me) test_bit(ME_mapped, &(me)->m_flags)
#define SetMftEntryMapped(me) set_bit(ME_mapped, &(me)->m_flags)
#define ClearMftEntryMapped(me) clear_bit(ME_mapped, &(me)->m_flags)
#define MftEntryDirty(me) test_bit(ME_dirty, &(me)->m_flags)
#define SetMftEntryDirty(me) set_bit(ME_dirty, &(me)->m_flags)
#define ClearMftEntryDirty(me) clear_bit(ME_dirty, &(me)->m_flags)
#define MftEntryError(me) test_bit(ME_error, &(me)->m_flags)
#define SetMftEntryError(me) set_bit(ME_error, &(me)->m_flags)
#define ClearMftEntryError(me) clear_bit(ME_error, &(me)->m_flags)
#define MftEntryIsBaseRecord(me) test_bit(ME_is_base_record, \
&(me)->m_flags)
#define SetMftEntryIsBaseRecord(me) set_bit(ME_is_base_record, \
&(me)->m_flags)
#define ClearMftEntryIsBaseRecord(me) clear_bit(ME_is_base_record, \
&(me)->m_flags)
#define MftEntryAttrListPresent(me) test_bit(ME_attr_list_present, \
&(me)->m_flags)
#define SetMftEntryAttrListPresent(me) set_bit(ME_attr_list_present, \
&(me)->m_flags)
#define ClearMftEntryAttrListPresent(me) clear_bit(ME_attr_list_present, \
&(me)->m_flags)
#define MftEntryAttrListMapped(me) test_bit(ME_attr_list_mapped, \
&(me)->m_flags)
#define SetMftEntryAttrListMapped(me) set_bit(ME_attr_list_mapped, \
&(me)->m_flags)
#define ClearMftEntryAttrListMapped(me) clear_bit(ME_attr_list_mapped, \
&(me)->m_flags)
/**
* flush_mft_entry - flush a mft_entry to disk
* @me: mft_entry to flush
*
* The mft entry is written to disk (if dirty) and marked clean. It is also
* removed from the dirty list of the volume (if it is on the list).
*
* Return 0 on success and -ERRNO on error. Following failure return values
* are defined:
* -EBADF Mft_entry is corrupt (error flag set).
* -EIO Writing to disk failed.
* -ENOTSUP Tried to write to a sparse mft record. Should never
* happen but if it does there is a bug. See implementation
* of flush_mft_entry() in mft.c for details.
* -EPERM Tried to write to cluster 0, which would overwrite the
* bootsector. There must be a bug somewhere...
* others Error codes returned by vcn_to_lcn() function; meaning
* we couldn't locate the position on disk for the entry.
*/
int flush_mft_entry(mft_entry *me);
/* Internal use only. Use set_mft_entry_dirty() instead. */
void __set_mft_entry_dirty(mft_entry *m);
/**
* set_mft_entry_dirty - set an mft entry dirty
* @m: mft entry to set dirty
*
* If the mft entry @m is not dirty it is added to the dirty_mft_entries list
* of the volume to which @m belongs and the dirty flag of the entry is set.
*
* Return true on success or false on error.
*
* If setting the mft entry dirty fails, we try to flush it to disk and make
* it clean to avoid problems. If this succeeds, return true, and not false.
*
* If false is returned, this means that we couldn't set the mft entry dirty
* and we also couldn't flush it to disk to make it clean again. This means
* that the caller has to make sure that the contents are not lost, which they
* would be normally, unless a subsequent call to set_mft_entry_dirty() or
* flush_mft_entry() succeeds.
*/
static __inline__ BOOL set_mft_entry_dirty(mft_entry *m)
{
if (test_and_set_bit(ME_dirty, &m->m_flags) ||
__set_mft_entry_dirty(m))
return TRUE;
return flush_mft_entry(m) == 0;
}
/**
* map_mft_entry - map an mft entry into memory
* @me: mft entry to map
*
* Increase the use count of the entry @me and map it into memory (if it is not
* mapped).
*
* Return 0 on success or -ERRNO on error. See __map_mft_entry() for more
* details on the returned error codes.
*/
static __inline__ int map_mft_entry(mft_entry *me)
{
me->m_count++;
if (MftEntryMapped(me))
return 0;
return __map_mft_entry(me);
}
/**
* unmap_mft_entry - unmap an mft entry
* @me: mft entry to unmap
*
* Decrease the use count of the mft entry (only if it is above 0). Do not
* actually unmap it. We always keep it cached in memory. However, when we
* have unmapped it and the count has reached zero, the entry can be safely
* unmapped if it is necessary but that happens elsewhere.
*/
static __inline__ void unmap_mft_entry(mft_entry *me)
{
if (MftEntryMapped(me) && me->m_count > 0)
me->m_count--;
}
/**
* __unmap_mft_entry - unmap an mft entry
* @me: mft entry to unmap
*
* Unmap the mft entry (only if use count is 0) and free all used memory.
*
* Return zero on success or -ERRNO on error. On error, the following values
* are returned:
* -EBUSY Use count is above zero or couldn't sync dirty entry.
* others Values returned by flush_mft_entry().
*/
int __unmap_mft_entry(mft_entry *me);
/**
* insert_mft_entry - insert a mft_entry into a volume
* @vol: volume to insert into
* @me: mft_entry to insert (see notes)
* @mref: mft reference the mft_entry will have
* @mrec: loaded MFT_RECORD corresponding to @mref (optional)
* @dirty: true if @mrec is dirty, false otherwise (only if @mrec present)
* @f: file associated with the mft_entry (optional)
*
* Initialize the mft_entry with the values of @mref, @f, @mrec and @dirty and
* insert it into the volume @vol. If @mrec is not present, the mft record
* corresponding to @mref is loaded from the volume.
*
* If *@me is NULL, a new mft_entry will be allocated and returned in *@me.
*
* Return 0 on success and -ERRNO on error. On error, the following values are
* returned:
* -EEXIST Entry alread exists in the volume. There must be a bug
* somewhere. This should _really_ never happen.
* others Values returned by flush_mft_entry.
*/
int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REF mref,
MFT_RECORD *mrec, const BOOL dirty, ntfs_file *f);
/**
* remove_mft_entry - remove a mft_entry from its volume and free it
* @me: mft_entry to remove and free
*
* Remove the mft entry @me from its volume, flush it to disk if necessary,
* and finally free all memory that was used by the entry including the entry
* itself. Note, the mft entry must have a use count of zero.
*
* Return 0 on success and -ERRNO on error. The defined error codes are:
* -EBUSY The use count of the entry is above 0.
* others Values returned by flush_mft_entry.
*/
int remove_mft_entry(mft_entry *me);
/**
* __remove_all_extension_records_from_ntfs_file - as name
* @f: ntfs_file on which to operate
*
* Remove all extension records from ntfs_file @f. Return 0 on success and
* -errno on error.
*/
int __remove_all_extension_records_from_ntfs_file(ntfs_file *f);
/**
* __add_mtf_entry_to_ntfs_file - as name
* @f: ntfs_file to which to add the mft_entry
* @m: mft_entry to add
*
* Add @me to @f. Return 0 on success and -errno on error.
*/
int __add_mtf_entry_to_ntfs_file(ntfs_file *f, mft_entry *me);
/**
* __remove_mft_entry_from_ntfs_file - as name
* @me: mft_entry to remove from its associated file
*
* Remove @me from @me->m_file. This will also remove the file if @me is the
* base mft record of @me->m_file. The file has to be closed for anything to
* happen. Return 0 on success and -errno on error.
*/
int __remove_mft_entry_from_ntfs_file(mft_entry *me);
/**
* remove_closed_ntfs_file - remove closed ntfs_file from its volume
* @f: file to remove
*
* Remove @f from @f->f_vol. @f has to be closed. Return 0 on success and
* -errno on error.
*/
int remove_closed_ntfs_file(ntfs_file *f);
/**
* __insert_open_ntfs_file - insert ntfs_file into volume opening it
* @v: volume to insert the ntfs_file into
* @f: ntfs_file to insert
* @m: base mft record to associate with the ntfs_file
*
* Adds @f to @v (as an open file) and vice versa. Same for @f and @m. Makes
* sure @m is mapped. Return 0 on success and -errno on error.
*/
int __insert_open_ntfs_file(ntfs_volume *v, ntfs_file *f, mft_entry *m);
int ntfs_close(ntfs_file *f);
#endif /* defined MFT_H */
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- Makefile.am 2001/04/11 11:49:15 1.5
+++ Makefile.am 2001/06/01 02:07:24 1.6
@@ -1,3 +1,10 @@
+# Need this to enable 64-bit (device) file access functions and parameters.
+if DEBUG
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
+else
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64
+endif
+
linux_ntfsincludedir = $(includedir)/ntfs
linux_ntfsinclude_HEADERS = \
@@ -10,6 +17,14 @@
mft.h \
ntfs_rec.h \
+ volume.h \
unistr.h \
support.h \
- ntfsd.h
+ ntfsd.h \
+ layout.h \
+ types.h \
+ list.h
+
+EXTRA_DIST = \
+ attrib_RE.h \
+ mft_old.h
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.in 2001/04/11 11:49:15 1.4
+++ Makefile.in 2001/06/01 02:07:24 1.5
@@ -1,3 +1,3 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
@@ -11,5 +11,7 @@
# PARTICULAR PURPOSE.
+# Need this to enable 64-bit (device) file access functions and parameters.
+
SHELL = @SHELL@
@@ -71,18 +73,28 @@
CXX = @CXX@
DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
LDFLAGS = @LDFLAGS@
LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
+STRIP = @STRIP@
VERSION = @VERSION@
all_includes = @all_includes@
all_libraries = @all_libraries@
+@DEBUG_TRUE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
+@DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64
linux_ntfsincludedir = $(includedir)/ntfs
-linux_ntfsinclude_HEADERS = attrib.h bitmap.h bootsect.h disk_io.h endians.h logfile.h mft.h ntfs_rec.h unistr.h support.h ntfsd.h
+linux_ntfsinclude_HEADERS = attrib.h bitmap.h bootsect.h disk_io.h endians.h logfile.h mft.h ntfs_rec.h volume.h unistr.h support.h ntfsd.h layout.h types.h list.h
+
+
+EXTRA_DIST = attrib_RE.h mft_old.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- attrib.h 2001/04/11 11:49:16 1.24
+++ attrib.h 2001/06/01 02:07:24 1.25
@@ -25,10 +25,87 @@
#define ATTRIB_H
-#include "layout.h"
+#include <asm/atomic.h>
+
#include "types.h"
#include "support.h"
#include "unistr.h"
+/* Attr flag bit values */
+#define AT_mapped 0
+#define AT_dirty 1
+#define AT_error 2
+#define AT_nonresident 3
+#define AT_in_attr_list 4
+#define AT_in_ext_record 5
+ /* bits 6-31 reserved for future use */
+
+#define AttrMapped(a) test_bit(AT_mapped, &(a)->a_flags)
+#define SetAttrMapped(a) set_bit(AT_mapped, &(a)->a_flags)
+#define ClearAttrMapped(a) clear_bit(AT_mapped, &(a)->a_flags)
+
+#define AttrDirty(a) test_bit(AT_dirty, &(a)->a_flags)
+#define SetAttrDirty(a) set_bit(AT_dirty, &(a)->a_flags)
+#define ClearAttrDirty(a) clear_bit(AT_dirty, &(a)->a_flags)
+
+#define AttrError(a) test_bit(AT_error, &(a)->a_flags)
+#define SetAttrError(a) set_bit(AT_error, &(a)->a_flags)
+#define ClearAttrError(a) clear_bit(AT_error, &(a)->a_flags)
+
+#define AttrNonResident(a) test_bit(AT_nonresident, &(a)->a_flags)
+#define SetAttrNonResident(a) set_bit(AT_nonresident, &(a)->a_flags)
+#define ClearAttrNonResident(a) clear_bit(AT_nonresident, &(a)->a_flags)
+
+#define AttrInAttrList(a) test_bit(AT_in_attr_list, &(a)->a_flags)
+#define SetAttrInAttrList(a) set_bit(AT_in_attr_list, &(a)->a_flags)
+#define ClearAttrInAttrList(a) clear_bit(AT_in_attr_list, &(a)->a_flags)
+
+#define AttrInExtRecord(a) test_bit(AT_in_ext_record, &(a)->a_flags)
+#define SetAttrInExtRecord(a) set_bit(AT_in_ext_record, &(a)->a_flags)
+#define ClearAttrInExtRecord(a) clear_bit(AT_in_ext_record, &(a)->a_flags)
+
+int write_non_resident_attr(attr *a);
+
+int flush_attr(attr *a);
+
+BOOL __set_attr_dirty(attr *a);
+
+static __inline__ BOOL set_attr_dirty(attr *a)
+{
+ if (test_and_set_bit(AT_dirty, &a->a_flags) || __set_attr_dirty(a))
+ return TRUE;
+ return flush_attr(a) == 0;
+}
+
+extern __inline__ attr *__allocate_attr(void);
+
+extern __inline__ int __free_attr(attr *a);
+
+int __map_attr_value(attr *me);
+
+static __inline__ int map_attr_value(attr *a)
+{
+ a->a_count++;
+ if (AttrMapped(a))
+ return 0;
+ return __map_attr_val(a);
+}
+
+static __inline__ void unmap_attr_value(attr *a)
+{
+ if (AttrMapped(a) && a->a_count > 0)
+ a->a_count--;
+}
+
+int __unmap_attr_value(attr *a);
+
/**
+ *
+ * Into mft_entry.
+ */
+int insert_attr_in_mft_entry(mft_entry *me, attr **a, const BOOL dirty);
+
+int remove_attr(attr *a);
+
+/**
* decompress_run_list - decompress a mapping pairs array into a run list
* @attr: non-resident attribute whose mapping pairs array to decompress
@@ -40,5 +117,5 @@
* Notes: caller has to free the run_list array when finished.
*/
-run_list decompress_run_list(const ATTR_RECORD *attr);
+run_list *decompress_run_list(const ATTR_RECORD *attr);
/**
@@ -62,7 +139,5 @@
* space allocated for it.
*/
-LCN vcn_to_lcn(const run_list rl, const VCN vcn);
-
-//#include "volume.h"
+LCN vcn_to_lcn(const run_list *rl, const VCN vcn);
/**
@@ -105,12 +180,14 @@
*/
-extern __inline__ BOOL find_first_attr(const ntfs_volume *vol,
- const ATTR_TYPES type, const wchar_t *name, const __u32 name_len,
- const IGNORE_CASE_BOOL ic, const __u8 *val, const __u32 val_len,
- attr_search_context *ctx);
-
-BOOL find_attr(const ntfs_volume *vol, const ATTR_TYPES type,
- const wchar_t *name, const __u32 name_len, const IGNORE_CASE_BOOL ic,
- const __u8 *val, const __u32 val_len, attr_search_context *ctx);
+extern __inline__ BOOL find_first_attr(const ATTR_TYPES type,
+ const uchar_t *name, const __u32 name_len,
+ const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
+ const __u32 upcase_len, const __u8 *val, const __u32 val_len,
+ attr_search_context *ctx);
+
+BOOL find_attr(const ATTR_TYPES type, const uchar_t *name, const __u32 name_len,
+ const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
+ const __u32 upcase_len, const __u8 *val, const __u32 val_len,
+ attr_search_context *ctx);
/**
Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- bitmap.h 2001/04/10 22:20:19 1.6
+++ bitmap.h 2001/06/01 02:07:24 1.7
@@ -25,5 +25,5 @@
#define BITMAP_H
-#include <linux/types.h>
+#include "types.h"
/*
@@ -45,6 +45,6 @@
* Set the bit @bit in the @bitmap to @new_value. Ignore all errors.
*/
-extern __inline__ void ntfs_set_bit(__u8 *bitmap, const __u64 bit,
- const __u8 new_value);
+__inline__ void ntfs_set_bit(__u8 *bitmap, const __u64 bit,
+ const __u8 new_value);
/**
@@ -57,4 +57,6 @@
*/
extern __inline__ char ntfs_get_bit(const __u8 *bitmap, const __u64 bit);
+
+extern __inline__ void ntfs_change_bit(__u8 *bitmap, const __u64 bit);
/**
Index: bootsect.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bootsect.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- bootsect.h 2001/04/11 11:49:16 1.6
+++ bootsect.h 2001/06/01 02:07:24 1.7
@@ -26,4 +26,6 @@
#define BOOTSECT_H
+#include "types.h"
+
/* The NTFS oem_id */
#define magicNTFS cpu_to_le64(0x202020205346544e) /* "NTFS " */
@@ -52,8 +54,9 @@
__u8 media_type; /* 0xf8 = hard disk */
__u16 sectors_per_fat; /* zero */
- __u16 sectors_per_track; /* irrelevant */
- __u16 heads; /* irrelevant */
+ __u16 sectors_per_track; /* irrelevant, we set to zero */
+ __u16 heads; /* irrelevant, we set to zero */
__u32 hidden_sectors; /* zero */
__u32 large_sectors; /* zero */
+/* sizeof() = 25 (0x19) bytes */
} __attribute__ ((__packed__)) BIOS_PARAMETER_BLOCK;
@@ -65,6 +68,13 @@
__u64 oem_id; /* Magic "NTFS ". */
BIOS_PARAMETER_BLOCK bpb; /* See BIOS_PARAMETER_BLOCK. */
- __u8 unused[4]; /* zero */
- __s64 number_of_sectors; /* Number of sectors in volume. Gives
+ __u8 unused[4]; /* zero, NTFS diskedit.exe states that
+ this is actually:
+ __u8 physical_drive; // 0x80
+ __u8 current_head; // zero
+ __u8 extended_boot_signature;
+ // 0x80
+ __u8 unused; // zero
+ */
+/*0x28*/__s64 number_of_sectors; /* Number of sectors in volume. Gives
maximum volume size of 2^63 sectors.
Assuming standard sector size of 512
@@ -79,7 +89,8 @@
__s64 volume_serial_number; /* Irrelevant (serial number). */
__u32 checksum; /* Boot sector checksum. */
- __u8 bootstrap[426]; /* Irrelevant (boot up code). */
+/*0x54*/__u8 bootstrap[426]; /* Irrelevant (boot up code). */
__u16 end_of_sector_marker; /* End of bootsector magic. Always is
0xaa55 in little endian. */
+/* sizeof() = 512 (0x200) bytes */
} __attribute__ ((__packed__)) NTFS_BOOT_SECTOR;
Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- disk_io.h 2001/04/11 14:29:11 1.8
+++ disk_io.h 2001/06/01 02:07:24 1.9
@@ -25,7 +25,4 @@
#define DISK_IO_H
-#include <linux/types.h>
-
-#include "layout.h"
#include "types.h"
@@ -44,5 +41,5 @@
* either lseek, malloc, write or fdatasync. Or errno is EINVAL if b is null.
*/
-__u64 ntfs_pwrite(int fd, const void *b, __u64 count, const __u64 pos);
+__s64 ntfs_pwrite(int fd, const void *b, __s64 count, const __s64 pos);
/**
@@ -60,5 +57,5 @@
* either lseek, malloc, write or fdatasync. Or errno is EINVAL if b is null.
*/
-__u64 mst_pwrite(int fd, const void *b, __u64 count, const __u64 pos);
+__s64 mst_pwrite(int fd, const void *b, __s64 count, const __s64 pos);
/**
@@ -83,6 +80,6 @@
* read some blocks successfully (this is subject to change!!!).
*/
-__u64 ntfs_pread(const int fd, void *b, const __u32 bksize, __u64 count,
- const __u64 pos);
+__s64 ntfs_pread(const int fd, void *b, const __u32 bksize, __s64 count,
+ const __s64 pos);
/**
@@ -115,6 +112,6 @@
* read some blocks successfully (this is subject to change!!!).
*/
-__u64 mst_pread(const int fd, void *b, const __u32 bksize, __u64 count,
- const __u64 pos);
+__s64 mst_pread(const int fd, void *b, const __u32 bksize, __s64 count,
+ const __s64 pos);
/**
@@ -157,6 +154,6 @@
const MFT_REF *mref);
-int read_file_record(const ntfs_volume *vol, const MFT_REF *mref,
- MFT_RECORD **mrec, ATTR_RECORD **attr);
+int __read_file_record(const ntfs_volume *vol, const MFT_REF *mref,
+ MFT_RECORD **mrec, ATTR_RECORD **attr);
/**
Index: endians.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/endians.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- endians.h 2001/04/08 03:02:55 1.2
+++ endians.h 2001/06/01 02:07:24 1.3
@@ -38,4 +38,6 @@
#include <asm/byteorder.h>
+#include "types.h"
+
/* Unsigned from LE to CPU conversion. */
Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- layout.h 2001/04/11 11:50:24 1.1
+++ layout.h 2001/06/01 02:07:24 1.2
@@ -25,4 +25,6 @@
#define LAYOUT_H
+#include <sys/types.h>
+#include <linux/types.h>
#include <linux/bitops.h>
@@ -117,18 +119,18 @@
*/
typedef enum {
- FILE_$Mft = 0, /* Master file table (mft). Data attribute
+ FILE_$MFT = 0, /* Master file table (mft). Data attribute
contains the entries and bitmap attribute
records which ones are in use (bit==1). */
- FILE_$MftMirr = 1, /* Mft mirror (copy of first four mft records)
+ FILE_$MFTMirr = 1, /* Mft mirror (copy of first four mft records)
in data attribute. */
FILE_$LogFile = 2, /* Journalling log in data attribute. */
FILE_$Volume = 3, /* Volume name attribute and volume information
attribute (flags and ntfs version). Windows
- refers to this file as volume DASD, no idea
- what that stands for though. */
+ refers to this file as volume DASD (Direct
+ Access Storage Device). */
FILE_$AttrDef = 4, /* Array of attribute definitions in data
attribute. */
FILE_$root = 5, /* Root directory. */
- FILE_$BitMap = 6, /* Allocation bitmap of all clusters (lcns) in
+ FILE_$Bitmap = 6, /* Allocation bitmap of all clusters (lcns) in
data attribute. */
FILE_$Boot = 7, /* Boot sector (always at cluster 0) in data
@@ -138,5 +140,6 @@
FILE_$Secure = 9, /* Shared security descriptors in data attribute
and two indexes into the descriptors.
- Appeared in Windows NT4 SP4 (I think). */
+ Appeared in Windows 2000. Before that, this
+ file was named $Quota but was unused. */
FILE_$UpCase = 10, /* Uppercase equivalents of all 65536 Unicode
characters in data attribute. */
@@ -226,5 +229,5 @@
/*Ofs*/
/* 0*/ NTFS_RECORD; /* Usually the magic is "FILE". */
-/* 8*/ __s64 lsn; /* $LogFile sequence number for this record.
+/* 8*/ __u64 lsn; /* $LogFile sequence number for this record.
Changed every time the record is modified. */
/* 16*/ __u16 sequence_number; /* Number of times this mft record has been
@@ -239,5 +242,5 @@
check the link_count and if it is 1 we
delete the file. Otherwise we delete the
- FILENAME_ATTR being referenced by the
+ FILE_NAME_ATTR being referenced by the
directory entry from the mft record and
decrement the link_count.
@@ -295,22 +298,22 @@
typedef enum {
$UNUSED = cpu_to_le32( 0),
- $STANDARD_INFORMATION = cpu_to_le32( 0x10),
- $ATTRIBUTE_LIST = cpu_to_le32( 0x20),
- $FILENAME = cpu_to_le32( 0x30),
- $OBJECT_ID = cpu_to_le32( 0x40),
- $SECURITY_DESCRIPTOR = cpu_to_le32( 0x50),
- $VOLUME_NAME = cpu_to_le32( 0x60),
+ $STANDARD_INFORMATION = cpu_to_le32( 0x10),
+ $ATTRIBUTE_LIST = cpu_to_le32( 0x20),
+ $FILE_NAME = cpu_to_le32( 0x30),
+ $OBJECT_ID = cpu_to_le32( 0x40),
+ $SECURITY_DESCRIPTOR = cpu_to_le32( 0x50),
+ $VOLUME_NAME = cpu_to_le32( 0x60),
$VOLUME_INFORMATION = cpu_to_le32( 0x70),
$DATA = cpu_to_le32( 0x80),
- $INDEX_ROOT = cpu_to_le32( 0x90),
- $INDEX_ALLOCATION = cpu_to_le32( 0xa0),
- $BITMAP = cpu_to_le32( 0xb0),
+ $INDEX_ROOT = cpu_to_le32( 0x90),
+ $INDEX_ALLOCATION = cpu_to_le32( 0xa0),
+ $BITMAP = cpu_to_le32( 0xb0),
$REPARSE_POINT = cpu_to_le32( 0xc0),
- $EA_INFORMATION = cpu_to_le32( 0xd0),
+ $EA_INFORMATION = cpu_to_le32( 0xd0),
$EA = cpu_to_le32( 0xe0),
- $PROPERTY_SET = cpu_to_le32( 0xf0),
- $LOGGED_UTILITY_STREAM = cpu_to_le32( 0x100),
- $FIRST_USER_DEFINED_ATTRIBUTE = cpu_to_le32( 0x1000),
- $END = cpu_to_le32(0xffffffff),
+ $PROPERTY_SET = cpu_to_le32( 0xf0),
+ $LOGGED_UTILITY_STREAM = cpu_to_le32( 0x100),
+ $FIRST_USER_DEFINED_ATTRIBUTE = cpu_to_le32( 0x1000),
+ $END = cpu_to_le32(0xffffffff),
} ATTR_TYPES;
@@ -345,5 +348,5 @@
where the first byte is
most significant. */
- COLLATION_FILENAME = cpu_to_le32(1), /* Collate file names as
+ COLLATION_FILE_NAME = cpu_to_le32(1), /* Collate file names as
Unicode strings. */
COLLATION_UNICODE_STRING = cpu_to_le32(2), /* Collate Unicode strings
@@ -364,10 +367,9 @@
* definition structure. FIXME: This information is from Regis's information
* and, according to him, it is not certain and probably incomplete.
- * Empirically, it would seem that 0x40 means that it must be resident,
- * 0x01 is never encountered on NT4/W2k, 0x2 would be indexable as only
- * $FILENAME has 0x2 set and no idea what 0x80 means. (AIA)
+ * The INDEXABLE flag is fairly certainly correct as only the file name
+ * attribute has this flag set and this is the only attribute indexed in NT4.
*/
typedef enum {
- INDEXABLE = cpu_to_le32(0x01), /* Attribute can be
+ INDEXABLE = cpu_to_le32(0x02), /* Attribute can be
indexed. */
NEED_TO_REGENERATE = cpu_to_le32(0x40), /* Need to regenerate
@@ -389,5 +391,5 @@
typedef struct {
/*hex ofs*/
-/* 0*/ wchar_t name[64]; /* Unicode name of the attribute. Zero
+/* 0*/ uchar_t name[0x40]; /* Unicode name of the attribute. Zero
terminated. */
/* 80*/ ATTR_TYPES type; /* Type of the attribute. */
@@ -502,5 +504,10 @@
beginning of the name from the attribute
record. Note that the name is stored as a
- Unicode string. */
+ Unicode string. When creating, place offset
+ just at the end of the record header. Then,
+ follow with attribute value or mapping pairs
+ array, resident and non-resident attributes
+ respectively, aligning to an 8-byte
+ boundary. */
/* 12*/ ATTR_FLAGS flags; /* Flags describing the attribute. */
/* 14*/ __u16 instance; /* The instance of this attribute record. This
@@ -514,7 +521,11 @@
/* 20 */ __u16 value_offset; /* Byte offset of the attribute
value from the start of the
- attribute record. */
+ attribute record. When creating,
+ align to 8-byte boundary if we
+ have a name present as this might
+ not have a length of a multiple
+ of 8-bytes. */
/* 22 */ RESIDENT_ATTR_FLAGS resident_flags; /* See above. */
-/* 23 */ __s8 reserved1; /* Reserved/alignment to 8-byte
+/* 23 */ __s8 reservedR; /* Reserved/alignment to 8-byte
boundary. */
} __attribute__ ((__packed__));
@@ -529,6 +540,6 @@
the attribute value. - Usually there is only one
portion, so this usually equals the attribute
- value size in clusters. Can be -1 for zero
- length files. Can be 0 for "single extent"
+ value size in clusters minus 1. Can be -1 for
+ zero length files. Can be 0 for "single extent"
attributes. */
/* 32*/ __u16 mapping_pairs_offset; /* Byte offset from the
@@ -544,5 +555,5 @@
compression unit size to be a power of two
clusters.) WinNT4 only uses a value of 4. */
-/* 35*/ __u8 reserved2[5]; /* Align to 8-byte boundary. */
+/* 35*/ __u8 reserved1[5]; /* Align to 8-byte boundary. */
/* The sizes below are only used when lowest_vcn is zero, as otherwise it would
be difficult to keep them up-to-date.*/
@@ -561,9 +572,11 @@
portion of the attribute value. Usually equals
data_size. */
+/* sizeof(uncompressed attr) = 64*/
/* 64*/ __s64 compressed_size; /* Byte size of the attribute
value after compression. Only present when
- compressed. Always is a multiple of the cluster
- size. Represents the actual amount of disk space
- being used on the disk. */
+ compressed. Always is a multiple of the
+ cluster size. Represents the actual amount of
+ disk space being used on the disk. */
+/* sizeof(compressed attr) = 72*/
} __attribute__ ((__packed__));
} __attribute__ ((__packed__));
@@ -607,5 +620,5 @@
is used to to obtain all flags that are valid for setting. */
- FILE_ATTR_DUP_FILENAME_INDEX_PRESENT = cpu_to_le32(0x10000000),
+ FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT = cpu_to_le32(0x10000000),
/* This is a copy of the corresponding bit from the mft record, telling
us whether this is a directory or not, i.e. whether it has an
@@ -622,5 +635,5 @@
* are the number of 100-nanosecond intervals since 1st January 1601, 00:00:00
* universal coordinated time (UTC). (In Linux time starts 1st January 1970,
- * 00:00:00 UTC and is stored as the numer of 1-second intervals since then.)
+ * 00:00:00 UTC and is stored as the number of 1-second intervals since then.)
*/
@@ -648,13 +661,21 @@
Windows this is only updated when
accessed if some time delta has
- passed since the last update. */
+ passed since the last update. Also,
+ last access times updates can be
+ disabled altogether for speed. */
/* 30*/ FILE_ATTR_FLAGS file_attributes; /* Flags describing the file. */
+/* 34*/ union {
+ /* NTFS 1.2 (and previous, presumably) */
+/* 34 */ __u8 reserved12[14]; /* Reserved/alignment to 8-byte
+ boundary. */
+/* sizeof() = 48 bytes */
+ /* NTFS 3.0 */
+ struct {
/*
- * Following fields are only present in NTFS v3.0+ (i.e. Win2k+). If a volume
- * has been upgraded from a previous NTFS version, then these fields are
- * present only if the file has been accessed since the upgrade. Recognize
- * the difference by comparing the length of the resident attribute value. If
- * it is 48, then the following fields are missing. If it is 72 then the fields
- * are present. Maybe just check like this:
+ * If a volume has been upgraded from a previous NTFS version, then these
+ * fields are present only if the file has been accessed since the upgrade.
+ * Recognize the difference by comparing the length of the resident attribute
+ * value. If it is 48, then the following fields are missing. If it is 72 then
+ * the fields are present. Maybe just check like this:
* if (resident.ValueLength < sizeof(STANDARD_INFORMATION)) {
* Assume NTFS 1.2- format.
@@ -670,36 +691,38 @@
* attributes.
*/
-/* 34*/ __u32 maximum_versions; /* Maximum allowed versions for file. Zero
- means that version numbering is disabled. */
-/* 38*/ __u32 version_number; /* This file's version (if any). Should make
- this zero if maximum_versions is zero. */
-/* 42*/ __u32 class_id; /* Class id from bidirectional class id
- index (?). */
-/* 46*/ __u32 owner_id; /* Owner_id of the user owning the file.
- Translate via $Q index in FILE_$Extend/
- $Quota to the quota control entry for the
- user owning the file. Note: Is zero if
- quotas are disabled. */
-/* 50*/ __u32 security_id; /* Security_id for the file. Translate via
- $SII index and $SDS data stream in
- FILE_$Secure to the security descriptor. */
-/* 54*/ __u64 quota_charged; /* Byte size of the charge to the quota for
- all streams of the file. Note: Is zero if
- quotas are disabled. */
-/* 62*/ __u64 usn; /* Last update sequence number of the file. This
- is a direct index into the change (aka usn)
- journal file. It is zero if the usn journal
- is disabled.
- NOTE: To disable the journal need to delete
- the journal file itself and to then walk the
- whole mft and set all Usn entries in all mft
- records to zero! (This can take a while!)
- The journal is FILE_$Extend/$UsnJrnl. Win2k
- will recreate the journal and initiate
- logging if necessary when mounting the
- partition. This, in contrast to disabling the
- journal is a very fast process, so the user
- won't even notice it. */
-/* sizeof() = 70 bytes */
+ /* 34*/ __u32 maximum_versions; /* Maximum allowed versions for
+ file. Zero if version numbering is disabled. */
+ /* 38*/ __u32 version_number; /* This file's version (if any).
+ Set to zero if maximum_versions is zero. */
+ /* 42*/ __u32 class_id; /* Class id from bidirectional
+ class id index (?). */
+ /* 46*/ __u32 owner_id; /* Owner_id of the user owning
+ the file. Translate via $Q index in FILE_$Extend
+ /$Quota to the quota control entry for the user
+ owning the file. Zero if quotas are disabled. */
+ /* 50*/ __u32 security_id; /* Security_id for the file.
+ Translate via $SII index and $SDS data stream
+ in FILE_$Secure to the security descriptor. */
+ /* 54*/ __u64 quota_charged; /* Byte size of the charge to
+ the quota for all streams of the file. Note: Is
+ zero if quotas are disabled. */
+ /* 62*/ __u64 usn; /* Last update sequence number
+ of the file. This is a direct index into the
+ change (aka usn) journal file. It is zero if
+ the usn journal is disabled.
+ NOTE: To disable the journal need to delete
+ the journal file itself and to then walk the
+ whole mft and set all Usn entries in all mft
+ records to zero! (This can take a while!)
+ The journal is FILE_$Extend/$UsnJrnl. Win2k
+ will recreate the journal and initiate
+ logging if necessary when mounting the
+ partition. This, in contrast to disabling the
+ journal is a very fast process, so the user
+ won't even notice it. */
+ /* 70*/ __u16 reserved30; /* Align to 8-byte boundary. */
+ };
+ };
+/* sizeof() = 72 bytes (NTFS 3.0) */
} __attribute__ ((__packed__)) STANDARD_INFORMATION;
@@ -759,5 +782,5 @@
/* 24*/ __u16 instance; /* If lowest_vcn = 0, the instance of the
attribute being referenced; otherwise 0. */
-/* 26*/ wchar_t name[0]; /* Use when creating only. When reading use
+/* 26*/ uchar_t name[0]; /* Use when creating only. When reading use
name_offset to determine the location of the
name. */
@@ -768,5 +791,5 @@
* The maximum allowed length for a file name.
*/
-#define MAXIMUM_FILENAME_LENGTH 255
+#define MAXIMUM_FILE_NAME_LENGTH 255
/*
@@ -774,5 +797,5 @@
*/
typedef enum {
- FILENAME_POSIX = 0x00,
+ FILE_NAME_POSIX = 0x00,
/* This is the largest namespace. It is case sensitive and
allows all Unicode characters except for: '\0' and '/'.
@@ -781,18 +804,18 @@
standard utilities and thus a "del filename" will delete
both "filename" and "fileName" without warning. */
- FILENAME_WIN32 = 0x01,
+ FILE_NAME_WIN32 = 0x01,
/* The standard WinNT/2k NTFS long filenames. Case insensitive.
All Unicode chars except: '\0', '"', '*', '/', ':', '<',
'>', '?', '\' and '|'. Further, names cannot end with a '.'
or a space. */
- FILENAME_DOS = 0x02,
+ FILE_NAME_DOS = 0x02,
/* The standard DOS filenames (8.3 format). Uppercase only.
All 8-bit characters greater space, except: '"', '*', '+',
',', '/', ':', ';', '<', '=', '>', '?' and '\'. */
- FILENAME_WIN32_AND_DOS = 0x03,
+ FILE_NAME_WIN32_AND_DOS = 0x03,
/* 3 means that both the Win32 and the DOS filenames are
identical and hence have been saved in this single filename
record. */
-} __attribute__ ((__packed__)) FILENAME_TYPE_FLAGS;
+} __attribute__ ((__packed__)) FILE_NAME_TYPE_FLAGS;
/*
@@ -838,9 +861,9 @@
no EAs. */
} __attribute__ ((__packed__));
- __u8 filename_length; /* Length of filename in
+ __u8 file_name_length; /* Length of file name in
(Unicode) characters. */
- FILENAME_TYPE_FLAGS filename_type; /* Namespace of the filename. */
- wchar_t filename[0]; /* Filename in Unicode. */
-} __attribute__ ((__packed__)) FILENAME_ATTR;
+ FILE_NAME_TYPE_FLAGS file_name_type; /* Namespace of the file name.*/
+ uchar_t file_name[0]; /* File name in Unicode. */
+} __attribute__ ((__packed__)) FILE_NAME_ATTR;
/*
@@ -1164,27 +1187,130 @@
*/
typedef enum {
- /* The standard rights. */
+ /*
+ * The specific rights (bits 0 to 15). Depend on the type of the
+ * object being secured by the ACE.
+ */
+
+ /* Specific rights for files and directories are as follows: */
+
+ /* Right to read data from the file. (FILE) */
+ FILE_READ_DATA = cpu_to_le32(0x00000001),
+ /* Right to list contents of a directory. (DIRECTORY) */
+ FILE_LIST_DIRECTORY = cpu_to_le32(0x00000001),
+
+ /* Right to write data to the file. (FILE) */
+ FILE_WRITE_DATA = cpu_to_le32(0x00000002),
+ /* Right to create a file in the directory. (DIRECTORY) */
+ FILE_ADD_FILE = cpu_to_le32(0x00000002),
+
+ /* Right to append data to the file. (FILE) */
+ FILE_APPEND_DATA = cpu_to_le32(0x00000004),
+ /* Right to create a subdirectory. (DIRECTORY) */
+ FILE_ADD_SUBDIRECTORY = cpu_to_le32(0x00000004),
+
+ /* Right to read extended attributes. (FILE/DIRECTORY) */
+ FILE_READ_EA = cpu_to_le32(0x00000008),
+
+ /* Right to write extended attributes. (FILE/DIRECTORY) */
+ FILE_WRITE_EA = cpu_to_le32(0x00000010),
+
+ /* Right to execute a file. (FILE) */
+ FILE_EXECUTE = cpu_to_le32(0x00000020),
+ /* Right to traverse the directory. (DIRECTORY) */
+ FILE_TRAVERSE = cpu_to_le32(0x00000020),
+
+ /*
+ * Right to delete a directory and all the files it contains (its
+ * children), even if the files are read-only. (DIRECTORY)
+ */
+ FILE_DELETE_CHILD = cpu_to_le32(0x00000040),
+
+ /* Right to read file attributes. (FILE/DIRECTORY) */
+ FILE_READ_ATTRIBUTES = cpu_to_le32(0x00000080),
+
+ /* Right to change file attributes. (FILE/DIRECTORY) */
+ FILE_WRITE_ATTRIBUTES = cpu_to_le32(0x00000100),
+
+ /*
+ * The standard rights (bits 16 to 23). Are independent of the type of
+ * object being secured.
+ */
+
+ /* Right to delete the object. */
DELETE = cpu_to_le32(0x00010000),
+
+ /*
+ * Right to read the information in the object's security descriptor,
+ * not including the information in the SACL. I.e. right to read the
+ * security descriptor and owner.
+ */
READ_CONTROL = cpu_to_le32(0x00020000),
+
+ /* Right to modify the DACL in the object's security descriptor. */
WRITE_DAC = cpu_to_le32(0x00040000),
+
+ /* Right to change the owner in the object's security descriptor. */
WRITE_OWNER = cpu_to_le32(0x00080000),
- SYNCHRONIZE = cpu_to_le32(0x00100000),
- STANDARD_RIGHTS_REQUIRED = cpu_to_le32(0x000f0000),
+ /*
+ * Right to use the object for synchronization. Enables a process to
+ * wait until the object is in the signalled state. Some object types
+ * do not support this access right.
+ */
+ SYNCHRONIZE = cpu_to_le32(0x00100000),
+ /*
+ * The following STANDARD_RIGHTS_* are combinations of the above for
+ * convenience and are defined by the Win32 API.
+ */
+
+ /* These are currently defined to READ_CONTROL. */
STANDARD_RIGHTS_READ = cpu_to_le32(0x00020000),
STANDARD_RIGHTS_WRITE = cpu_to_le32(0x00020000),
STANDARD_RIGHTS_EXECUTE = cpu_to_le32(0x00020000),
-
+
+ /* Combines DELETE, READ_CONTROL, WRITE_DAC, and WRITE_OWNER access. */
+ STANDARD_RIGHTS_REQUIRED = cpu_to_le32(0x000f0000),
+
+ /*
+ * Combines DELETE, READ_CONTROL, WRITE_DAC, WRITE_OWNER, and
+ * SYNCHRONIZE access.
+ */
STANDARD_RIGHTS_ALL = cpu_to_le32(0x001f0000),
- /* The access system ACL and maximum allowed access types. */
+ /*
+ * The access system ACL and maximum allowed access types (bits 24 to
+ * 25, bits 26 to 27 are reserved).
+ */
ACCESS_SYSTEM_SECURITY = cpu_to_le32(0x01000000),
MAXIMUM_ALLOWED = cpu_to_le32(0x02000000),
+
+ /*
+ * The generic rights (bits 28 to 31). These map onto the standard and
+ * specific rights.
+ */
- /* The generic rights. */
+ /* Read, write, and execute access. */
GENERIC_ALL = cpu_to_le32(0x10000000),
+
+ /* Execute access. */
GENERIC_EXECUTE = cpu_to_le32(0x20000000),
+
+ /*
+ * Write access. For files, this maps onto:
+ * FILE_APPEND_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA |
+ * FILE_WRITE_EA | STANDARD_RIGHTS_WRITE | SYNCHRONIZE
+ * For directories, the mapping has the same numberical value. See
+ * above for the descriptions of the rights granted.
+ */
GENERIC_WRITE = cpu_to_le32(0x40000000),
+
+ /*
+ * Read access. For files, this maps onto:
+ * FILE_READ_ATTRIBUTES | FILE_READ_DATA | FILE_READ_EA |
+ * STANDARD_RIGHTS_READ | SYNCHRONIZE
+ * For directories, the mapping has the same numberical value. See
+ * above for the descriptions of the rights granted.
+ */
GENERIC_READ = cpu_to_le32(0x80000000),
} ACCESS_MASK;
@@ -1251,4 +1377,5 @@
__u16 ace_count;/* Number of ACEs in the ACL. */
__u16 alignment2;
+/* sizeof() = 8 bytes */
} __attribute__ ((__packed__)) ACL;
@@ -1357,4 +1484,5 @@
SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL
(unconditionally granting access) is specified. */
+/* sizeof() = 0x14 bytes */
} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_RELATIVE;
@@ -1503,5 +1631,5 @@
*/
typedef struct {
- wchar_t name[0]; /* The name of the volume in Unicode. */
+ uchar_t name[0]; /* The name of the volume in Unicode. */
} __attribute__ ((__packed__)) VOLUME_NAME;
@@ -1603,10 +1731,10 @@
typedef struct {
ATTR_TYPES type; /* Type of the indexed attribute. Is
- $FILENAME for directories, zero
+ $FILE_NAME for directories, zero
for view indexes. No other values
allowed. */
COLLATION_RULES collation_rule; /* Collation rule used to sort the
- index entries. If type is $FILENAME,
- this must be COLLATION_FILENAME. */
+ index entries. If type is $FILE_NAME,
+ this must be COLLATION_FILE_NAME. */
__u32 bytes_per_index_block; /* Byte size of each index block (in
the index allocation attribute). */
@@ -1776,7 +1904,7 @@
if INDEX_ENTRY_END bit in flags is not set. NOTE: On
NTFS versions before 3.0 the only valid key is the
- FILENAME_ATTR. On NTFS 3.0+ the following
+ FILE_NAME_ATTR. On NTFS 3.0+ the following
additional index keys are defined: */
- FILENAME_ATTR filename; /* $I30 index in directories. */
+ FILE_NAME_ATTR filename;/* $I30 index in directories. */
SII_INDEX_KEY sii; /* $SII index in $Secure. */
SDH_INDEX_KEY sdh; /* $SDH index in $Secure. */
Index: list.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/list.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- list.h 2001/04/11 15:48:20 1.2
+++ list.h 2001/06/01 02:07:24 1.3
@@ -1,8 +1,8 @@
-#ifndef LIST_H
-#define LIST_H
+#ifndef _NTFS_LIST_H
+#define _NTFS_LIST_H
/*
* Simple doubly linked list implementation. - Copied from Linux kernel
- * 2.4.2-ac18 into Linux-NTFS.
+ * 2.4.2-ac18 into Linux-NTFS (with minor modifications). - AIA
*
* Some of the internal functions ("__xxx") are useful when
Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/logfile.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- logfile.h 2001/04/11 11:49:16 1.7
+++ logfile.h 2001/06/01 02:07:24 1.8
@@ -26,5 +26,5 @@
#include "endians.h"
-#include "layout.h"
+#include "types.h"
typedef enum {
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- mft.h 2001/04/11 14:29:11 1.22
+++ mft.h 2001/06/01 02:07:24 1.23
@@ -25,7 +25,4 @@
#define MFT_H
-#include <linux/bitops.h>
-
-#include "layout.h"
#include "types.h"
#include "list.h"
@@ -51,8 +48,11 @@
/* Mft entry flag bit values */
-#define ME_mapped 0
-#define ME_dirty 1
-#define ME_error 2
- /* bits 3-31 reserved for future use */
+#define ME_mapped 0
+#define ME_dirty 1
+#define ME_error 2
+#define ME_is_base_record 3
+#define ME_attr_list_present 4
+#define ME_attr_list_mapped 5
+ /* bits 6-31 reserved for future use */
#define MftEntryMapped(me) test_bit(ME_mapped, &(me)->m_flags)
@@ -68,281 +68,104 @@
#define ClearMftEntryError(me) clear_bit(ME_error, &(me)->m_flags)
-/**
- * flush_mft_entry - flush a mft_entry to disk
- * @me: mft_entry to flush
- *
- * The mft entry is written to disk (if dirty) and marked clean. It is also
- * removed from the dirty list of the volume (if it is on the list).
- *
- * Return 0 on success and -ERRNO on error. Following failure return values
- * are defined:
- * -EBADF Mft_entry is corrupt (error flag set).
- * -EIO Writing to disk failed.
- * -ENOTSUP Tried to write to a sparse mft record. Should never
- * happen but if it does there is a bug. See implementation
- * of flush_mft_entry() in mft.c for details.
- * -EPERM Tried to write to cluster 0, which would overwrite the
- * bootsector. There must be a bug somewhere...
- * others Error codes returned by vcn_to_lcn() function; meaning
- * we couldn't locate the position on disk for the entry.
- */
-int flush_mft_entry(mft_entry *me);
+#define MftEntryIsBaseRecord(me) test_bit(ME_is_base_record, \
+ &(me)->m_flags)
+#define SetMftEntryIsBaseRecord(me) set_bit(ME_is_base_record, \
+ &(me)->m_flags)
+#define ClearMftEntryIsBaseRecord(me) clear_bit(ME_is_base_record, \
+ &(me)->m_flags)
+
+#define MftEntryAttrListPresent(me) test_bit(ME_attr_list_present, \
+ &(me)->m_flags)
+#define SetMftEntryAttrListPresent(me) set_bit(ME_attr_list_present, \
+ &(me)->m_flags)
+#define ClearMftEntryAttrListPresent(me) clear_bit(ME_attr_list_present, \
+ &(me)->m_flags)
+
+#define MftEntryAttrListMapped(me) test_bit(ME_attr_list_mapped, \
+ &(me)->m_flags)
+#define SetMftEntryAttrListMapped(me) set_bit(ME_attr_list_mapped, \
+ &(me)->m_flags)
+#define ClearMftEntryAttrListMapped(me) clear_bit(ME_attr_list_mapped, \
+ &(me)->m_flags)
+
+extern int ntfs_flush_mft_entry(mft_entry *m);
+
+/* Internal use only. Use ntfs_set_mft_entry_dirty() instead. */
+extern void __ntfs_set_mft_entry_dirty(mft_entry *m);
/**
- * __set_mft_entry_dirty - internal use only, use set_mft_entry_dirty instead
- * @me: mft entry to set dirty
+ * ntfs_set_mft_entry_dirty - set an mft entry dirty
+ * @m: mft entry to set dirty
*
- * Return true on success or false if one of the locks couldn't be acquired.
- *
- * See set_mft_entry_dirty().
+ * If the mft entry @m is not dirty it is added to the dirty_mft_entries list
+ * of the volume to which @m belongs and the dirty flag of the entry is set.
*/
-BOOL __set_mft_entry_dirty(mft_entry *me);
-
-/**
- * set_mft_entry_dirty - set an mft entry dirty
- * @me: mft entry to set dirty
- *
- * If the mft entry @me is not dirty it is added to the dirty_mft_entries list
- * of the volume to which @me belongs and the dirty flag of the entry is set.
- *
- * Return true on success or false on error.
- *
- * If setting the mft entry dirty fails, we try to flush it to disk and make
- * it clean to avoid problems. If this succeeds, return true, and not false.
- *
- * If false is returned, this means that we couldn't set the mft entry dirty
- * and we also couldn't flush it to disk to make it clean again. This means
- * that the caller has to make sure that the contents are not lost, which they
- * would be normally, unless a subsequent call to set_mft_entry_dirty() or
- * flush_mft_entry() succeeds.
- */
-static __inline__ BOOL set_mft_entry_dirty(mft_entry *me)
+static __inline__ void ntfs_set_mft_entry_dirty(mft_entry *m)
{
- if (test_and_set_bit(ME_dirty, &me->m_flags) ||
- __set_mft_entry_dirty(me))
- return TRUE;
- return flush_mft_entry(me) == 0;
+ if (!test_and_set_bit(ME_dirty, &m->m_flags))
+ __ntfs_set_mft_entry_dirty(m);
}
-
-/**
- * __allocate_mft_entry - allocate a new mft_entry and initialize it
- *
- * Return the new mft_entry on success or NULL with errno set to the error
- * code returned from malloc().
- */
-extern __inline__ mft_entry *__allocate_mft_entry(void);
-/**
- * __free_mft_entry - free a mft_entry
- * @me: mft_entry to free
- *
- * Return 0 on success and -EBUSY on error.
- *
- * To succeed, the entry must be unlocked, clean, have a use count of 0, and
- * it must not be mapped. If any of these are false, return -EBUSY.
- */
-extern __inline__ int __free_mft_entry(mft_entry *me);
+/* Internal use only. Use ntfs_map_mft_entry() instead. */
+extern int __ntfs_map_mft_entry(mft_entry *m);
/**
- * __map_mft_entry - map an mft entry into memory
- * @me: mft entry to map
+ * ntfs_map_mft_entry - map an mft entry into memory
+ * @m: mft entry to map
*
- * Map mft entry @me into memory (if unmapped) not increasing the use count.
- *
- * Return 0 on success or -ERRNO on error. If an I/O error of any kind occurs,
- * including multi sector transfer (mst) errors being detected, the error flag
- * is set on the entry.
- *
- * Following failure return values are defined:
- * -EIO Reading from disk failed (or mst error detected). Error
- * flag has been set.
- * -ENOTSUP Tried to read a sparse mft record. Currently not
- * implemented as I am not sure whether this can ever
- * occur.
- * -EPERM Tried to read cluster 0, which would return the
- * bootsector data. There must be a bug somewhere...
- * others Error codes returned by vcn_to_lcn() function; meaning
- * we couldn't locate the position on disk for the entry.
- */
-int __map_mft_entry(mft_entry *me);
-
-/**
- * map_mft_entry - map an mft entry into memory
- * @me: mft entry to map
- *
- * Increase the use count of the entry @me and map it into memory (if it is not
- * mapped).
+ * Increase the use count of the entry @m and map it into memory (if it is not
+ * mapped). This function operates on an already existing mft_entry which has
+ * been inserted in a volume already. It doesn't need to be associated with a
+ * file though. Note that no setting up of the mft_entry is performed or stuff
+ * like that. If you need this kind of stuff chances are you should be using
+ * ntfs_map_file_entry() instead and your probably don't have the mft_entry
+ * yet.
*
- * Return 0 on success or -ERRNO on error. See __map_mft_entry() for more
+ * Return 0 on success and -ERRNO on error. See __map_mft_entry() for more
* details on the returned error codes.
*/
-static __inline__ int map_mft_entry(mft_entry *me)
+static __inline__ int ntfs_map_mft_entry(mft_entry *m)
{
- me->m_count++;
- if (MftEntryMapped(me))
+ int err;
+
+ m->m_count++;
+ if (MftEntryMapped(m))
return 0;
- return __map_mft_entry(me);
+ if ((err = __ntfs_map_mft_entry(m)) < 0)
+ m->m_count--;
+ return err;
}
+extern mft_entry *ntfs_map_file_entry(ntfs_volume *v, const MFT_REF mref);
+
/**
- * unmap_mft_entry - unmap an mft entry
- * @me: mft entry to unmap
+ * ntfs_unmap_mft_entry - unmap an mft entry
+ * @m: mft entry to unmap
*
- * Decrease the use count of the mft entry (only if it is above 0). Do not
+ * Decrease the use count of the mft entry (only if it is above 1). Do not
* actually unmap it. We always keep it cached in memory. However, when we
* have unmapped it and the count has reached zero, the entry can be safely
- * unmapped if it is necessary but that happens elsewhere.
+ * unmapped if it is necessary, but that happens elsewhere.
*/
-static __inline__ void unmap_mft_entry(mft_entry *me)
+static __inline__ void ntfs_unmap_mft_entry(mft_entry *m)
{
- if (MftEntryMapped(me) && me->m_count > 0)
- me->m_count--;
+ if (MftEntryMapped(m) && m->m_count > 1)
+ m->m_count--;
}
-/**
- * __unmap_mft_entry - unmap an mft entry
- * @me: mft entry to unmap
- *
- * Unmap the mft entry (only if use count is 0) and free all used memory.
- *
- * Return zero on success or -ERRNO on error. On error, the following values
- * are returned:
- * -EBUSY Use count is above zero or couldn't sync dirty entry.
- * others Values returned by flush_mft_entry().
- */
-int __unmap_mft_entry(mft_entry *me);
-
-/**
- * insert_mft_entry - insert a mft_entry into a volume
- * @vol: volume to insert into
- * @me: mft_entry to insert (see notes)
- * @mref: mft reference the mft_entry will have
- * @mrec: loaded MFT_RECORD corresponding to @mref (optional)
- * @dirty: true if @mrec is dirty, false otherwise (only if @mrec present)
- * @f: file associated with the mft_entry (optional)
- *
- * Initialize the mft_entry with the values of @mref, @f, @mrec and @dirty and
- * insert it into the volume @vol. If @mrec is not present, the mft record
- * corresponding to @mref is loaded from the volume.
- *
- * If *@me is NULL, a new mft_entry will be allocated and returned in *@me.
- *
- * Return 0 on success and -ERRNO on error. On error, the following values are
- * returned:
- * -EEXIST Entry alread exists in the volume. There must be a bug
- * somewhere. This should _really_ never happen.
- * others Values returned by flush_mft_entry.
- */
-int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REF mref,
- MFT_RECORD *mrec, const BOOL dirty, ntfs_file *f);
-
-/**
- * remove_mft_entry - remove a mft_entry from its volume and free it
- * @me: mft_entry to remove and free
- *
- * Remove the mft entry @me from its volume, flush it to disk if necessary,
- * and finally free all memory that was used by the entry including the entry
- * itself. Note, the mft entry must have a use count of zero.
- *
- * Return 0 on success and -ERRNO on error. The defined error codes are:
- * -EBUSY The use count of the entry is above 0.
- * others Values returned by flush_mft_entry.
- */
-int remove_mft_entry(mft_entry *me);
-
/**
- * __allocate_ntfs_file - allocate a new ntfs_file and initialize it
+ * ntfs_unmap_file_entry - unmap a file mft entry
+ * @m: file mft entry to unmap
*
- * Return the new ntfs_file on success or NULL with errno set to the error
- * code returned from malloc().
+ * Same as ntfs_unmap_mft_entry(), so we just wrap it.
*/
-extern __inline__ ntfs_file *__allocate_ntfs_file(void);
-
-/**
- * __free_ntfs_file - free a ntfs_file
- * @f: ntfs_file to free
- *
- * Return 0 on success and -EBUSY on error.
- *
- * To succeed, the file must have a use count of 0, as well as a nr_m_ref of
- * zero. If any of these are false, return -EBUSY.
- */
-extern __inline__ int __free_ntfs_file(ntfs_file *f);
-
-/**
- * __remove_all_extension_records_from_ntfs_file - as name
- * @f: ntfs_file on which to operate
- *
- * Remove all extension records from ntfs_file @f. Return 0 on success and
- * -errno on error.
- */
-int __remove_all_extension_records_from_ntfs_file(ntfs_file *f);
-
-/**
- * __add_mtf_entry_to_ntfs_file - as name
- * @f: ntfs_file to which to add the mft_entry
- * @m: mft_entry to add
- *
- * Add @me to @f. Return 0 on success and -errno on error.
- */
-int __add_mtf_entry_to_ntfs_file(ntfs_file *f, mft_entry *me);
-
-/**
- * __remove_mft_entry_from_ntfs_file - as name
- * @me: mft_entry to remove from its associated file
- *
- * Remove @me from @me->m_file. This will also remove the file if @me is the
- * base mft record of @me->m_file. The file has to be closed for anything to
- * happen. Return 0 on success and -errno on error.
- */
-int __remove_mft_entry_from_ntfs_file(mft_entry *me);
-
-/**
- * remove_closed_ntfs_file - remove closed ntfs_file from its volume
- * @f: file to remove
- *
- * Remove @f from @f->f_vol. @f has to be closed. Return 0 on success and
- * -errno on error.
- */
-int remove_closed_ntfs_file(ntfs_file *f);
-
-/**
- * __insert_open_ntfs_file - insert ntfs_file into volume opening it
- * @v: volume to insert the ntfs_file into
- * @f: ntfs_file to insert
- * @m: base mft record to associate with the ntfs_file
- *
- * Adds @f to @v (as an open file) and vice versa. Same for @f and @m. Makes
- * sure @m is mapped. Return 0 on success and -errno on error.
- */
-int __insert_open_ntfs_file(ntfs_volume *v, ntfs_file *f, mft_entry *m);
+static __inline__ void ntfs_unmap_file_entry(mft_entry *m)
+{
+ ntfs_unmap_mft_entry(m);
+}
-/**
- * ntfs_open_by_mref - open an ntfs file (mft record), given its mft reference
- * @vol: ntfs volume to operate on
- * @mref: mft_reference of base mft record to open
- *
- * Open an ntfs_file (using file to mean any base mft record) given the mft
- * reference of the mft record (i.e. the inode number). To do this, allocate an
- * ntfs_file structure (adding it to the vol->open_files array), or if the file
- * is already loaded, just return that, incrementing the use count.
- *
- * Return a pointer to the ntfs_file structure or NULL on error with errno
- * set to the appropriate error code.
- *
- * This pointer should be treated completely opaquely by the user! Never
- * use it for anything except as a parameter to functions taking a ntfs_file
- * pointer as a parameter.
- */
-ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REF mref);
+extern ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REF mref);
-/**
- * ntfs_close - close an ntfs_file
- * @f: ntfs_file to close
- *
- * Close a previously opened ntfs file. Return zero on success or -errno on
- * error.
- */
-int ntfs_close(ntfs_file *f);
+extern int ntfs_close(ntfs_file *f);
#endif /* defined MFT_H */
Index: ntfs_rec.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfs_rec.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ntfs_rec.h 2001/04/11 11:49:16 1.6
+++ ntfs_rec.h 2001/06/01 02:07:24 1.7
@@ -26,4 +26,5 @@
#define NTFS_REC_H
+#include "types.h"
...
[truncated message content] |
|
From: Anton A. <an...@us...> - 2001-06-01 02:07:27
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv13537
Modified Files:
CREDITS Makefile.am Makefile.in TODO.mkntfs acconfig.h
aclocal.m4 config.guess config.h.in config.sub configure
configure.in linux-ntfs.spec.in ltmain.sh
Log Message:
It has been a long time since last commit. At moment have done a lot of work
on mkntfs but also at the moment ntfsfix and ntfsdump_logfile and libntfs are
broken. Basically only mkntfs works and that is not complete either.
Index: CREDITS
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/CREDITS,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- CREDITS 2001/02/02 01:15:17 1.2
+++ CREDITS 2001/06/01 02:07:23 1.3
@@ -8,6 +8,7 @@
+Albert D. Cahalan <aca...@cs...>
Yuri Per <yu...@ac...>
-
+Richard Russon <nt...@fl...>
Also, various code snippets and especially the autoconf/automake automated
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.am 2001/02/03 02:03:35 1.3
+++ Makefile.am 2001/06/01 02:07:23 1.4
@@ -1,3 +1,10 @@
+# Need this to enable 64-bit (device) file access functions and parameters.
+if DEBUG
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
+else
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64
+endif
+
SUBDIRS = doc include libntfs ntfstools
@@ -9,3 +16,6 @@
dist-hook: linux-ntfs.spec
cp linux-ntfs.spec $(distdir)
+
+libtool: $(LIBTOOL_DEPS)
+ $(SHELL) ./config.status --recheck
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Makefile.in 2001/02/03 02:03:35 1.2
+++ Makefile.in 2001/06/01 02:07:23 1.3
@@ -1,3 +1,3 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
@@ -11,5 +11,7 @@
# PARTICULAR PURPOSE.
+# Need this to enable 64-bit (device) file access functions and parameters.
+
SHELL = @SHELL@
@@ -71,15 +73,22 @@
CXX = @CXX@
DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
LDFLAGS = @LDFLAGS@
LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
+STRIP = @STRIP@
VERSION = @VERSION@
all_includes = @all_includes@
all_libraries = @all_libraries@
+@DEBUG_TRUE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
+@DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64
SUBDIRS = doc include libntfs ntfstools
@@ -380,4 +389,7 @@
dist-hook: linux-ntfs.spec
cp linux-ntfs.spec $(distdir)
+
+libtool: $(LIBTOOL_DEPS)
+ $(SHELL) ./config.status --recheck
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: TODO.mkntfs
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/TODO.mkntfs,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- TODO.mkntfs 2001/03/02 15:09:24 1.1
+++ TODO.mkntfs 2001/06/01 02:07:23 1.2
@@ -1,2 +1,15 @@
- mkntfs should be hard linked with mkfs.ntfs for the mkfs utility.
-
+- need to make a copy of the boot sector to the last sector: problem, how
+to access the thing when we have an odd number of sectors? also problem, when
+getting the device size in sectors we already don't see the odd sector so we
+will silently fail. )-: change the place of decrementing the number of sectors
+to be as early as possible as when creating the volume we need to create it as
+if it had one sector less. - Investigate whether we can have an ntfs 1.2/3.0
+volume but use the NT3.51 way of storing the backup boot sector so it is in the
+middle of the volume. This saves us from having to access the last sector but
+still requires us to know how many sectors there are.
+- need to create the root directory. for this need index root and index
+allocation creation and handling functions (mutch work)
+- implement command line parsing using the get_opt*() stuff: for now just want
+clust size selection, no action, verbose and debug. rest can follow later
+- modify syscalls for sector size / nr sectors to get defaults when failed.
Index: acconfig.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/acconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- acconfig.h 2001/02/03 02:03:35 1.1
+++ acconfig.h 2001/06/01 02:07:23 1.2
@@ -1,3 +1 @@
-#undef DEBUG
-
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/aclocal.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- aclocal.m4 2001/02/02 00:16:18 1.1
+++ aclocal.m4 2001/06/01 02:07:23 1.2
@@ -1,3 +1,3 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p1
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
@@ -159,125 +159,2752 @@
changequote([,]))])
+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-# serial 40 AC_PROG_LIBTOOL
-AC_DEFUN(AC_PROG_LIBTOOL,
[...3350 lines suppressed...]
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
Index: config.guess
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/config.guess,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- config.guess 2001/02/02 00:30:25 1.1
+++ config.guess 2001/06/01 02:07:23 1.2
@@ -1,7 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
-#
+
+timestamp='2001-04-20'
+
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -31,24 +33,84 @@
#
# The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
+# don't specify an explicit build system type.
-# Use $HOST_CC if defined. $CC may point to a cross-compiler
-if test x"$CC_FOR_BUILD" = x; then
- if test x"$HOST_CC" != x; then
- CC_FOR_BUILD="$HOST_CC"
- else
- if test x"$CC" != x; then
- CC_FOR_BUILD="$CC"
- else
- CC_FOR_BUILD=cc
- fi
- fi
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <con...@gn...>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
fi
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int dummy(){}" > $dummy.c
+ for c in cc gcc c89 ; do
+ ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+ if test $? = 0 ; then
+ CC_FOR_BUILD="$c"; break
+ fi
+ done
+ rm -f $dummy.c $dummy.o $dummy.rel
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac
+
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (gh...@no... 8/24/94.)
@@ -59,10 +121,7 @@
UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
-
# Note: order is significant - the case branches are not exclusive.
@@ -78,5 +137,5 @@
# Determine the machine/vendor (is the vendor relevant).
case "${UNAME_MACHINE}" in
- amiga) machine=m68k-cbm ;;
+ amiga) machine=m68k-unknown ;;
arm32) machine=arm-unknown ;;
atari*) machine=m68k-atari ;;
@@ -88,14 +147,22 @@
*) machine=${UNAME_MACHINE}-unknown ;;
esac
- # The Operating System including object format.
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE}" in
+ i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
# The OS release
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
@@ -174,5 +241,5 @@
exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-cbm-sysv4
+ echo m68k-unknown-sysv4
exit 0;;
amiga:OpenBSD:*:*)
@@ -206,5 +273,5 @@
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
- SR2?01:HI-UX/MPP:*:*)
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
exit 0;;
@@ -342,8 +409,11 @@
$CC_FOR_BUILD $dummy.c -o $dummy \
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm $dummy.c $dummy && exit 0
+ && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
@@ -393,7 +463,15 @@
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i?86:AIX:*:*)
+ i*86:AIX:*:*)
echo i386-ibm-aix
exit 0 ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -409,5 +487,5 @@
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo rs6000-ibm-aix3.2.5
@@ -418,7 +496,7 @@
fi
exit 0 ;;
- *:AIX:*:4)
+ *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
- if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
@@ -428,5 +506,5 @@
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=4.${UNAME_RELEASE}
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -454,8 +532,26 @@
exit 0 ;;
9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
+ case "${HPUX_REV}" in
+ 11.[0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ esac ;;
+ esac
+ fi ;;
+ esac
+ if [ "${HP_ARCH}" = "" ]; then
sed 's/^ //' << EOF >$dummy.c
@@ -492,9 +588,14 @@
EOF
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
rm -f $dummy.c $dummy
+ fi ;;
esac
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit 0 ;;
3050*:HI-UX:*:*)
sed 's/^ //' << EOF >$dummy.c
@@ -523,5 +624,5 @@
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2
@@ -542,5 +643,5 @@
echo hppa1.0-hp-osf
exit 0 ;;
- i?86:OSF1:*:*)
+ i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
@@ -587,7 +688,10 @@
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
- CRAY*T3E:*:*:*)
+ CRAY*T3D:*:*:*)
echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -596,16 +700,14 @@
echo cray2-cray-unicos
exit 0 ;;
- F300:UNIX_System_V:*:*)
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
- F301:UNIX_System_V:*:*)
- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
- exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
@@ -628,4 +730,7 @@
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -646,56 +751,39 @@
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
- *:Linux:*:*)
-
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- ld_help_string=`cd /; ld --help 2>&1`
- ld_supported_emulations=`echo $ld_help_string \
- | sed -ne '/supported emulations:/!d
- s/[ ][ ]*/ /g
- s/.*supported emulations: *//
- s/ .*//
- p'`
- case "$ld_supported_emulations" in
- *ia64)
- echo "${UNAME_MACHINE}-unknown-linux"
- exit 0
- ;;
- i?86linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0
- ;;
- elf_i?86)
- echo "${UNAME_MACHINE}-pc-linux"
- exit 0
- ;;
- i?86coff)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0
- ;;
- sparclinux)
- echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
- exit 0
- ;;
- armlinux)
- echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
- exit 0
- ;;
- elf32arm*)
- echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
- exit 0
- ;;
- armelf_linux*)
- echo "${UNAME_MACHINE}-unknown-linux-gnu"
- exit 0
- ;;
- m68klinux)
- echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
- exit 0
- ;;
- elf32ppc | elf32ppclinux)
- # Determine Lib Version
- cat >$dummy.c <<EOF
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit 0 ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux
+ exit 0 ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ mips:Linux:*:*)
+ cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+int main (int argc, char *argv[]) {
+#else
+int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+ printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+ printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+ return 0;
+}
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ ;;
+ ppc:Linux:*:*)
+ # Determine Lib Version
+ cat >$dummy.c <<EOF
#include <features.h>
#if defined(__GLIBC__)
@@ -710,121 +798,125 @@
printf("%s %s\n", __libc_version, __libc_release);
#else
- printf("unkown\n");
+ printf("unknown\n");
#endif
return 0;
}
+EOF
+ LIBC=""
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ ./$dummy | grep 1\.99 > /dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; fi
+ fi
+ rm -f $dummy.c $dummy
+ echo powerpc-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ alpha:Linux:*:*)
+ cat <<EOF >$dummy.s
+ .data
+ \$Lformat:
+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
+ .text
+ .globl main
+ .align 4
+ .ent main
+ main:
+ .frame \$30,16,\$26,0
+ ldgp \$29,0(\$27)
+ .prologue 1
+ .long 0x47e03d80 # implver \$0
+ lda \$2,-1
+ .long 0x47e20c21 # amask \$2,\$1
+ lda \$16,\$Lformat
+ mov \$0,\$17
+ not \$1,\$18
+ jsr \$26,printf
+ ldgp \$29,0(\$26)
+ mov 0,\$16
+ jsr \$26,exit
+ .end main
EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+ LIBC=""
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ case `./$dummy` in
+ 0-0) UNAME_MACHINE="alpha" ;;
+ 1-0) UNAME_MACHINE="alphaev5" ;;
+ 1-1) UNAME_MACHINE="alphaev56" ;;
+ 1-101) UNAME_MACHINE="alphapca56" ;;
+ 2-303) UNAME_MACHINE="alphaev6" ;;
+ 2-307) UNAME_MACHINE="alphaev67" ;;
+ esac
+ objdump --private-headers $dummy | \
+ grep ld.so.1 > /dev/null
if test "$?" = 0 ; then
- ./$dummy | grep 1\.99 > /dev/null
- if test "$?" = 0 ; then
- LIBC="libc1"
- fi
+ LIBC="libc1"
fi
- rm -f $dummy.c $dummy
- echo powerpc-unknown-linux-gnu${LIBC}
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit 0 ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit 0 ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ ld_supported_emulations=`cd /; ld --help 2>&1 \
+ | sed -ne '/supported emulations:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported emulations: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_emulations" in
+ i*86linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0
+ ;;
+ elf_i*86)
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ i*86coff)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
exit 0
;;
esac
-
- if test "${UNAME_MACHINE}" = "alpha" ; then
- cat <<EOF >$dummy.s
- .data
- \$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-
- .text
- .globl main
- .align 4
- .ent main
- main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `./$dummy` in
- 0-0)
- UNAME_MACHINE="alpha"
- ;;
- 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
- 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
- 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
- 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
- 2-307)
- UNAME_MACHINE="alphaev67"
- ;;
- esac
-
- objdump --private-headers $dummy | \
- grep ld.so.1 > /dev/null
- if test "$?" = 0 ; then
- LIBC="libc1"
- fi
- fi
- rm -f $dummy.s $dummy
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
- elif test "${UNAME_MACHINE}" = "mips" ; then
- cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
- printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
- printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
- return 0;
-}
-EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- elif test "${UNAME_MACHINE}" = "s390"; then
- echo s390-ibm-linux && exit 0
- else
- # Either a pre-BFD a.out linker (linux-gnuoldld)
- # or one that does not give us useful --help.
- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
- # If ld does not provide *any* "supported emulations:"
- # that means it is gnuoldld.
- echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
- test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
- case "${UNAME_MACHINE}" in
- i?86)
- VENDOR=pc;
- ;;
- *)
- VENDOR=unknown;
- ;;
- esac
- # Determine whether the default compiler is a.out or elf
- cat >$dummy.c <<EOF
+ # Either a pre-BFD a.out linker (linux-gnuoldld)
+ # or one that does not give us useful --help.
+ # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+ # If ld does not provide *any* "supported emulations:"
+ # that means it is gnuoldld.
+ test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+ case "${UNAME_MACHINE}" in
+ i*86)
+ VENDOR=pc;
+ ;;
+ *)
+ VENDOR=unknown;
+ ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ cat >$dummy.c <<EOF
#include <features.h>
#ifdef __cplusplus
@@ -850,13 +942,14 @@
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- fi ;;
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
# are messed up and put the nodename in both sysname and nodename.
- i?86:DYNIX/ptx:4*:*)
+ i*86:DYNIX/ptx:4*:*)
echo i386-sequent-sysv4
exit 0 ;;
- i?86:UNIX_SV:4.2MP:2.*)
+ i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -866,5 +959,5 @@
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -874,5 +967,5 @@
fi
exit 0 ;;
- i?86:*:5:7*)
+ i*86:*:5:7*)
# Fixed at (any) Pentium or better
UNAME_MACHINE=i586
@@ -883,5 +976,5 @@
fi
exit 0 ;;
- i?86:*:3.2:*)
+ i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -901,5 +994,5 @@
fi
exit 0 ;;
- i?86:*DOS:*:*)
+ i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit 0 ;;
@@ -929,5 +1022,5 @@
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
@@ -940,5 +1033,5 @@
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& echo i486-ncr-sysv4 && exit 0 ;;
- m68*:LynxOS:2.*:*)
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
@@ -946,5 +1039,5 @@
echo m68k-atari-sysv4
exit 0 ;;
- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
@@ -952,7 +1045,10 @@
echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+ rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
@@ -988,5 +1084,5 @@
echo m68k-apple-aux${UNAME_RELEASE}
exit 0 ;;
- news*:NEWS-OS:*:6*)
+ news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
exit 0 ;;
@@ -1031,7 +1127,10 @@
echo i386-pc-qnx
exit 0 ;;
- NSR-W:NONSTOP_KERNEL:*:*)
+ NSR-[KW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+ exit 0 ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
@@ -1040,4 +1139,38 @@
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
exit 0 ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "$cputype" = "386"; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+ exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+ exit 0 ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+ exit 0 ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+ exit 0 ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+ exit 0 ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+ exit 0 ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+ exit 0 ;;
esac
@@ -1131,9 +1264,22 @@
#if defined (vax)
-#if !defined (ultrix)
- printf ("vax-dec-bsd\n"); exit (0);
-#else
- printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# if !defined (ultrix)
+# include <sys/param.h>
+# if defined (BSD)
+# if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+# else
+# if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# endif
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# else
+ printf ("vax-dec-ultrix\n"); exit (0);
+# endif
#endif
@@ -1146,5 +1292,5 @@
EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
@@ -1179,5 +1325,47 @@
fi
-#echo '(Unable to guess system type)' 1>&2
+cat >&2 <<EOF
+$0: unable to guess system type
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+ ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <con...@gn...> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
Index: config.h.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- config.h.in 2001/02/03 02:03:35 1.2
+++ config.h.in 2001/06/01 02:07:23 1.3
@@ -1,31 +1,155 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
-/* Define to empty if the keyword does not work. */
-#undef const
+/* Define if you have the <asm/atomic.h> header file. */
+#undef HAVE_ASM_ATOMIC_H
-/* Define as __inline if that's what the C compiler calls it. */
-#undef inline
+/* Define if you have the <asm/byteorder.h> header file. */
+#undef HAVE_ASM_BYTEORDER_H
-/* Define to `long' if <sys/types.h> doesn't define. */
-#undef off_t
+/* Define if you have the `atexit' function. */
+#undef HAVE_ATEXIT
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define if you have the `calloc' function. */
+#undef HAVE_CALLOC
-#undef DEBUG
+/* Define if you have the `close' function. */
+#undef HAVE_CLOSE
-/* Define if you have the strdup function. */
-#undef HAVE_STRDUP
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
+/* Define if you have the `exit' function. */
+#undef HAVE_EXIT
-/* Define if you have the <fcntl.h> header file. */
+/* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
+
+/* Define if you have the `fdatasync' function. */
+#undef HAVE_FDATASYNC
+
+/* Define if you have the `fflush' function. */
+#undef HAVE_FFLUSH
+
+/* Define if you have the `fprintf' function. */
+#undef HAVE_FPRINTF
+
+/* Define if you have the `free' function. */
+#undef HAVE_FREE
+
+/* Define if you have the `ioctl' function. */
+#undef HAVE_IOCTL
+
+/* Define if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define if you have the `dld' library (-ldld). */
+#undef HAVE_LIBDLD
+
+/* Define if you have the `svld' library (-lsvld). */
+#undef HAVE_LIBSVLD
+
+/* Define if you have the <linux/bitops.h> header file. */
+#undef HAVE_LINUX_BITOPS_H
+
+/* Define if you have the <linux/types.h> header file. */
+#undef HAVE_LINUX_TYPES_H
+
+/* Define if the `long double' type works. */
+#undef HAVE_LONG_DOUBLE
+
+/* Define if you have the `lseek' function. */
+#undef HAVE_LSEEK
+
+/* Define if you have the `malloc' function. */
+#undef HAVE_MALLOC
+
+/* Define if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define if you have the `open' function. */
+#undef HAVE_OPEN
+
+/* Define if you have the `perror' function. */
+#undef HAVE_PERROR
+
+/* Define if you have the `printf' function. */
+#undef HAVE_PRINTF
+
+/* Define if you have the `puts' function. */
+#undef HAVE_PUTS
-/* Define if you have the <unistd.h> header file. */
+/* Define if you have the `read' function. */
+#undef HAVE_READ
+
+/* Define if you have the `realloc' function. */
+#undef HAVE_REALLOC
+
+/* Define if you have the <sched.h> header file. */
+#undef HAVE_SCHED_H
+
+/* Define if you have the `setitimer' function. */
+#undef HAVE_SETITIMER
+
+/* Define if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
+
+/* Define if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
+/* Define if you have the `wcslen' function. */
+#undef HAVE_WCSLEN
+
+/* Define if you have the `wcstombs' function. */
+#undef HAVE_WCSTOMBS
+
+/* Define if you have the `write' function. */
+#undef HAVE_WRITE
+
/* Name of package */
#undef PACKAGE
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
+/* Define to empty if the keyword `const' does not work. */
+#undef const
+
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+ if it is not supported. */
+#undef inline
+
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
Index: config.sub
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/config.sub,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- config.sub 2001/02/02 00:30:25 1.1
+++ config.sub 2001/06/01 02:07:23 1.2
@@ -1,7 +1,9 @@
#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
-#
+
+timestamp='2001-04-20'
+
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -28,5 +30,4 @@
# the same distribution terms that you use for the rest of that program.
-# Written by Per Bothner <bo...@cy...>.
# Please send patches to <con...@gn...>.
#
@@ -51,21 +52,64 @@
# It is wrong to echo any other type of specification.
-if [ x$1 = x ]
-then
- echo Configuration name missing. 1>&2
- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
- echo "or $0 ALIAS" 1>&2
- echo where ALIAS is a recognized configuration type. 1>&2
- exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`
-# First pass through any local machine types.
-case $1 in
- *local*)
- echo $1
- exit 0
- ;;
- *)
- ;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <con...@gn...>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit 0;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
esac
@@ -74,5 +118,5 @@
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu*)
+ nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -100,5 +144,5 @@
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple)
+ -apple | -axis)
os=
basic_machine=$1
@@ -172,22 +216,32 @@
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
- | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+ tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+ | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+ | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
- | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+ | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
| hppa64 \
| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
| alphaev6[78] \
- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+ | we32k | ns16k | clipper | i370 | sh | sh[34] \
+ | powerpc | powerpcle \
+ | 1750a | dsp16xx | pdp10 | pdp11 \
+ | mips16 | mips64 | mipsel | mips64el \
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el | mcore \
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
- | thumb | d10v | fr30 | avr)
+ | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+ | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
+ | v850 | c4x \
+ | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+ | pj | pjl | h8500)
basic_machine=$basic_machine-unknown
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
;;
@@ -195,5 +249,5 @@
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
- i[34567]86)
+ i*86 | x86_64)
basic_machine=$basic_machine-pc
;;
@@ -205,10 +259,11 @@
# Recognize the basic CPU types with company name.
# FIXME: clean up the formatting here.
- vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+ vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+ | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
| xmp-* | ymp-* \
- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+ | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
| hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
| hppa2.0n-* | hppa64-* \
@@ -217,13 +272,15 @@
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
| clipper-* | orion-* \
- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+ | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+ | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+ | mips16-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
| mipstx39-* | mipstx39el-* | mcore-* \
- | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+ | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+ | [cjt]90-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
- | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
- | bs2000-*)
+ | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+ | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
;;
# Recognize the various machine names and aliases which stand
@@ -262,12 +319,12 @@
;;
amiga | amiga-*)
- basic_machine=m68k-cbm
+ basic_machine=m68k-unknown
;;
amigaos | amigados)
- basic_machine=m68k-cbm
+ basic_machine=m68k-unknown
os=-amigaos
;;
amigaunix | amix)
- basic_machine=m68k-cbm
+ basic_machine=m68k-unknown
os=-sysv4
;;
@@ -316,6 +373,6 @@
os=-unicos
;;
- [ctj]90-cray)
- basic_machine=c90-cray
+ [cjt]90)
+ basic_machine=${basic_machine}-cray
os=-unicos
;;
@@ -323,4 +380,7 @@
basic_machine=m68k-crds
;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
@@ -370,4 +430,8 @@
os=-sysv
;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
h3050r* | hiux*)
basic_machine=hppa1.1-hitachi
@@ -445,17 +509,17 @@
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i[34567]86v32)
+ i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
- i[34567]86v4*)
+ i*86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
- i[34567]86v)
+ i*86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
- i[34567]86sol2)
+ i*86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
@@ -469,12 +533,4 @@
os=-vsta
;;
- i386-go32 | go32)
- basic_machine=i386-unknown
- os=-go32
- ;;
- i386-mingw32 | mingw32)
- basic_machine=i386-unknown
- os=-mingw32
- ;;
iris | iris4d)
basic_machine=mips-sgi
@@ -502,4 +558,8 @@
os=-sysv
;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
miniframe)
basic_machine=m68000-convergent
@@ -532,5 +592,5 @@
;;
msdos)
- basic_machine=i386-unknown
+ basic_machine=i386-pc
os=-msdos
;;
@@ -596,4 +656,8 @@
os=-mon960
;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
np1)
basic_machine=np1-gould
@@ -631,26 +695,26 @@
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexen)
+ pentium | p5 | k5 | k6 | nexgen)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86)
+ pentiumpro | p6 | 6x86 | athlon)
basic_machine=i686-pc
;;
pentiumii | pentium2)
- basic_machine=i786-pc
+ basic_machine=i686-pc
;;
- pentium-* | p5-* | k5-* | k6-* | nexen-*)
+ pentium-* | p5-* | k5-* | k6-* | nexgen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumpro-* | p6-* | 6x86-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
;;
- power) basic_machine=rs6000-ibm
+ power) basic_machine=power-ibm
;;
ppc) basic_machine=powerpc-unknown
@@ -667,4 +731,8 @@
basic_machine=i386-ibm
;;
+ pw32)
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
rom68k)
basic_machine=m68k-rom68k
@@ -758,4 +826,8 @@
os=-unicos
;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
@@ -853,4 +925,8 @@
basic_machine=vax-dec
;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
pdp11)
basic_machine=pdp11-dec
@@ -859,5 +935,8 @@
basic_machine=we32k-att
;;
- sparc | sparcv9)
+ sh3 | sh4)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
@@ -881,4 +960,7 @@
os=-coff
;;
+ *-unknown)
+ # Make sure to match an already-canonicalized machine name.
+ ;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -940,10 +1022,11 @@
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit*)
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
case $basic_machine in
- x86-* | i[34567]86-*)
+ x86-* | i*86-*)
;;
*)
@@ -1001,5 +1084,5 @@
os=-nextstep2
;;
- -nsk)
+ -nsk*)
os=-nsk
;;
@@ -1038,5 +1121,5 @@
os=-xenix
;;
- -*mint | -*MiNT)
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
@@ -1072,4 +1155,7 @@
os=-aout
;;
+ pdp10-*)
+ os=-tops20
+ ;;
pdp11-*)
os=-none
@@ -1180,5 +1266,5 @@
os=-rtu
;;
- f301-fujitsu)
+ f30[01]-fujitsu | f700-fujitsu)
os=-uxpv
;;
@@ -1258,5 +1344,5 @@
vendor=apple
;;
- -*mint | -*MiNT)
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
vendor=atari
;;
@@ -1267,2 +1353,10 @@
echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- configure 2001/02/03 02:03:35 1.2
+++ configure 2001/06/01 02:07:23 1.3
@@ -1,7 +1,6 @@
#! /bin/sh
-
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated automatically using Autoconf version 2.14.1
+# Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -9,23 +8,187 @@
[...6078 lines suppressed...]
+ esac
+ # Make a symlink if possible; otherwise try a hard link.
+ if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+ ln $srcdir/$ac_source $ac_dest; then :
+ else
+ { echo "configure: error: cannot link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
+ fi
+fi; done
EOF
+
cat >> $CONFIG_STATUS <<EOF
@@ -2727,5 +6570,5 @@
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
Index: configure.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- configure.in 2001/02/03 02:03:35 1.2
+++ configure.in 2001/06/01 02:07:23 1.3
@@ -16,13 +16,11 @@
dnl Command-line options.
-
AC_ARG_ENABLE(debug,
- [ --enable-debug enable debugging], ,
- enable_debug=no
+ [ --enable-debug enable debugging], ,
+ enable_debug=no
)
-if test x$enable_debug = xyes; then
- AC_DEFINE(DEBUG)
-fi
+AM_CONDITIONAL(DEBUG, test "$enable_debug" = yes)
+
dnl Checks for programs.
AC_PROG_CXX
@@ -34,10 +32,12 @@
dnl create a working libtool-script
if test -z "$LIBTOOL"; then
+ AC_DISABLE_SHARED
AC_LANG_SAVE
AC_LANG_C
+ dnl Shared libraries are broken at the moment. )-:
AM_PROG_LIBTOOL
dnl LIBTOOL="$LIBTOOL --silent"
- dnl AC_SUBST(LIBTOOL)
AC_LANG_RESTORE
+ AC_SUBST(LIBTOOL_DEPS)
LIBTOOL_SHELL='/bin/sh ./libtool'
else
@@ -45,4 +45,5 @@
fi
+
dnl add --with-extra-includes and --with-extra-libs switch to ./configure
all_libraries="$all_libraries $USER_LDFLAGS"
@@ -61,14 +62,20 @@
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h errno.h sys/stat.h sys/ioctl.h \
+ sys/types.h linux/types.h linux/bitops.h asm/byteorder.h asm/atomic.h \
+ sys/time.h signal.h sched.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_C_INLINE
+AC_C_LONG_DOUBLE
AC_TYPE_OFF_T
+AC_TYPE_SIZE_T
dnl Checks for library functions.
AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(strdup)
+AC_CHECK_FUNCS(memset strdup puts printf fprintf vprintf perror strerror \
+ malloc calloc free realloc open close read write lseek fdatasync \
+ ioctl fflush wcslen wcstombs atexit exit sigaction setitimer)
dnl Perform program name transformation.
Index: linux-ntfs.spec.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/linux-ntfs.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- linux-ntfs.spec.in 2001/02/03 02:03:35 1.1
+++ linux-ntfs.spec.in 2001/06/01 02:07:23 1.2
@@ -11,5 +11,5 @@
Version : %{ver}
Release : %{rel}
-Source : ftp://linux-ntfs.sourceforge.net/pub/linux-ntfs/linux-ntfs-%{ver}.tar.gz
+Source : ftp://linux-ntfs.sf.net/pub/linux-ntfs/linux-ntfs-%{ver}.tar.gz
Buildroot : %{_tmppath}/%{name}-root
Packager : Anton Altaparmakov <ai...@ca...>
@@ -60,5 +60,5 @@
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO.ntfsfix TODO.include doc/CodingStyle doc/attribute_definitions doc/attributes.txt doc/tunable_settings doc/template.c doc/template.h
+%doc AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO.ntfsfix TODO.include TODO.mkntfs doc/CodingStyle doc/attribute_definitions doc/attributes.txt doc/tunable_settings doc/template.c doc/template.h doc/system_files.txt doc/system_security_descriptors.txt
%{bindir}/*
#%{mandir}/*/*
Index: ltmain.sh
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ltmain.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- ltmain.sh 2001/02/02 00:30:25 1.1
+++ ltmain.sh 2001/06/01 02:07:23 1.2
@@ -1,6 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
+# NOTE: Changing this file will not affect anything until you rerun configure.
#
-# Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <go...@gn...>, 1996
#
@@ -55,6 +56,6 @@
PROGRAM=ltmain.sh
[...3335 lines suppressed...]
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+ ;;
+
compile)
$echo \
@@ -3892,4 +4810,6 @@
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
+ -prefer-pic try to building PIC objects only
+ -prefer-non-pic try to building non-PIC objects only
-static always build a \`.o' file suitable for static linking
@@ -3971,4 +4891,6 @@
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
+ -no-fast-install disable the fast-install mode
+ -no-install link a not-installable executable
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
|
|
From: Anton A. <an...@us...> - 2001-06-01 02:07:26
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/doc In directory usw-pr-cvs1:/tmp/cvs-serv13537/doc Modified Files: Makefile.am Makefile.in Added Files: system_files.txt system_security_descriptors.txt Log Message: It has been a long time since last commit. At moment have done a lot of work on mkntfs but also at the moment ntfsfix and ntfsdump_logfile and libntfs are broken. Basically only mkntfs works and that is not complete either. --- NEW FILE --- $Id: system_files.txt,v 1.1 2001/06/01 02:07:24 antona Exp $ 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. (Only $MFT has a sequence number of 1, rather than 0.) FILE_$MFT = 0, /* Master file table (mft). Data attribute contains the entries and bitmap attribute records which ones are in use (bit==1). */ FILE_$MFTMirr = 1, /* Mft mirror (copy of first four mft records) in data attribute. */ FILE_$LogFile = 2, /* Journalling log in data attribute. */ FILE_$Volume = 3, /* Volume name attribute and volume information attribute (flags and ntfs version). Windows refers to this file as volume DASD (Direct Access Storage Device). */ FILE_$AttrDef = 4, /* Array of attribute definitions in data attribute. */ FILE_$root = 5, /* Root directory. */ FILE_$Bitmap = 6, /* Allocation bitmap of all clusters (lcns) in data attribute. */ FILE_$Boot = 7, /* Boot sector (always at cluster 0) in data attribute. */ FILE_$BadClus = 8, /* Contains all bad clusters in the non-resident data attribute. */ FILE_$Secure = 9, /* Shared security descriptors in data attribute and two indexes into the descriptors. Appeared in Windows 2000. Before that, this file was named $Quota but was unused. */ FILE_$UpCase = 10, /* Uppercase equivalents of all 65536 Unicode characters in data attribute. */ FILE_$Extend = 11, /* Directory containing other system files (eg. $ObjId, $Quota, $Reparse and $UsnJrnl). This is new to NTFS3.0. */ FILE_reserved12 = 12, /* Reserved for future use (records 12-15). */ FILE_reserved13 = 13, FILE_reserved14 = 14, FILE_reserved15 = 15, FILE_first_user = 16, /* First user file, used as test limit for whether to allow opening a file or not. */ --- NEW FILE --- $SD attribute value for the system files: $MFT, $MFTMirr, $LogFile, $AttrDef, $Bitmap, $Boot, $BadClus, and $UpCase: sd: 1, 0, 0x8004, 0x00000048, 0x00000058, 0x00000000, 0x00000014; sd.dacl.acl: 2, 0, 0x0034, 0x0002, 0x0000; sd.dacl.acl.ace1: 0, 0, 0x0014, 0x00120089; sd.dacl.acl.ace1.sid: 1, 1, 0, 0, 0, 0, 0, 5, 0x00000012; sd.dacl.acl.ace2: 0, 0, 0x0018, 0x00120089; sd.dacl.acl.ace2.sid: 1, 2, 0, 0, 0, 0, 0, 5, 0x00000020, 0x00000220; sd.owner.sid: 1, 2, 0, 0, 0, 0, 0, 5, 0x00000020, 0x00000220; sd.group.sid: 1, 2, 0, 0, 0, 0, 0, 5, 0x00000020, 0x00000220; $Volume, $Quota, and system files 0xb-0xf: sd: 1, 0, 0x8004, 0x00000048, 0x00000058, 0x00000000, 0x00000014; sd.dacl.acl: 2, 0, 0x0034, 0x0002, 0x0000; sd.dacl.acl.ace1: 0, 0, 0x0014, 0x0012019f; sd.dacl.acl.ace1.sid: 1, 1, 0, 0, 0, 0, 0, 5, 0x00000012; sd.dacl.acl.ace2: 0, 0, 0x0018, 0x0012019f; sd.dacl.acl.ace2.sid: 1, 2, 0, 0, 0, 0, 0, 5, 0x00000020, 0x00000220; sd.owner.sid: 1, 2, 0, 0, 0, 0, 0, 5, 0x00000020, 0x00000220; sd.group.sid: 1, 2, 0, 0, 0, 0, 0, 5, 0x00000020, 0x00000220; . (root directory) sd: 1, 0, 0x8004, 0x00000030, 0x00000040, 0x00000000, 0x00000014; sd.dacl.acl: 2, 0, 0x001c, 0x0001, 0x0000; sd.dacl.acl.ace1: 0, 3, 0x0014, 0x001f01ff; sd.dacl.acl.ace1.sid: 1, 1, 0, 0, 0, 0, 0, 1, 0x00000000; sd.owner.sid: 1, 2, 0, 0, 0, 0, 0, 5, 0x00000020, 0x00000220; sd.group.sid: 1, 2, 0, 0, 0, 0, 0, 5, 0x00000020, 0x00000220; Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -U2 -r1.1 -r1.2 --- Makefile.am 2001/02/02 01:28:46 1.1 +++ Makefile.am 2001/06/01 02:07:24 1.2 @@ -1,3 +1,2 @@ - EXTRA_DIST = \ CodingStyle \ @@ -6,4 +5,6 @@ template.c \ template.h \ - tunable_settings + tunable_settings \ + system_files.txt \ + system_security_descriptors.txt Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -U2 -r1.1 -r1.2 --- Makefile.in 2001/02/03 02:03:35 1.1 +++ Makefile.in 2001/06/01 02:07:24 1.2 @@ -1,3 +1,3 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. @@ -71,17 +71,22 @@ CXX = @CXX@ DLLTOOL = @DLLTOOL@ +ECHO = @ECHO@ +EXEEXT = @EXEEXT@ LDFLAGS = @LDFLAGS@ LIBTOOL = @LIBTOOL@ +LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ all_includes = @all_includes@ all_libraries = @all_libraries@ -EXTRA_DIST = CodingStyle attribute_definitions attributes.txt template.c template.h tunable_settings +EXTRA_DIST = CodingStyle attribute_definitions attributes.txt template.c template.h tunable_settings system_files.txt system_security_descriptors.txt mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
|
From: Anton A. <an...@us...> - 2001-04-12 22:37:24
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv32418/include
Modified Files:
types.h
Log Message:
Add a description and structure for holding attributes in memory. No code to
use it yet but it's a start. The design is geared with the ideas of making
searching for attributes and using/implementing the search context as easy as
possible, integrating the attributes into their mft_entries and maintining a
fast sync volume path.
Comments welcome.
Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/types.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- types.h 2001/04/11 14:29:11 1.2
+++ types.h 2001/04/12 22:37:20 1.3
@@ -122,10 +122,12 @@
Note, the list members are mft_entry
struct pointers. */
- int nr_mft_entries; /* Number of mft_entries. */
- struct list_head dirty_mft_entries; /* Linked list of all loaded mft
- records which are dirty. */
- int nr_dirty_mft_entries; /* Number of dirty mft_entries. */
- struct list_head v_list; /* Anchor for list of all mounted
- volumes. */
+ int nr_mft_entries; /* Number of mft entries. */
+ struct list_head dirty_mft_entries; /* Linked list of all dirty mft
+ records. */
+ int nr_dirty_mft_entries; /* Number of dirty mft_entries. */
+ struct list_head dirty_attrs; /* List of all dirty (non-resident)
+ attributes. */
+ int nr_dirty_attrs; /* Number of dirty_attrs. */
+ struct list_head v_list; /* Anchor for mounted volumes list. */
} ntfs_volume;
@@ -266,17 +268,157 @@
*/
+typedef union {
+ __u8; /* Unnamed __u8 to serve as default when just using
+ a_val without specifying any of the below. */
+ STANDARD_INFORMATION std_inf;
+ ATTR_LIST_ENTRY al_entry;
+ FILENAME_ATTR filename;
+ OBJECT_ID_ATTR obj_id;
+ SECURITY_DESCRIPTOR_ATTR sec_desc;
+ VOLUME_NAME vol_name;
+ VOLUME_INFORMATION vol_inf;
+ DATA_ATTR data;
+ INDEX_ROOT index_root;
+ INDEX_BLOCK index_blk;
+ BITMAP_ATTR bmp;
+ REPARSE_POINT reparse;
+ EA_INFORMATION ea_inf;
+ EA_ATTR ea;
+ PROPERTY_SET property_set;
+ LOGGED_UTILITY_STREAM logged_util_stream;
+ EFS_ATTR efs;
+} attr_val;
+
struct _ntfs_file;
typedef struct _ntfs_file ntfs_file;
+struct _mft_entry;
+typedef struct _mft_entry mft_entry;
+
+/**
+ * attr - structure describing an attribute in memory
+ * @a_rec: actual attribute record
+ * @a_val: attribute value (points into @a_rec if resident)
+ * @a_run_list: run list of the attribute value (if non-resident)
+ * @a_attr_list: attribute list attribute in @m_base_entry
+ * @a_attr_list_entry: attribute list entry of this attribute in @a_attr_list
+ * @a_flags: flags describing the status of the attribute
+ * @a_count: usage count of the attribute
+ * @a_dirty_list: anchor for the dirty_attrs list of the volume
+ * @a_vol: volume the attribute belongs to
+ * @m_entry: mft entry the attribute is contained in
+ * @m_base_entry: base mft entry holding @a_run_list
+ *
+ * @a_rec points to the ATTR_RECORD for the attribute. This field is always
+ * valid as it is used to determine which attribute is held in this entry.
+ *
+ * @a_val points to the attribute value of the attribute and will either point
+ * into @a_rec (resident attribute) or it will point to a especially for it
+ * allocated memory which has to be freed when the attribute is unmapped. @a_val
+ * is only valid when the mapped flag is set in @a_flags.
+ *
+ * It is important to note that @a_val contains only the mapped portion of the
+ * attribute value which is indicated by a lcn >= 0 in the run list.
+ *
+ * If lcn is -1, @a_val does contain this portion of the value, but it is all
+ * zero, and there is no storage allocated for it (it is a sparse run). When
+ * writing it to disk it is checked for being zero again and if it is, the
+ * (zero) data is not written to disk, but a sparse entry is saved in the
+ * mapping pairs array. If it is not zero stotare is allocated on disk and the
+ * data is written. The run list and mapping pairs array is then updated to
+ * reflect this and lcn is no longer -1.
+ *
+ * If lcn is -2, the corresponding bit of the attribute value is only contained
+ * in @a_val (and is set to zero but is in fact invalid data), if it is located
+ * in between two existing lcn >= 0 containing run list entries. I.e. if you
+ * find lcn == -2 in the first or last run list entry in @a_run_list, @a_val
+ * does not contain this data at all! So translation has to occur to correct
+ * the offset when reading/writing. If a user request the attribute value as a
+ * whole, then we will automatically insert all extents into @a_run_list and
+ * @a_val.
+ *
+ * @a_run_list will not necessarily hold the complete run_list. Should the vcn
+ * being looked for not be present in @a_run_list, it should be checked for
+ * other extents before returning out of bounds error. A special case is when
+ * the lcn is found to be -2 which means that there are one or more extents of
+ * the length specified (if this is not the last run list entry, i.e. length is
+ * not 0) but they haven't been inserted into the attribute.
+ *
+ * Note, that @a_run_list may be NULL which means that the run list has not
+ * been extracted from @a_rec (yet). This can only happen when the attribute
+ * value is not mapped. If mapped, @a_run_list must be valid.
+ *
+ * @a_attr_list and @a_attr_list_entry are used to point to the attribute list
+ * attribute describing this attribute and to the attribute list entry within
+ * the attribute list attribute which describes this attribute. These fields
+ * are only valid if the in_attr_list flag is set in @a_flags.
+ *
+ * The following flags are defined for @a_flags:
+ * dirty - Attribute is dirty. Needs to be written to disk.
+ * mapped - Attribute value is mapped. If not mapped @a_val and
+ * @a_dirty_list are not defined.
+ * error - There was some kind of error on I/O so it is possible
+ * that one or more of the other fields are corrupt.
+ * nonresident - Attribute is not resident. If resident, @a_run_list,
+ * @a_dirty_list and @m_base_entry are not defined (0).
+ * in_attr_list - Attribute is described by the attribute list attribute
+ * @a_attr_list, the entry describing it is
+ * @a_attr_list_entry, and this points into @a_attr_list.
+ * in_ext_record - Attribute is described by the attribute list
+ * attribute and it is stored in an extension record
+ * (pointed to by @m_entry) rather than in the base mft
+ * record. This is redundant in the sense that if you
+ * compare @m_entry with @m_base_entry and they are not
+ * equal this implies the same as this flag.
+ *
+ * @a_count is the number of times the attribute value has been mapped. When it
+ * reaches zero it may be safely unmapped (after being synced if dirty). This
+ * can be done at any point in time. Remember, we only free() the memory if the
+ * attribute is non resident! Once the value is unmapped, it is also safe to
+ * free() @a_run_list.
+ *
+ * @a_dirty_list anchors the attribute entry into the dirty_attrs list of
+ * @a_vol. Used when syncing the volume to be able to quickly walk all dirty
+ * attributes and sync them as well. Only applies to non-resident attributes
+ * as resident ones are covered by virtue of being contained inside their
+ * mft entries (@m_entry) which are dirty and synced to disk, anyway.
+ *
+ * @a_vol is the volume the attribute belongs to. This is just so lookups are
+ * quicker. Otherwise it could be obtained from @m_entry->m_vol.
+ *
+ * @m_entry points to the mft entry in which the attribute is held. If the
+ * attribute is in the base mft record, @m_entry is also the base mft record
+ * and @m_base_entry equals @m_entry. If the attribute is located in an
+ * extension mft record, @m_base_entry points to the mft entry of the base mft
+ * record and in_ext_record flag is set in @a_flags.
+ *
+ * Note, we don't store the file this attribute belongs to, as this information
+ * is irrelevant for all intents and purposes and can be obtained from
+ * @m_entry->m_file should it be needed at some point.
+ */
typedef struct {
+ ATTR_RECORD *a_rec;
+ run_list a_run_list;
+ attr_val *a_val;
+ unsigned int a_flags;
+ unsigned int a_count;
+ struct list_head a_dirty_list;
+ ntfs_volume *a_vol;
+ mft_entry *m_entry;
+ mft_entry *m_base_entry;
+} attr;
+
+struct _mft_entry {
MFT_RECORD *m_rec;
unsigned int m_flags;
MFT_REF m_ref;
unsigned int m_count;
+ attr **m_attrs;
+ int nr_m_attrs;
ntfs_file *m_file;
struct list_head m_list;
struct list_head m_dirty_list;
ntfs_volume *m_vol;
-} mft_entry;
+};
struct _ntfs_file {
@@ -288,5 +430,4 @@
ntfs_volume *f_vol;
};
-
#endif /* defined NTFS_TYPES_H */
|
|
From: Anton A. <an...@us...> - 2001-04-12 22:37:23
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv32418/libntfs
Modified Files:
attrib.c
Log Message:
Add a description and structure for holding attributes in memory. No code to
use it yet but it's a start. The design is geared with the ideas of making
searching for attributes and using/implementing the search context as easy as
possible, integrating the attributes into their mft_entries and maintining a
fast sync volume path.
Comments welcome.
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- attrib.c 2001/04/11 11:49:16 1.12
+++ attrib.c 2001/04/12 22:37:21 1.13
@@ -37,4 +37,14 @@
#include "support.h"
+int __map_attribute_value(attr *a)
+{
+ return -ENOTSUP;
+}
+
+int __unmap_attribute_value(attr *a)
+{
+ return -ENOTSUP;
+}
+
/**
* find_attr - find (next) attribute in mft record
|
|
From: Anton A. <an...@us...> - 2001-04-11 15:48:43
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs In directory usw-pr-cvs1:/tmp/cvs-serv21236 Modified Files: ntfs_rec.c Log Message: Fixes Index: ntfs_rec.c =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfs_rec.c,v retrieving revision 1.7 retrieving revision 1.8 diff -U2 -r1.7 -r1.8 --- ntfs_rec.c 2001/04/11 15:29:39 1.7 +++ ntfs_rec.c 2001/04/11 15:48:41 1.8 @@ -22,4 +22,5 @@ */ +#include <stdio.h> #include <linux/types.h> |
|
From: Anton A. <an...@us...> - 2001-04-11 15:48:23
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv21173
Modified Files:
list.h
Log Message:
Fixed headers
Index: list.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/list.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- list.h 2001/04/10 23:43:10 1.1
+++ list.h 2001/04/11 15:48:20 1.2
@@ -147,6 +147,6 @@
*/
#define list_for_each(pos, head) \
- for (pos = (head)->next, prefetch(pos->next); pos != (head); \
- pos = pos->next, prefetch(pos->next))
+ for (pos = (head)->next, pos->next; pos != (head); \
+ pos = pos->next, pos->next)
#endif
|
|
From: Anton A. <an...@us...> - 2001-04-11 15:47:38
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv21016
Modified Files:
ntfsfix.c
Log Message:
Fix
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- ntfsfix.c 2001/04/11 15:29:39 1.13
+++ ntfsfix.c 2001/04/11 15:47:36 1.14
@@ -134,5 +134,5 @@
printf("Going to read $Mft... ");
*(__u64*)&mref = FILE_$Mft;
- br = get_mft_records(vol, b1, &mref, 4);
+ br = get_mft_records(vol, (MFT_RECORD*)b1, &mref, 4);
if (br != 4) {
puts(FAILED);
|
|
From: Richard R. <fl...@us...> - 2001-04-11 15:36:57
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv19105/ntfstools Modified Files: ntfsdump_logfile.c Log Message: fixed typo Index: ntfsdump_logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v retrieving revision 1.5 retrieving revision 1.6 diff -U2 -r1.5 -r1.6 --- ntfsdump_logfile.c 2001/04/08 03:02:55 1.5 +++ ntfsdump_logfile.c 2001/04/11 15:36:54 1.6 @@ -72,5 +72,5 @@ int pass = 1; int i, lps; - MFT_REFERENCE mref; + MFT_REF mref; attr_search_context ctx; |
|
From: Richard R. <fl...@us...> - 2001-04-11 15:29:42
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv17521/ntfstools
Modified Files:
ntfsfix.c
Log Message:
minor build fixes
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- ntfsfix.c 2001/04/08 03:02:55 1.12
+++ ntfsfix.c 2001/04/11 15:29:39 1.13
@@ -77,5 +77,5 @@
__u16 flags;
attr_search_context ctx;
- MFT_REFERENCE mref;
+ MFT_REF mref;
EXEC_REVISION = strdup("$Revision$");
|
|
From: Richard R. <fl...@us...> - 2001-04-11 15:29:42
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv17521/libntfs
Modified Files:
disk_io.c ntfs_rec.c ntfsd.c
Log Message:
minor build fixes
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- disk_io.c 2001/04/11 14:29:12 1.12
+++ disk_io.c 2001/04/11 15:29:39 1.13
@@ -392,5 +392,5 @@
if (!is_file_record(m->magic))
goto file_corrupt;
- if (MSEQNO(mref) && MSEQNO(mref) != le16_to_cpu(m->sequence_number))
+ if (MSEQNO(*mref) && MSEQNO(*mref) != le16_to_cpu(m->sequence_number))
goto file_corrupt;
if (!(m->flags & MFT_RECORD_IN_USE))
Index: ntfs_rec.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfs_rec.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ntfs_rec.c 2001/04/11 11:49:16 1.6
+++ ntfs_rec.c 2001/04/11 15:29:39 1.7
@@ -24,4 +24,5 @@
#include <linux/types.h>
+#include "volume.h"
#include "ntfs_rec.h"
#include "layout.h"
Index: ntfsd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfsd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- ntfsd.c 2001/04/10 23:37:19 1.4
+++ ntfsd.c 2001/04/11 15:29:39 1.5
@@ -30,4 +30,5 @@
#include <sched.h>
+#include "volume.h"
#include "ntfsd.h"
@@ -35,5 +36,5 @@
* Keep track of mounted volumes so we can walk the list and sync them all.
*/
-LISTHEAD(ntfs_mounted_volumes);
+LIST_HEAD(ntfs_mounted_volumes);
int nr_ntfs_mounted_volumes = 0;
BOOL ntfs_need_sync = FALSE;
@@ -92,5 +93,5 @@
static void ntfsd_thread(int i)
{
- if (atomic_read(ntfsd_times_started) && nr_ntfs_mounted_volumes)
+ if (atomic_read(&ntfsd_times_started) && nr_ntfs_mounted_volumes)
ntfs_need_sync = TRUE;
}
@@ -104,5 +105,5 @@
if (atomic_inc_and_test(&ntfsd_times_started)) {
- fprinf(stderr, "Linux-NTFS: ntfsd started counter "
+ fprintf(stderr, "Linux-NTFS: ntfsd started counter "
"would overflow. Not starting.\n");
err = EMFILE;
|
|
From: Anton A. <an...@us...> - 2001-04-11 14:29:14
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv5121/libntfs
Modified Files:
disk_io.c mft.c volume.c
Log Message:
Almost fixed compilaton. Remember to declare a struct type with
struct NAME { declaration }; rather than the bogus struct { declaration NAME };
then can use typedef NAME othername; on a forward declaration of NAME
(struct NAME;) and all is fine...
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- disk_io.c 2001/04/11 11:49:16 1.11
+++ disk_io.c 2001/04/11 14:29:12 1.12
@@ -278,5 +278,5 @@
* NOTE: @mrec has to be at least of size @count * vol->mft_record_size.
*/
-int get_mft_records(const ntfs_volume *vol, MFT_RECORD *mrec,
+int get_mft_records(const ntfs_volume *vol, const MFT_RECORD *mrec,
const MFT_REF *mref, const int count)
{
@@ -347,5 +347,5 @@
* NOTE: @mrec has to be at least of size vol->mft_record_size.
*/
-__inline__ int get_mft_record(const ntfs_volume *vol, MFT_RECORD *mrec,
+__inline__ int get_mft_record(const ntfs_volume *vol, const MFT_RECORD *mrec,
const MFT_REF *mref)
{
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- mft.c 2001/04/11 11:49:16 1.8
+++ mft.c 2001/04/11 14:29:12 1.9
@@ -22,6 +22,8 @@
*/
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
#include <linux/types.h>
-#include <linux/errno.h>
#include <linux/bitops.h>
@@ -68,5 +70,5 @@
} else {
lcn = vcn_to_lcn(vol->mft_runlist,
- m * vol->clusters_per_mft_record);
+ mref * vol->clusters_per_mft_record);
/* FIXME: Change "*" above to "<<"! */
ofs = 0;
@@ -118,6 +120,6 @@
return NULL;
memset(me, 0, sizeof(mft_entry));
- INIT_LIST_HEAD(me->m_list);
- INIT_LIST_HEAD(me->m_dirty_list);
+ INIT_LIST_HEAD(&me->m_list);
+ INIT_LIST_HEAD(&me->m_dirty_list);
return me;
}
@@ -125,5 +127,5 @@
__inline__ int __free_mft_entry(mft_entry *me)
{
- if (me->count || MftEntryDirty(me) || MftEntryMapped(me))
+ if (me->m_count || MftEntryDirty(me) || MftEntryMapped(me))
return -EBUSY;
free(me);
@@ -138,9 +140,11 @@
MFT_RECORD *mrec;
int i;
+ ntfs_volume *vol;
if (MftEntryMapped(me))
return 0;
- mref = (VCN)MREF(*me->m_ref);
+ mref = (VCN)MREF(me->m_ref);
mrec = (MFT_RECORD*)malloc(vol->mft_record_size);
+ vol = me->m_vol;
if (!mrec)
goto err_ret_errno;
@@ -213,36 +217,35 @@
int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REF mref,
- const MFT_RECORD *mrec, const BOOL dirty,
- const ntfs_file *f)
+ MFT_RECORD *mrec, const BOOL dirty, ntfs_file *f)
{
struct list_head *tmp;
- mft_entry *m;
+ mft_entry *ment, *m;
int i;
if (!*me && !__allocate_mft_entry())
return -errno;
- *(__u64*)&me->m_ref = mref;
- me->m_vol = vol;
+ ment = *me;
+ ment->m_ref = mref;
+ ment->m_vol = vol;
if (mrec) {
- me->m_rec = mrec;
- SetMftEntryMapped(me);
+ ment->m_rec = mrec;
+ SetMftEntryMapped(ment);
if (dirty)
- SetMftEntryDirty(me);
+ SetMftEntryDirty(ment);
} else
- __map_mft_entry(me);
+ __map_mft_entry(ment);
list_for_each(tmp, &vol->mft_entries) {
m = list_entry(tmp, mft_entry, m_list);
- if (MREF(m->m_ref) < MREF(me->m_ref))
+ if (MREF(m->m_ref) < MREF(ment->m_ref))
continue;
- if (MREF(m->m_ref) > MREF(me->m_ref)) {
+ if (MREF(m->m_ref) > MREF(ment->m_ref)) {
/* Insert the mft entry in the correct position. */
- __list_add(&me->m_list, &tmp->m_list->prev,
- &tmp->m_list);
+ __list_add(&ment->m_list, tmp->prev, tmp);
break;
}
fprintf(stderr, "Linux-NTFS: BUG! insert_mft_entry(): mft "
"entry already present in volume.\n");
- if (MSEQNO(m->m_ref) != MSEQNO(me->m_ref) &&
- MSEQNO(m->m_ref) != 0 && MSEQNO(me->m_ref) != 0)
+ if (MSEQNO(m->m_ref) != MSEQNO(ment->m_ref) &&
+ MSEQNO(m->m_ref) != 0 && MSEQNO(ment->m_ref) != 0)
fprintf(stderr, "On top of this, the sequence numbers "
"are mismatched.\n");
@@ -250,14 +253,14 @@
}
vol->nr_mft_entries++;
- me->m_file = f;
+ ment->m_file = f;
if (f)
- me->m_file++;
- if (!MftEntryDirty(me))
+ ment->m_count++;
+ if (!MftEntryDirty(ment))
return 0;
- list_add_tail(&me->m_dirty_list, &vol->dirty_mft_entries);
+ list_add_tail(&ment->m_dirty_list, &vol->dirty_mft_entries);
vol->nr_dirty_mft_entries++;
return 0;
try_to_clean_ret:
- return flush_mft_entry(me);
+ return flush_mft_entry(ment);
}
@@ -273,5 +276,5 @@
if (me->m_file && (err = __remove_mft_entry_from_ntfs_file(me)))
return err < 0 ? err : -EBUSY;
- if (me->count)
+ if (me->m_count)
return -EBUSY;
free(me->m_rec);
@@ -289,5 +292,5 @@
return NULL;
memset(f, 0, sizeof(ntfs_file));
- INIT_LIST_HEAD(f->f_list);
+ INIT_LIST_HEAD(&f->f_list);
return f;
}
@@ -304,5 +307,5 @@
{
int i;
- char *t;
+ void *t;
mft_entry *m;
@@ -316,8 +319,8 @@
t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REF));
if (t)
- f->m_refs = (MFT_REF*)t;
+ f->m_refs = t;
t = realloc(f->m_entries, f->nr_m_refs * sizeof(mft_entry*));
if (t)
- f->m_entries = (mft_entry**)t;
+ f->m_entries = t;
}
return 0;
@@ -398,8 +401,8 @@
t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REF));
if (t)
- f->m_refs = (MFT_REF*)t;
+ f->m_refs = t;
t = realloc(f->m_entries, f->nr_m_refs * sizeof(mft_entry*));
if (t)
- f->m_entries = (mft_entry*)t;
+ f->m_entries = t;
goto finished;
}
@@ -413,5 +416,5 @@
list_del(&f->f_list);
f->f_vol->nr_closed_files--;
- free(f->m_refs)
+ free(f->m_refs);
free(f->m_entries);
free(f);
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- volume.c 2001/04/11 11:49:16 1.14
+++ volume.c 2001/04/11 14:29:12 1.15
@@ -206,9 +206,9 @@
#endif
/* Initialize files and mft records lists and associated variables. */
- INIT_LIST_HEAD(vol->open_files);
- INIT_LIST_HEAD(vol->closed_files);
+ INIT_LIST_HEAD(&vol->open_files);
+ INIT_LIST_HEAD(&vol->closed_files);
vol->max_files = 1000;
- INIT_LIST_HEAD(vol->mft_entries);
- INIT_LIST_HEAD(vol->dirty_mft_entries);
+ INIT_LIST_HEAD(&vol->mft_entries);
+ INIT_LIST_HEAD(&vol->dirty_mft_entries);
/* Start with $Mft. */
printf("Loading $Mft... ");
|
|
From: Anton A. <an...@us...> - 2001-04-11 14:29:14
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv5121/include
Modified Files:
disk_io.h mft.h types.h
Log Message:
Almost fixed compilaton. Remember to declare a struct type with
struct NAME { declaration }; rather than the bogus struct { declaration NAME };
then can use typedef NAME othername; on a forward declaration of NAME
(struct NAME;) and all is fine...
Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- disk_io.h 2001/04/11 11:49:16 1.7
+++ disk_io.h 2001/04/11 14:29:11 1.8
@@ -150,8 +150,9 @@
int put_clusters(ntfs_volume *vol, const __u8 *buf, const __s64 lcn, int count);
-int get_mft_records(const ntfs_volume *vol, __u8 *buf,
+int get_mft_records(const ntfs_volume *vol, const MFT_RECORD *mrec,
const MFT_REF *mref, const int count);
-extern __inline__ int get_mft_record(const ntfs_volume *vol, __u8 *buf,
+extern __inline__ int get_mft_record(const ntfs_volume *vol,
+ const MFT_RECORD *mrec,
const MFT_REF *mref);
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -U2 -r1.21 -r1.22
--- mft.h 2001/04/11 11:49:16 1.21
+++ mft.h 2001/04/11 14:29:11 1.22
@@ -235,6 +235,5 @@
*/
int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REF mref,
- const MFT_RECORD *mrec, const BOOL dirty,
- const ntfs_file *f);
+ MFT_RECORD *mrec, const BOOL dirty, ntfs_file *f);
/**
Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- types.h 2001/04/11 11:50:24 1.1
+++ types.h 2001/04/11 14:29:11 1.2
@@ -267,4 +267,5 @@
struct _ntfs_file;
+typedef struct _ntfs_file ntfs_file;
typedef struct {
@@ -273,21 +274,18 @@
MFT_REF m_ref;
unsigned int m_count;
- struct _ntfs_file *m_file;
+ ntfs_file *m_file;
struct list_head m_list;
struct list_head m_dirty_list;
- struct _ntfs_volume *m_vol;
+ ntfs_volume *m_vol;
} mft_entry;
-struct {
+struct _ntfs_file {
MFT_REF *m_refs;
- mft_entry *m_entries;
+ mft_entry **m_entries;
int nr_m_refs;
int f_count;
struct list_head f_list;
- struct _ntfs_volume *f_vol;
-} _ntfs_file;
-
-typedef struct _ntfs_file ntfs_file;
-
+ ntfs_volume *f_vol;
+};
|
|
From: Anton A. <an...@us...> - 2001-04-11 11:50:27
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv6768/include
Added Files:
layout.h types.h
Log Message:
Forgot to cvs add ...
--- NEW FILE ---
/*
* $Id: layout.h,v 1.1 2001/04/11 11:50:24 antona Exp $
*
* layout.h - Ntfs on-disk layout structures. Part of the Linux-NTFS project.
*
* Copyright (c) 2000,2001 Anton Altaparmakov.
*
* This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS
[...1891 lines suppressed...]
/* Irrelevant as feature unused. */
} __attribute__ ((__packed__)) PROPERTY_SET;
/*
* Attribute: Logged utility stream (0x100).
*
* Operations on this attribute are logged to the journal ($LogFile) like
* normal metadata changes.
*
* Used by the Encrypting File System (EFS). All encrypted files have this
* attribute with the name $EFS.
*/
typedef struct {
/* Can be anything the creator chooses. */
/* EFS uses it as follows: */
// FIXME: Type this info, verifying it along the way. (AIA)
} __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTR;
#endif /* defined LAYOUT_H */
--- NEW FILE ---
/*
* $Id: types.h,v 1.1 2001/04/11 11:50:24 antona Exp $
*
* types.h - Misc type definitions not related to on-disk structuer. Part of
* the Linux-NTFS project.
*
* Copyright (c) 2000,2001 Anton Altaparmakov.
*
* This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef NTFS_TYPES_H
#define NTFS_TYPES_H
#include <linux/bitops.h>
#include "list.h"
#include "layout.h"
#include "unistr.h"
typedef struct { /* In memory vcn to lcn mapping structure element. */
VCN vcn; /* vcn = starting virtual cluster number */
LCN lcn; /* lcn = starting logical cluster number */
__u64 length; /* run length in clusters */
} run_list_element;
typedef run_list_element *run_list;/*In memory vcn to lcn mapping array.*/
/* run_list notes:
* - The last vcn (in fact the last vcn + 1) is reached when length == 0.
* - When lcn == 0 this means that the count vcns starting at vcn are not
* physically allocated (i.e. this is a hole / data is sparse). */
/* FIXME: Should this be a linked list so it is easier/quicker to edit? (AIA) */
/*
* FIXME: Do we really want to return a pointer to the actual volume structure
* to the user to play with? It would be better to completely abstract the
* structure and provide functions for accessing the public members instead.
* In that case we would return a volume descriptor to the caller.
*
* DECISION: Return the actual structure. In the second release, once
* everything is working, we still have the option of abstracting the volume
* strcture data type.
*/
/*
* FIXME: For RAID stuff will need the fd and dev_name variables to be arrays
* or lists or something... Also will need to know the number of sectors (and
* sector size if not 512) of each device making up the RAID array. Obviously,
* will need RAID information as well like which RAID is used together with
* state information, etc. But that is the far future.
*/
/* The ntfs volume structure describing an open volume. */
typedef struct {
int fd; /* File descriptor associated with volume. */
char *dev_name; /* Name of the device/file the volume is in. */
char *vol_name; /* Name of the volume from the volume name
attribute. */
/* Version nos. and flags are from the volume information attribute. */
__u8 major_ver; /* Ntfs major version of volume. */
__u8 minor_ver; /* Ntfs minor version of volume. */
__u16 flags; /* Bit array of VOLUME_* flags. */
__s64 number_of_clusters;/* Volume size in clusters, hence also the
number of bits in lcn_bitmap. */
__u32 cluster_size; /* Byte size of a cluster. */
__u32 mft_record_size; /* Byte size of a mft record. */
__s64 mft_lcn; /* Logical cluster number of the data attribute
for FILE_$Mft. */
__s64 mftmirr_lcn; /* Logical cluster number of the data attribute
for FILE_$MftMirr. */
__u8 cluster_size_bits; /* Log(2) of the byte size of a cluster. */
__u8 mft_record_size_bits;/* Log(2) of the byte size of a mft record. */
__u8 *lcn_bitmap; /* Value of data attribute of FILE_$Bitmap. Each
bit represents a cluster on the volume, bit 0
representing lcn 0 and so on. A set bit means
that the cluster is in use and a zero bit
means the cluster is free. */
__u8 *mft_bitmap; /* Value of bitmap attribute of FILE_$Mft. Has
same interpretation as the lcn_bitmap above
but except that it keeps track of the usage
of the mft records rather than the lcns. */
run_list mft_runlist; /* Decompressed run list of the data attribute
of FILE_$Mft. */
__s64 number_of_mft_records; /* Number of records in the mft, equals
the number of bits in mft_bitmap. */
wchar_t *upcase; /* Upper case equivalents of all 65536
2-byte Unicode characters. Obtained
from FILE_$UpCase. */
__u32 upcase_len; /* Length in Unicode characters of the
upcase table. */
__u8 mft_records_per_cluster; /* The number of mft records that fit
into one cluster or 0 if clusters
are smaller than mft records. */
__u8 clusters_per_mft_record; /* The size of a mft record in clusters
or 0 if a mft record is smaller than
a cluster. */
struct list_head open_files; /* Linked list of ntfs_file struct
pointers, keeping track of all files
which have been loaded into memory
and are open. */
int nr_open_files; /* Number of open files. */
struct list_head closed_files; /* Linked list of ntfs_file struct
pointers, keeping track of all cached
files which are not open any more. */ int nr_closed_files; /* Number of closed files. */
int max_files; /* Maximum number of nr_open_files + nr_ closed_files. */
struct list_head mft_entries; /* Linked list of all loaded mft records
(disk inodes) in order of ascending
mft record number (disk inode number,
disregarding the sequence number).
Note, the list members are mft_entry
struct pointers. */
int nr_mft_entries; /* Number of mft_entries. */
struct list_head dirty_mft_entries; /* Linked list of all loaded mft
records which are dirty. */
int nr_dirty_mft_entries; /* Number of dirty mft_entries. */
struct list_head v_list; /* Anchor for list of all mounted
volumes. */
} ntfs_volume;
/*
* Implementation of files (aka mft records, aka inodes) in memory.
* ================================================================
*
* NOTE: I have completely ignored the existence of things like directories
* and directory references for the moment! These will just be added later on.
* The directories themselves are of course covered by being base mft records
* and hence follow the same semantics like every other mft record.
*
* Volume struct (typedef is in volume.h).
* ---------------------------------------
*
* open_files: Linked list of ntfs_file struct pointers, keeping track
* of all files which have been loaded into memory and are
* open.
*
* nr_open_files: Number of open files.
*
* closed_files: Linked list of ntfs_file struct pointers, keeping track
* of all cached files which are not open any more.
*
* nr_closed_files: Number of closed files.
*
* max_files: Maximum number of nr_open_files + nr_closed_files.
*
* As files are opened/closed, records move from one list to the other. When a
* file is opened it moves to the front of files_open as we expect to do I/O on
* it very soon so want quick access to it. When a file is closed, it moves to
* the end of files_closed as we don't expect it to be opened any time soon.
*
* Note: We probably want to replace these with hash tables once the library
* matures and users start complaining about the speed of it... but this will
* do for now.
*
* mft_entries: Linked list of all loaded mft records (disk inodes) in
* order of ascending mft record number (disk inode number,
* i.e. disregarding the sequence number). Note, the list
* members are not the actual MFT_RECORDS, but in memory
* mft_entry structs.
*
* nr_mft_entries: Number of mft_entries.
*
* dirty_mft_entries: Linked list of all loaded mft records which are dirty.
* Used by the disk writer thread. When a mft_entry is
* marked dirty, the entry is added to the end of this
* list. When it is flushed to disk, it is marked clean
* and removed from this list.
*
* nr_dirty_mft_entries: Number of dirty mft_entries.
*
*
* The mft_entry struct.
* ---------------------
*
* Each loaded mft record is represented by the mft_entry structure which
* contains these members:
*
* m_rec: Pointer to the actual MFT_RECORD. (Only valid if mapped flag is
* set.)
*
* m_flags: Atomic flags describing the mft entry / record:
*
* mapped: Is the MFT_RECORD actually in memory? (Is mrec valid?)
*
* dirty: Does the record need to be written to disk? (If not, it is safe
* to discard m_rec, but only if m_count is zero and we are
* holding m_rec_lock for writing.)
*
* error: When reading the entry from disk it was detected that it is
* corrupt. For example, it could be that a multi sector transfer
* error was detected.
*
* m_ref: Mft reference of the mft record described by this entry. (This
* includes the sequence number for consistency checking purposes.)
*
* m_count: Usage count. When zero this record is not referenced by
* any files and can be thrown away safely (writing it to disk
* first if dirty flag is set).
*
* m_list: Anchor for the mft_entries linked list.
*
* m_dirty_list: Anchor for the dirty_mft_enties linked list. (Only valid if
* the dirty flag is set.)
*
* m_vol: Volume this entry and its mft record belong to.
*
* m_file: Ntfs file this mft entry belongs to.
*
* Future:
*
* - Reference all loaded non-resident attributes somehow. Need this for the
* search context work and we do need to keep them so we can have two
* readers at the same time. So we need to somehow specify which attribute
* we are talking about, possibly which mft record it is in (+ position
* in attribute list?) and a pointer to the attribute value itself.
*
* The ntfs_file struct (file = base mft record).
* ----------------------------------------------
*
* Each loaded file is described by an ntfs_file struct, which contains these
* members:
*
* m_refs: The mft references of the file (i.e. the on disk inode number).
* This is an array of MFT_REFs. The first reference is the
* base mft record and if any others exist they are the associated
* loaded extension mft records. Used for attribute list purposes.
*
* m_entries: The loaded mft records for the file. This is an array of
* pointers to mft_entries, corresponding to the m_refs. This
* is not strictly necessary but results in a big speed up as we
* don't need to search the vol->mft_entries list every time...
*
* When an entry is referenced in the above lists the usage count for the
* corresponding entry is increased by one.
*
* nr_mft_refs: Number of records in the m_* arrays. If > 1, we
* know there must be an attribute list attribute (but if 1, we
* cannot assume there isn't one). This is of course the same as
* a possible nr_m_entries, but refs is shorter to write. (-;
*
* f_count: Usage count. When zero this file is not open by anyone
* and can be thrown away safely. No need to concern oneself with
* dirty state as this is done on a mft_entry level, i.e. one level
* below the idea of files.
*
* f_list: Anchor into vol->open/closed_files list. If f_count is > 0,
* into open_files list, otherwise into closed_files list.
*
* Notes:
*
* - No field to know whether we have the file open for writing as this is
* provided on a mft_entry level, i.e. below the files/directories level.
* This might turn out to be a mistake and is subject to change in the
* future if the current approach turns out not to work...
*/
struct _ntfs_file;
typedef struct {
MFT_RECORD *m_rec;
unsigned int m_flags;
MFT_REF m_ref;
unsigned int m_count;
struct _ntfs_file *m_file;
struct list_head m_list;
struct list_head m_dirty_list;
struct _ntfs_volume *m_vol;
} mft_entry;
struct {
MFT_REF *m_refs;
mft_entry *m_entries;
int nr_m_refs;
int f_count;
struct list_head f_list;
struct _ntfs_volume *f_vol;
} _ntfs_file;
typedef struct _ntfs_file ntfs_file;
#endif /* defined NTFS_TYPES_H */
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv6438/include
Modified Files:
Makefile.am Makefile.in attrib.h bootsect.h disk_io.h
logfile.h mft.h ntfs_rec.h ntfsd.h unistr.h volume.h
Log Message:
Header file reorganisation so that it compiles.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.am 2001/04/07 00:53:37 1.4
+++ Makefile.am 2001/04/11 11:49:15 1.5
@@ -10,5 +10,4 @@
mft.h \
ntfs_rec.h \
- volume.h \
unistr.h \
support.h \
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.in 2001/04/07 00:53:37 1.3
+++ Makefile.in 2001/04/11 11:49:15 1.4
@@ -84,5 +84,5 @@
linux_ntfsincludedir = $(includedir)/ntfs
-linux_ntfsinclude_HEADERS = attrib.h bitmap.h bootsect.h disk_io.h endians.h logfile.h mft.h ntfs_rec.h volume.h unistr.h support.h ntfsd.h
+linux_ntfsinclude_HEADERS = attrib.h bitmap.h bootsect.h disk_io.h endians.h logfile.h mft.h ntfs_rec.h unistr.h support.h ntfsd.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- attrib.h 2001/04/08 01:58:29 1.23
+++ attrib.h 2001/04/11 11:49:16 1.24
@@ -25,1664 +25,9 @@
#define ATTRIB_H
-#include "endians.h"
-#include "mft.h"
+#include "layout.h"
+#include "types.h"
#include "support.h"
#include "unistr.h"
-/*
- * System defined attributes (32-bit). Each attribute type has a corresponding
[...1642 lines suppressed...]
- LCN lcn; /* lcn = starting logical cluster number */
- __u64 length; /* run length in clusters */
-} run_list_element;
-
-typedef run_list_element *run_list;/*In memory vcn to lcn mapping array.*/
-/* run_list notes:
- * - The last vcn (in fact the last vcn + 1) is reached when length == 0.
- * - When lcn == 0 this means that the count vcns starting at vcn are not
- * physically allocated (i.e. this is a hole / data is sparse). */
-/* FIXME: Should this be a linked list so it is easier/quicker to edit? (AIA) */
-
/**
* decompress_run_list - decompress a mapping pairs array into a run list
@@ -1719,5 +64,5 @@
LCN vcn_to_lcn(const run_list rl, const VCN vcn);
-#include "volume.h"
+//#include "volume.h"
/**
Index: bootsect.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bootsect.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- bootsect.h 2001/04/08 03:02:55 1.5
+++ bootsect.h 2001/04/11 11:49:16 1.6
@@ -26,5 +26,4 @@
#define BOOTSECT_H
-
/* The NTFS oem_id */
#define magicNTFS cpu_to_le64(0x202020205346544e) /* "NTFS " */
Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- disk_io.h 2001/04/08 03:02:55 1.6
+++ disk_io.h 2001/04/11 11:49:16 1.7
@@ -27,5 +27,6 @@
#include <linux/types.h>
-#include "volume.h"
+#include "layout.h"
+#include "types.h"
/**
@@ -150,10 +151,10 @@
int get_mft_records(const ntfs_volume *vol, __u8 *buf,
- const MFT_REFERENCE *mref, const int count);
+ const MFT_REF *mref, const int count);
extern __inline__ int get_mft_record(const ntfs_volume *vol, __u8 *buf,
- const MFT_REFERENCE *mref);
+ const MFT_REF *mref);
-int read_file_record(const ntfs_volume *vol, const MFT_REFERENCE *mref,
+int read_file_record(const ntfs_volume *vol, const MFT_REF *mref,
MFT_RECORD **mrec, ATTR_RECORD **attr);
@@ -170,5 +171,5 @@
*/
int put_mft_record(ntfs_volume *vol, const __u8 *buf,
- const MFT_REFERENCE *mref);
+ const MFT_REF *mref);
#endif /* defined DISK_IO_H */
Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/logfile.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- logfile.h 2001/04/08 03:02:55 1.6
+++ logfile.h 2001/04/11 11:49:16 1.7
@@ -26,5 +26,5 @@
#include "endians.h"
-#include "ntfs_rec.h"
+#include "layout.h"
typedef enum {
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- mft.h 2001/04/10 23:54:25 1.20
+++ mft.h 2001/04/11 11:49:16 1.21
@@ -27,200 +27,9 @@
#include <linux/bitops.h>
+#include "layout.h"
+#include "types.h"
#include "list.h"
-#include "endians.h"
-#include "ntfs_rec.h"
-#include "volume.h"
#include "support.h"
-#define is_mft_record(x) ( is_file_record(x) )
-#define is_mft_recordp(p) ( is_file_recordp(p) )
-
-/*
- * Clusters are signed 64-bit values on NTFS volumes. We define two types, LCN
- * and VCN, to allow for type checking and better code readability.
- */
-typedef __s64 VCN;
-typedef __s64 LCN;
-
-/*
- * System files mft record numbers. All these files are always marked as used
- * in the bitmap attribute of the mft; presumably in order to avoid accidental
- * 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
- contains the entries and bitmap attribute
- records which ones are in use (bit==1). */
- FILE_$MftMirr = 1, /* Mft mirror (copy of first four mft records)
- in data attribute. */
- FILE_$LogFile = 2, /* Journalling log in data attribute. */
- FILE_$Volume = 3, /* Volume name attribute and volume information
- attribute (flags and ntfs version). Windows
- refers to this file as volume DASD, no idea
- what that stands for though. */
- FILE_$AttrDef = 4, /* Array of attribute definitions in data
- attribute. */
- FILE_$root = 5, /* Root directory. */
- FILE_$BitMap = 6, /* Allocation bitmap of all clusters (lcns) in
- data attribute. */
- FILE_$Boot = 7, /* Boot sector (always at cluster 0) in data
- attribute. */
- FILE_$BadClus = 8, /* Contains all bad clusters in the non-resident
- data attribute. */
- FILE_$Secure = 9, /* Shared security descriptors in data attribute
- and two indexes into the descriptors.
- Appeared in Windows NT4 SP4 (I think). */
- FILE_$UpCase = 10, /* Uppercase equivalents of all 65536 Unicode
- characters in data attribute. */
- FILE_$Extend = 11, /* Directory containing other system files (eg.
- $ObjId, $Quota, $Reparse and $UsnJrnl). This
- is new to NTFS3.0. */
- FILE_reserved12 = 12, /* Reserved for future use (records 12-15). */
- FILE_reserved13 = 13,
- FILE_reserved14 = 14,
- FILE_reserved15 = 15,
- FILE_first_user = 16, /* First user file, used as test limit for
- whether to allow opening a file or not. */
-} NTFS_SYSTEM_FILES;
-
-
-/*
- * These are the so far known MFT_RECORD_* flags (16-bit) which contain
- * information about the mft record in which they are present.
- */
-typedef enum {
- MFT_RECORD_IN_USE = cpu_to_le16(0x0001),
- MFT_RECORD_IS_DIRECTORY = cpu_to_le16(0x0002),
- MFT_REC_SPACE_FILLER = 0xffff /* Just to make flags 16-bit. */
-} __attribute__ ((__packed__)) MFT_RECORD_FLAGS;
-
-/*
- * mft references (aka file references or file record segment references) are
- * used whenever a structure needs to refer to a record in the mft.
- *
- * A reference consists of a 48-bit index into the mft and a 16-bit sequence
- * number used to detect stale references.
- *
- * The sequence number is a circular counter (skipping 0) describing how many
- * times the referenced mft record has been (re)used. This has to match the
- * sequence number of the mft record being referenced, otherwise the reference
- * is considered stale and removed (FIXME: only ntfsck or the driver itself?).
- *
- * If the sequence number is zero it is assumed that no sequence number
- * consistency checking should be performed.
- *
- * FIXME: Since inodes are 32-bit as of now, the driver needs to always check
- * for high_part being 0 and if not either BUG(), cause a panic() or handle
- * the situation in some other way. This shouldn't be a problem as a volume has
- * to become HUGE in order to need more than 32-bits worth of mft records.
- * Assuming the standard mft record size of 1kb only the records (never mind
- * the non-resident attributes, etc.) would require 4Tb of space on their own
- * for the first 32 bits worth of records. This is only if some strange person
- * doesn't decide to foul play and make the mft sparse which would be a really
- * horrible thing to do as it would trash our current driver implementation. )-:
- * Do I hear screams "we want 64-bit inodes!" ?!? (-;
- *
- * FIXME: The mft zone is defined as the first 12% of the volume. This space is
- * reserved so that the mft can grow contiguously and hence doesn't become
- * fragmented. Volume free space includes the empty part of the mft zone and
- * when the volume's free 88% are used up, the mft zone is shrunk by a factor
- * of 2, thus making more space available for more files/data. This process is
- * repeated everytime there is no more free space except for the mft zone until
- * there really is no more free space.
- */
-typedef union {
- /* We have a union so that we can either use the reference as one
- 64-bit number or as the individual parts (i.e. the mft index and the
- sequence number) broken up using a structure. Since there is no
- 48-bit data type we need to use another struct dividing the mft
- index into the low 32-bits and the high 16-bits. */
- struct {
- struct {
- __u32 low_part; /* Low 32-bits of mft index. */
- __u16 high_part; /* High 16-bits of mft index. */
- } __attribute__ ((__packed__));
- __u16 sequence_number; /* 16-bit sequence number. */
- } __attribute__ ((__packed__));
- __u64 full_ref; /* Mft reference as one value.*/
- __u64; /* Unnamed reference as one
- value. */
-} __attribute__ ((__packed__)) MFT_REFERENCE;
-
-typedef enum {
- MFT_REFERENCE_MASK_CPU = 0x0000ffffffffffffULL,
- MFT_REFERENCE_MASK_LE = cpu_to_le64(0x0000ffffffffffffULL),
-} MFT_REFERENCE_CONSTS;
-
-/*
- * 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 $END which is a truncated attribute
- * in that it only consists of the attribute type code $END and none of the
- * other members of the attribute structure are present.
- */
-typedef struct {
-/*Ofs*/
-/* 0*/ NTFS_RECORD; /* Usually the magic is "FILE". */
-/* 8*/ __s64 lsn; /* $LogFile sequence number for this record.
- Changed every time the record is modified. */
-/* 16*/ __u16 sequence_number; /* Number of times this mft record has been
- reused. (See description for MFT_REFERENCE
- above.) NOTE: The increment (skipping zero)
- is done when the file is deleted. NOTE: If
- this is zero it is left zero. */
-/* 18*/ __u16 link_count; /* Number of hard links, i.e. the number of
- directory entries referencing this record.
- NOTE: Only used in mft base records.
- NOTE: When deleting a directory entry we
- check the link_count and if it is 1 we
- delete the file. Otherwise we delete the
- FILENAME_ATTR being referenced by the
- directory entry from the mft record and
- decrement the link_count.
- FIXME: Careful with Win32 + DOS names! */
-/* 20*/ __u16 attrs_offset; /* Byte offset to the first attribute in this
- mft record from the start of the mft record.
- NOTE: Must be aligned to 8-byte boundary. */
-/* 22*/ MFT_RECORD_FLAGS flags; /* Bit array of MFT_RECORD_FLAGS. When a file
- is deleted, the MFT_RECORD_IN_USE flag is
- set to zero. */
-/* 24*/ __u32 bytes_in_use; /* Number of bytes used in this mft record.
- NOTE: Must be aligned to 8-byte boundary. */
-/* 28*/ __u32 bytes_allocated; /* Number of bytes allocated for this mft
- record. This should be equal to the mft
- record size. */
-/* 32*/ MFT_REFERENCE base_mft_record; /* This is zero for base mft records.
- When it is not zero it is a mft reference
- pointing to the base mft record to which
- this record belongs (this is then used to
- locate the attribute list attribute present
- in the base record which describes this
- extension record and hence might need
- modification when the extension record
- itself is modified, also locating the
- attribute list also means finding the other
- potential extents, belonging to the non-base
- mft record). */
-/* 40*/ __u16 next_attr_instance; /* The instance number that will be
- assigned to the next attribute added to this
- mft record. NOTE: Incremented each time
- after it is used. NOTE: Every time the mft
- record is reused this number is set to zero.
- NOTE: The first instance number is always 0.
- */
-/* 42 = sizeof() */
-/*
- * When (re)using the mft record, we place the update sequence array at this
- * offset, i.e. before we start with the attributes. This also makes sense,
- * otherwise we could run into problems with the update sequence array
- * containing in itself the last two bytes of a sector which would mean that
- * multi sector transfer protection wouldn't work. As you can't protect data
- * by overwriting it since you then can't get it back...
- * When reading we obviously use the data from the ntfs record header.
- */
-} __attribute__ ((__packed__)) MFT_RECORD;
-
/**
* get_mft_record_data_size - return number of bytes used in mft record @b
@@ -239,142 +48,6 @@
* wouldn't view this as corruption in itself though!).
*/
-inline __u32 get_mft_record_data_size(const MFT_RECORD *b);
+extern __inline__ __u32 get_mft_record_data_size(const MFT_RECORD *b);
-/*
- * Implementation of files (aka mft records, aka inodes) in memory.
- * ================================================================
- *
- * NOTE: I have completely ignored the existence of things like directories
- * and directory references for the moment! These will just be added later on.
- * The directories themselves are of course covered by being base mft records
- * and hence follow the same semantics like every other mft record.
- *
- * Volume struct (typedef is in volume.h).
- * ---------------------------------------
- *
- * open_files: Linked list of ntfs_file struct pointers, keeping track
- * of all files which have been loaded into memory and are
- * open.
- *
- * nr_open_files: Number of open files.
- *
- * closed_files: Linked list of ntfs_file struct pointers, keeping track
- * of all cached files which are not open any more.
- *
- * nr_closed_files: Number of closed files.
- *
- * max_files: Maximum number of nr_open_files + nr_closed_files.
- *
- * As files are opened/closed, records move from one list to the other. When a
- * file is opened it moves to the front of files_open as we expect to do I/O on
- * it very soon so want quick access to it. When a file is closed, it moves to
- * the end of files_closed as we don't expect it to be opened any time soon.
- *
- * Note: We probably want to replace these with hash tables once the library
- * matures and users start complaining about the speed of it... but this will
- * do for now.
- *
- * mft_entries: Linked list of all loaded mft records (disk inodes) in
- * order of ascending mft record number (disk inode number,
- * i.e. disregarding the sequence number). Note, the list
- * members are not the actual MFT_RECORDS, but in memory
- * mft_entry structs.
- *
- * nr_mft_entries: Number of mft_entries.
- *
- * dirty_mft_entries: Linked list of all loaded mft records which are dirty.
- * Used by the disk writer thread. When a mft_entry is
- * marked dirty, the entry is added to the end of this
- * list. When it is flushed to disk, it is marked clean
- * and removed from this list.
- *
- * nr_dirty_mft_entries: Number of dirty mft_entries.
- *
- *
- * The mft_entry struct.
- * ---------------------
- *
- * Each loaded mft record is represented by the mft_entry structure which
- * contains these members:
- *
- * m_rec: Pointer to the actual MFT_RECORD. (Only valid if mapped flag is
- * set.)
- *
- * m_flags: Atomic flags describing the mft entry / record:
- *
- * mapped: Is the MFT_RECORD actually in memory? (Is mrec valid?)
- *
- * dirty: Does the record need to be written to disk? (If not, it is safe
- * to discard m_rec, but only if m_count is zero and we are
- * holding m_rec_lock for writing.)
- *
- * error: When reading the entry from disk it was detected that it is
- * corrupt. For example, it could be that a multi sector transfer
- * error was detected.
- *
- * m_ref: Mft reference of the mft record described by this entry. (This
- * includes the sequence number for consistency checking purposes.)
- *
- * m_count: Usage count. When zero this record is not referenced by
- * any files and can be thrown away safely (writing it to disk
- * first if dirty flag is set).
- *
- * m_list: Anchor for the mft_entries linked list.
- *
- * m_dirty_list: Anchor for the dirty_mft_enties linked list. (Only valid if
- * the dirty flag is set.)
- *
- * m_vol: Volume this entry and its mft record belong to.
- *
- * m_file: Ntfs file this mft entry belongs to.
- *
- * Future:
- *
- * - Reference all loaded non-resident attributes somehow. Need this for the
- * search context work and we do need to keep them so we can have two
- * readers at the same time. So we need to somehow specify which attribute
- * we are talking about, possibly which mft record it is in (+ position
- * in attribute list?) and a pointer to the attribute value itself.
- *
- * The ntfs_file struct (file = base mft record).
- * ----------------------------------------------
- *
- * Each loaded file is described by an ntfs_file struct, which contains these
- * members:
- *
- * m_refs: The mft references of the file (i.e. the on disk inode number).
- * This is an array of MFT_REFERENCEs. The first reference is the
- * base mft record and if any others exist they are the associated
- * loaded extension mft records. Used for attribute list purposes.
- *
- * m_entries: The loaded mft records for the file. This is an array of
- * pointers to mft_entries, corresponding to the m_refs. This
- * is not strictly necessary but results in a big speed up as we
- * don't need to search the vol->mft_entries list every time...
- *
- * When an entry is referenced in the above lists the usage count for the
- * corresponding entry is increased by one.
- *
- * nr_mft_refs: Number of records in the m_* arrays. If > 1, we
- * know there must be an attribute list attribute (but if 1, we
- * cannot assume there isn't one). This is of course the same as
- * a possible nr_m_entries, but refs is shorter to write. (-;
- *
- * f_count: Usage count. When zero this file is not open by anyone
- * and can be thrown away safely. No need to concern oneself with
- * dirty state as this is done on a mft_entry level, i.e. one level
- * below the idea of files.
- *
- * f_list: Anchor into vol->open/closed_files list. If f_count is > 0,
- * into open_files list, otherwise into closed_files list.
- *
- * Notes:
- *
- * - No field to know whether we have the file open for writing as this is
- * provided on a mft_entry level, i.e. below the files/directories level.
- * This might turn out to be a mistake and is subject to change in the
- * future if the current approach turns out not to work...
- */
-
/* Mft entry flag bit values */
#define ME_mapped 0
@@ -395,28 +68,4 @@
#define ClearMftEntryError(me) clear_bit(ME_error, &(me)->m_flags)
-struct _ntfs_file;
-
-typedef struct {
- MFT_RECORD *m_rec;
- unsigned int m_flags;
- MFT_REFERENCE m_ref;
- unsigned int m_count;
- struct _ntfs_file *m_file;
- struct list_head m_list;
- struct list_head m_dirty_list;
- struct _ntfs_volume *m_vol;
-} mft_entry;
-
-struct {
- MFT_REFERENCE *m_refs;
- mft_entry *m_entries;
- int nr_m_refs;
- int f_count;
- struct list_head f_list;
- struct _ntfs_volume *f_vol;
-} _ntfs_file;
-
-typedef struct _ntfs_file ntfs_file;
-
/**
* flush_mft_entry - flush a mft_entry to disk
@@ -585,5 +234,5 @@
* others Values returned by flush_mft_entry.
*/
-int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REFERENCE mref,
+int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REF mref,
const MFT_RECORD *mrec, const BOOL dirty,
const ntfs_file *f);
@@ -687,5 +336,5 @@
* pointer as a parameter.
*/
-ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REFERENCE mref);
+ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REF mref);
/**
Index: ntfs_rec.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfs_rec.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- ntfs_rec.h 2001/04/08 03:02:55 1.5
+++ ntfs_rec.h 2001/04/11 11:49:16 1.6
@@ -28,71 +28,4 @@
#include "endians.h"
-/*
- * Magic identifiers present at the beginning of all ntfs record containing
- * records (like mft records for example).
- */
-typedef enum {
- magic_BAAD = cpu_to_le32(0x44414142), /* "BAAD" == corrupt record */
- magic_CHKD = cpu_to_le32(0x424b4843), /* "CHKD" == chkdsk ??? */
- magic_FILE = cpu_to_le32(0x454c4946), /* "FILE" == mft entry */
- magic_HOLE = cpu_to_le32(0x454c4f48), /* "HOLE" == ??? (NTFS 3.0+?) */
- magic_INDX = cpu_to_le32(0x58444e49), /* "INDX" == index buffer */
-} NTFS_RECORD_TYPES;
-
-/*
- * Generic magic comparison macros. Finally found a use for the ## preprocessor
- * operator! (-8
- */
-#define is_magic(x, m) ( (__u32)(x) == magic_##m )
-#define is_magicp(p, m) ( *(__u32*)(p) == magic_##m )
-
-/*
- * Specialised magic comparison macros.
- */
-#define is_baad_record(x) ( is_magic (x, BAAD) )
-#define is_baad_recordp(p) ( is_magicp(p, BAAD) )
-#define is_chkd_record(x) ( is_magic (x, CHKD) )
-#define is_chkd_recordp(p) ( is_magicp(p, CHKD) )
-#define is_file_record(x) ( is_magic (x, FILE) )
-#define is_file_recordp(p) ( is_magicp(p, FILE) )
-#define is_hole_record(x) ( is_magic (x, HOLE) )
-#define is_hole_recordp(p) ( is_magicp(p, HOLE) )
-#define is_indx_record(x) ( is_magic (x, INDX) )
-#define is_indx_recordp(p) ( is_magicp(p, INDX) )
-
-/*
- * Defines for the NTFS filesystem. Don't want to use BLOCK_SIZE and
- * BLOCK_SIZE_BITS from the kernel as that is 1024 and hence too high for us.
- */
-#define NTFS_SECTOR_SIZE 512
-#define NTFS_SECTOR_SIZE_BITS 9
-
-/*
- * 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
- * Number (usn), a cyclic counter of how many times the protected record has
- * been written to disk. The values 0 and -1 (ie. 0xffff) are not used. All
- * last __u16's of each sector have to be equal to the usn (during reading) or
- * are set to it (during writing). If they are not, an incomplete multi sector
- * transfer has occured when the data was written.
- * The maximum size for the update sequence array is fixed to:
- * maximum size = usa_ofs + (usa_count * 2) = 510 bytes
- * The 510 bytes comes from the fact that the last __u16 in the array has to
- * (obviously) finish before the last __u16 of the first 512-byte sector.
- * This formula can be used as a consistency check in that usa_ofs +
- * (usa_count * 2) has to be less than or equal to 510.
- */
-typedef struct {
- NTFS_RECORD_TYPES magic; /* A four-byte magic identifying the
- record type and/or status. */
- __u16 usa_ofs; /* Offset to the Update Sequence Array (usa)
- from the start of the ntfs record. */
- __u16 usa_count; /* Number of __u16 sized entries in the usa
- including the Update Sequence Number (usn),
- thus the number of fixups is the usa_count
- minus 1. */
-} __attribute__ ((__packed__)) NTFS_RECORD;
-
/**
* __post_read_mst_fixup - fast deprotect multi sector transfer protected data
Index: ntfsd.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfsd.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- ntfsd.h 2001/04/10 23:37:19 1.7
+++ ntfsd.h 2001/04/11 11:49:16 1.8
@@ -25,8 +25,5 @@
#define NTFSD_H
-#include <linux/bitops.h>
-
#include "list.h"
-#include "volume.h"
#include "support.h"
Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/unistr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- unistr.h 2001/04/08 03:02:55 1.4
+++ unistr.h 2001/04/11 11:49:16 1.5
@@ -31,5 +31,6 @@
*/
/* #include <linux/nls.h> */
-#include <stdio.h>
+//#include <stdio.h>
+#include <linux/types.h>
#include "endians.h"
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- volume.h 2001/04/10 23:37:19 1.12
+++ volume.h 2001/04/11 11:49:16 1.13
@@ -28,93 +28,6 @@
#include "list.h"
-#include "attrib.h"
#include "support.h"
-
-/*
- * FIXME: Do we really want to return a pointer to the actual volume structure
- * to the user to play with? It would be better to completely abstract the
- * structure and provide functions for accessing the public members instead.
- * In that case we would return a volume descriptor to the caller.
- *
- * DECISION: Return the actual structure. In the second release, once
- * everything is working, we still have the option of abstracting the volume
- * strcture data type.
- */
-/*
- * FIXME: For RAID stuff will need the fd and dev_name variables to be arrays
- * or lists or something... Also will need to know the number of sectors (and
- * sector size if not 512) of each device making up the RAID array. Obviously,
- * will need RAID information as well like which RAID is used together with
- * state information, etc. But that is the far future.
- */
-
-/* The ntfs volume structure describing an open volume. */
-struct {
- int fd; /* File descriptor associated with volume. */
- char *dev_name; /* Name of the device/file the volume is in. */
- char *vol_name; /* Name of the volume from the volume name
- attribute. */
- /* Version nos. and flags are from the volume information attribute. */
- __u8 major_ver; /* Ntfs major version of volume. */
- __u8 minor_ver; /* Ntfs minor version of volume. */
- __u16 flags; /* Bit array of VOLUME_* flags. */
- __s64 number_of_clusters;/* Volume size in clusters, hence also the
- number of bits in lcn_bitmap. */
- __u32 cluster_size; /* Byte size of a cluster. */
- __u32 mft_record_size; /* Byte size of a mft record. */
- __s64 mft_lcn; /* Logical cluster number of the data attribute
- for FILE_$Mft. */
- __s64 mftmirr_lcn; /* Logical cluster number of the data attribute
- for FILE_$MftMirr. */
- __u8 cluster_size_bits; /* Log(2) of the byte size of a cluster. */
- __u8 mft_record_size_bits;/* Log(2) of the byte size of a mft record. */
- __u8 *lcn_bitmap; /* Value of data attribute of FILE_$Bitmap. Each
- bit represents a cluster on the volume, bit 0
- representing lcn 0 and so on. A set bit means
- that the cluster is in use and a zero bit
- means the cluster is free. */
- __u8 *mft_bitmap; /* Value of bitmap attribute of FILE_$Mft. Has
- same interpretation as the lcn_bitmap above
- but except that it keeps track of the usage
- of the mft records rather than the lcns. */
- run_list mft_runlist; /* Decompressed run list of the data attribute
- of FILE_$Mft. */
- __s64 number_of_mft_records; /* Number of records in the mft, equals
- the number of bits in mft_bitmap. */
- wchar_t *upcase; /* Upper case equivalents of all 65536
- 2-byte Unicode characters. Obtained
- from FILE_$UpCase. */
- __u32 upcase_len; /* Length in Unicode characters of the
- upcase table. */
- __u8 mft_records_per_cluster; /* The number of mft records that fit
- into one cluster or 0 if clusters
- are smaller than mft records. */
- __u8 clusters_per_mft_record; /* The size of a mft record in clusters
- or 0 if a mft record is smaller than
- a cluster. */
- struct list_head open_files; /* Linked list of ntfs_file struct
- pointers, keeping track of all files
- which have been loaded into memory
- and are open. */
- int nr_open_files; /* Number of open files. */
- struct list_head closed_files; /* Linked list of ntfs_file struct
- pointers, keeping track of all cached
- files which are not open any more. */ int nr_closed_files; /* Number of closed files. */
- int max_files; /* Maximum number of nr_open_files + nr_ closed_files. */
- struct list_head mft_entries; /* Linked list of all loaded mft records
- (disk inodes) in order of ascending
- mft record number (disk inode number,
- disregarding the sequence number).
- Note, the list members are mft_entry
- struct pointers. */
- int nr_mft_entries; /* Number of mft_entries. */
- struct list_head dirty_mft_entries; /* Linked list of all loaded mft
- records which are dirty. */
- int nr_dirty_mft_entries; /* Number of dirty mft_entries. */
- struct list_head v_list; /* Anchor for list of all mounted
- volumes. */
-} _ntfs_volume;
-
-typedef struct _ntfs_volume ntfs_volume;
+#include "types.h"
/**
|
|
From: Anton A. <an...@us...> - 2001-04-11 11:49:20
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv6438/libntfs
Modified Files:
attrib.c disk_io.c mft.c ntfs_rec.c volume.c
Log Message:
Header file reorganisation so that it compiles.
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- attrib.c 2001/04/08 03:02:55 1.11
+++ attrib.c 2001/04/11 11:49:16 1.12
@@ -29,10 +29,10 @@
#include <stdlib.h>
-#include "volume.h"
#include "attrib.h"
-#include "mft.h"
+#include "layout.h"
+#include "types.h"
+#include "unistr.h"
#include "endians.h"
#include "disk_io.h"
-#include "unistr.h"
#include "support.h"
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- disk_io.c 2001/04/08 03:02:55 1.10
+++ disk_io.c 2001/04/11 11:49:16 1.11
@@ -29,8 +29,7 @@
#include <stdio.h>
-#include "ntfs_rec.h"
-#include "attrib.h"
-#include "bitmap.h"
-#include "volume.h"
+#include "layout.h"
+#include "types.h"
+#include "disk_io.h"
__u64 ntfs_pwrite(int fd, const void *b, __u64 count, const __u64 pos)
@@ -280,5 +279,5 @@
*/
int get_mft_records(const ntfs_volume *vol, MFT_RECORD *mrec,
- const MFT_REFERENCE *mref, const int count)
+ const MFT_REF *mref, const int count)
{
__u64 br, ofs;
@@ -290,5 +289,5 @@
if (!vol->fd)
return -EBADF;
- m = *(__u64*)mref & MFT_REFERENCE_MASK_CPU;
+ m = MREF(*mref);
if (vol->number_of_mft_records < m + count)
return -ESPIPE;
@@ -349,5 +348,5 @@
*/
__inline__ int get_mft_record(const ntfs_volume *vol, MFT_RECORD *mrec,
- const MFT_REFERENCE *mref)
+ const MFT_REF *mref)
{
return get_mft_records(vol, mrec, mref, 1);
@@ -367,5 +366,5 @@
*
* The read mft record is checked for having the magic FILE, for being in use,
- * and for having a matching sequence number (if @mref->sequence_number != 0).
+ * and for having a matching sequence number (if MSEQNO(*@mref) != 0).
* If either of these fails, return -EIO.
*
@@ -374,5 +373,5 @@
* Note: Caller has to free *@mrec when finished.
*/
-int read_file_record(const ntfs_volume *vol, const MFT_REFERENCE *mref,
+int read_file_record(const ntfs_volume *vol, const MFT_REF *mref,
MFT_RECORD **mrec, ATTR_RECORD **attr)
{
@@ -393,6 +392,5 @@
if (!is_file_record(m->magic))
goto file_corrupt;
- if (mref->sequence_number &&
- mref->sequence_number != le16_to_cpu(m->sequence_number))
+ if (MSEQNO(mref) && MSEQNO(mref) != le16_to_cpu(m->sequence_number))
goto file_corrupt;
if (!(m->flags & MFT_RECORD_IN_USE))
@@ -415,5 +413,5 @@
}
-int put_mft_record(ntfs_volume *vol, const __u8 *buf, const MFT_REFERENCE *mref)
+int put_mft_record(ntfs_volume *vol, const __u8 *buf, const MFT_REF *mref)
{
__u64 bw, m;
@@ -424,5 +422,5 @@
if (!vol->fd)
return -EBADF;
- m = *(__u64*)mref & MFT_REFERENCE_MASK_CPU;
+ m = MREF(*mref);
if (vol->number_of_mft_records <= m)
return -ESPIPE;
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- mft.c 2001/04/10 23:37:19 1.7
+++ mft.c 2001/04/11 11:49:16 1.8
@@ -23,9 +23,14 @@
#include <linux/types.h>
-#include <linux/list.h>
#include <linux/errno.h>
+#include <linux/bitops.h>
+#include "list.h"
#include "mft.h"
+#include "layout.h"
+#include "types.h"
#include "endians.h"
+#include "disk_io.h"
+#include "support.h"
inline __u32 get_mft_record_data_size(const MFT_RECORD *b)
@@ -37,5 +42,5 @@
}
-int flush_mft_entry(const mft_entry *me)
+int flush_mft_entry(mft_entry *me)
{
VCN mref;
@@ -44,4 +49,5 @@
MFT_RECORD *mrec;
__u32 i;
+ ntfs_volume *vol;
if (!MftEntryMapped(me))
@@ -49,5 +55,6 @@
if (MftEntryError(me))
return -EBADF;
- mref = (VCN)(*(__u64*)me->m_ref & MFT_REFERENCE_MASK_CPU);
+ mref = (VCN)MREF(me->m_ref);
+ vol = me->m_vol;
/* Size of mft record != size of cluster thus need to work with offsets
* into clusters. */
@@ -134,5 +141,5 @@
if (MftEntryMapped(me))
return 0;
- mref = (VCN)(*(__u64*)me->m_ref & MFT_REFERENCE_MASK_CPU);
+ mref = (VCN)MREF(*me->m_ref);
mrec = (MFT_RECORD*)malloc(vol->mft_record_size);
if (!mrec)
@@ -205,5 +212,5 @@
}
-int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REFERENCE mref,
+int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REF mref,
const MFT_RECORD *mrec, const BOOL dirty,
const ntfs_file *f)
@@ -226,9 +233,7 @@
list_for_each(tmp, &vol->mft_entries) {
m = list_entry(tmp, mft_entry, m_list);
- if ((__u64)m->m_ref & MFT_REFERENCE_MASK_CPU <
- (__u64)me->m_ref & MFT_REFERENCE_MASK_CPU)
+ if (MREF(m->m_ref) < MREF(me->m_ref))
continue;
- if ((__u64)m->m_ref & MFT_REFERENCE_MASK_CPU >
- (__u64)me->m_ref & MFT_REFERENCE_MASK_CPU) {
+ if (MREF(m->m_ref) > MREF(me->m_ref)) {
/* Insert the mft entry in the correct position. */
__list_add(&me->m_list, &tmp->m_list->prev,
@@ -238,7 +243,6 @@
fprintf(stderr, "Linux-NTFS: BUG! insert_mft_entry(): mft "
"entry already present in volume.\n");
- if (m->m_ref.sequence_number != me->m_ref.sequence_number &&
- m->m_ref.sequence_number != 0 &&
- me->m_ref.sequence_number != 0)
+ if (MSEQNO(m->m_ref) != MSEQNO(me->m_ref) &&
+ MSEQNO(m->m_ref) != 0 && MSEQNO(me->m_ref) != 0)
fprintf(stderr, "On top of this, the sequence numbers "
"are mismatched.\n");
@@ -310,7 +314,7 @@
return -EBUSY;
f->nr_m_refs--;
- t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REFERENCE));
+ t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REF));
if (t)
- f->m_refs = (MFT_REFERENCE*)t;
+ f->m_refs = (MFT_REF*)t;
t = realloc(f->m_entries, f->nr_m_refs * sizeof(mft_entry*));
if (t)
@@ -332,9 +336,8 @@
me->m_file = f;
for (i = 0; i < f->nr_m_refs; i++)
- if (f->m_refs[i] & MFT_REFERENCE_MASK_CPU ==
- (__u64)me->m_ref & MFT_REFERENCE_MASK_CPU)
+ if (MREF(f->m_refs[i]) == MREF(me->m_ref))
return 0;
f->nr_m_refs++;
- t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REFERENCE));
+ t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REF));
if (!t)
goto undo_add_ret;
@@ -343,5 +346,5 @@
if (!t) {
t = realloc(f->m_refs, (f->nr_m_refs - 1) *
- sizeof(MFT_REFERENCE));
+ sizeof(MFT_REF));
if (t)
f->m_refs = t;
@@ -362,5 +365,5 @@
{
int i;
- MFT_REFERENCE mref = 0ULL;
+ MFT_REF mref = 0ULL;
ntfs_file *f = me->m_file;
if (!f)
@@ -371,6 +374,5 @@
goto not_there;
for (i = 0; i < f->nr_m_refs; i++) {
- if ((__u64)me->m_ref & MFT_REFERENCE_MASK_CPU ==
- (__u64)f->m_refs[i] & MFT_REFERENCE_MASK_CPU) {
+ if (MREF(me->m_ref) == MREF(f->m_refs[i])) {
mref = f->m_refs[i];
break;
@@ -379,6 +381,6 @@
if (!(__u64)mref)
goto not_there;
- if (me->m_ref.sequence_number != mref.sequence_number &&
- me->m_ref.sequence_number != 0 && mref.sequence_number != 0)
+ if (MSEQNO(me->m_ref) != MSEQNO(mref) && MSEQNO(me->m_ref) != 0 &&
+ MSEQNO(mref) != 0)
fprintf(stderr, "Linux-NTFS: BUG() "
"__remove_mft_entry_from_file(): Sequence "
@@ -390,11 +392,11 @@
if (i < f->nr_m_refs) {
memmove(f->m_refs + i, f->m_refs + i + 1,
- (f->nr_m_refs - i) * sizeof(MFT_REFERENCE));
+ (f->nr_m_refs - i) * sizeof(MFT_REF));
memmove(f->m_entries + i, f->m_entries + i + 1,
(f->nr_m_refs - i) * sizeof(mft_entry*));
}
- t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REFERENCE));
+ t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REF));
if (t)
- f->m_refs = (MFT_REFERENCE*)t;
+ f->m_refs = (MFT_REF*)t;
t = realloc(f->m_entries, f->nr_m_refs * sizeof(mft_entry*));
if (t)
@@ -440,5 +442,5 @@
{
/* Add m to f. */
- f->m_refs = (MFT_REFERENCE*)malloc(sizeof(MFT_REFERENCE));
+ f->m_refs = (MFT_REF*)malloc(sizeof(MFT_REF));
if (!f->m_refs)
return -errno;
@@ -462,5 +464,5 @@
}
-ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REFERENCE mref)
+ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REF mref)
{
struct list_head *tmp;
@@ -471,13 +473,10 @@
list_for_each(tmp, &vol->mft_entries) {
m = list_entry(tmp, mft_entry, m_list);
- if ((__u64)m->m_ref & MFT_REFERENCE_MASK_CPU <
- (__u64)mref & MFT_REFERENCE_MASK_CPU)
+ if (MREF(m->m_ref) < MREF(mref))
continue;
- if ((__u64)m->m_ref & MFT_REFERENCE_MASK_CPU >
- (__u64)mref & MFT_REFERENCE_MASK_CPU)
+ if (MREF(m->m_ref) > MREF(mref))
break;
- if (m->m_ref.sequence_number != mref.sequence_number &&
- m->m_ref.sequence_number != 0 &&
- mref.sequence_number != 0) {
+ if (MSEQNO(m->m_ref) != MSEQNO(mref) &&
+ MSEQNO(m->m_ref) != 0 && MSEQNO(mref) != 0) {
fprintf(stderr, "Linux-NTFS: ntfs_open_by_mref(): "
"mft reference sequence numbers do "
@@ -494,6 +493,5 @@
if (f) { /* File is in cache. */
for (i = 0; i < f->nr_m_refs; i++)
- if ((__u64)f->m_refs[i] & MFT_REFERENCE_MASK_CPU ==
- (__u64)mref & MFT_REFERENCE_MASK_CPU)
+ if (MREF(f->m_refs[i]) == MREF(mref))
break;
/* Only base mft records can be opened as files. */
Index: ntfs_rec.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfs_rec.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- ntfs_rec.c 2001/04/08 03:02:55 1.5
+++ ntfs_rec.c 2001/04/11 11:49:16 1.6
@@ -25,4 +25,5 @@
#include "ntfs_rec.h"
+#include "layout.h"
#include "endians.h"
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- volume.c 2001/04/10 23:37:19 1.13
+++ volume.c 2001/04/11 11:49:16 1.14
@@ -29,13 +29,15 @@
#include <unistd.h>
#include <linux/types.h>
-#include <linux/list.h>
-#include "endians.h"
-#include "attrib.h"
+#include "list.h"
+#include "layout.h"
#include "volume.h"
+#include "types.h"
+#include "support.h"
#include "bootsect.h"
#include "disk_io.h"
+#include "endians.h"
+#include "attrib.h"
#include "mft.h"
-#include "support.h"
BOOL ntfs_sync_volume(ntfs_volume *vol)
@@ -69,5 +71,5 @@
__s8 c;
attr_search_context ctx;
- MFT_REFERENCE mref;
+ MFT_REF mref;
int err;
@@ -328,5 +330,5 @@
/* Now load the bitmap from $Bitmap. */
printf("Loading $Bitmap... ");
- mref = (MFT_REFERENCE)(__u64)FILE_$BitMap;
+ mref = (MFT_REF)FILE_$BitMap;
if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
@@ -373,5 +375,5 @@
/* Now load the upcase table from $UpCase. */
printf("Loading $UpCase... ");
- mref = (MFT_REFERENCE)(__u64)FILE_$UpCase;
+ mref = (MFT_REF)FILE_$UpCase;
if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
@@ -430,5 +432,5 @@
* vol structure accordingly. */
printf("Loading $Volume... ");
- mref = (MFT_REFERENCE)(__u64)FILE_$Volume;
+ mref = (MFT_REF)FILE_$Volume;
if (err = read_file_record(vol, &mref, &mb, NULL)) {
puts(FAILED);
|
|
From: Anton A. <an...@us...> - 2001-04-10 23:54:30
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv28106
Modified Files:
mft.h
Log Message:
Fixed somethings...
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- mft.h 2001/04/10 23:37:19 1.19
+++ mft.h 2001/04/10 23:54:25 1.20
@@ -397,5 +397,5 @@
struct _ntfs_file;
-struct {
+typedef struct {
MFT_RECORD *m_rec;
unsigned int m_flags;
@@ -406,7 +406,5 @@
struct list_head m_dirty_list;
struct _ntfs_volume *m_vol;
-} _mft_entry;
-
-typedef struct _mft_entry mft_entry;
+} mft_entry;
struct {
|
|
From: Anton A. <an...@us...> - 2001-04-10 23:43:15
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv26015
Added Files:
list.h
Log Message:
forgot list.h
--- NEW FILE ---
#ifndef LIST_H
#define LIST_H
/*
* Simple doubly linked list implementation. - Copied from Linux kernel
* 2.4.2-ac18 into Linux-NTFS.
*
* Some of the internal functions ("__xxx") are useful when
* manipulating whole lists rather than single entries, as
* sometimes we already know the next/prev entries and we can
* generate better code by using them directly rather than
* using the generic single-entry routines.
*/
struct list_head {
struct list_head *next, *prev;
};
#define LIST_HEAD_INIT(name) { &(name), &(name) }
#define LIST_HEAD(name) \
struct list_head name = LIST_HEAD_INIT(name)
#define INIT_LIST_HEAD(ptr) do { \
(ptr)->next = (ptr); (ptr)->prev = (ptr); \
} while (0)
/*
* Insert a new entry between two known consecutive entries.
*
* This is only for internal list manipulation where we know
* the prev/next entries already!
*/
static __inline__ void __list_add(struct list_head * new,
struct list_head * prev,
struct list_head * next)
{
next->prev = new;
new->next = next;
new->prev = prev;
prev->next = new;
}
/**
* list_add - add a new entry
* @new: new entry to be added
* @head: list head to add it after
*
* Insert a new entry after the specified head.
* This is good for implementing stacks.
*/
static __inline__ void list_add(struct list_head *new, struct list_head *head)
{
__list_add(new, head, head->next);
}
/**
* list_add_tail - add a new entry
* @new: new entry to be added
* @head: list head to add it before
*
* Insert a new entry before the specified head.
* This is useful for implementing queues.
*/
static __inline__ void list_add_tail(struct list_head *new, struct list_head *head)
{
__list_add(new, head->prev, head);
}
/*
* Delete a list entry by making the prev/next entries
* point to each other.
*
* This is only for internal list manipulation where we know
* the prev/next entries already!
*/
static __inline__ void __list_del(struct list_head * prev,
struct list_head * next)
{
next->prev = prev;
prev->next = next;
}
/**
* list_del - deletes entry from list.
* @entry: the element to delete from the list.
* Note: list_empty on entry does not return true after this, the entry is in an undefined state.
*/
static __inline__ void list_del(struct list_head *entry)
{
__list_del(entry->prev, entry->next);
}
/**
* list_del_init - deletes entry from list and reinitialize it.
* @entry: the element to delete from the list.
*/
static __inline__ void list_del_init(struct list_head *entry)
{
__list_del(entry->prev, entry->next);
INIT_LIST_HEAD(entry);
}
/**
* list_empty - tests whether a list is empty
* @head: the list to test.
*/
static __inline__ int list_empty(struct list_head *head)
{
return head->next == head;
}
/**
* list_splice - join two lists
* @list: the new list to add.
* @head: the place to add it in the first list.
*/
static __inline__ void list_splice(struct list_head *list, struct list_head *head)
{
struct list_head *first = list->next;
if (first != list) {
struct list_head *last = list->prev;
struct list_head *at = head->next;
first->prev = head;
head->next = first;
last->next = at;
at->prev = last;
}
}
/**
* list_entry - get the struct for this entry
* @ptr: the &struct list_head pointer.
* @type: the type of the struct this is embedded in.
* @member: the name of the list_struct within the struct.
*/
#define list_entry(ptr, type, member) \
((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
/**
* list_for_each - iterate over a list
* @pos: the &struct list_head to use as a loop counter.
* @head: the head for your list.
*/
#define list_for_each(pos, head) \
for (pos = (head)->next, prefetch(pos->next); pos != (head); \
pos = pos->next, prefetch(pos->next))
#endif
|
|
From: Anton A. <an...@us...> - 2001-04-10 23:37:22
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv24588/libntfs
Modified Files:
mft.c ntfsd.c volume.c
Log Message:
Ok, ntfsd was a mistake for userspace. It increases complexity no end while
not giving us much functionality. Lets get it working and then worry about the
kernel. - As it was the idea originally anyway, so this is just a return on the
right track. (-8
We keep the timer and signal handler but the only thing we do is to set a bool
flag (ntfs_need_sync) and we will just check this in appropriate places and
if it is true we call ntfs_sync_volumes() which sets it back to false. This
means no more locking at all of any description and no need to worry about the
signal handler interrupting things in bad ways and/or at bad times in the main
code.
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- mft.c 2001/04/09 00:05:37 1.6
+++ mft.c 2001/04/10 23:37:19 1.7
@@ -80,11 +80,6 @@
}
i = 0;
- while (!spin_trylock(&me->m_rec_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_rec_lock))
- return -EDEADLK;
i = mst_pwrite(vol->fd, me->m_rec, vol->mft_record_size,
(lcn << vol->cluster_size_bits) + ofs);
- spin_unlock(&me->m_rec_lock);
if (i != vol->mft_record_size) {
perror("Linux-NTFS: flush_mft_entry() mst_write() failed");
@@ -92,8 +87,4 @@
}
i = 0;
- while (!spin_trylock(&me->m_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_lock))
- return -EDEADLK;
if (!list_empty(&me->m_dirty_list)) {
vol->nr_dirty_mft_entries--;
@@ -101,5 +92,4 @@
}
ClearMftEntryDirty(me);
- spin_unlock(&me->m_lock);
return 0;
err_ret_errno:
@@ -110,19 +100,6 @@
{
ntfs_volume *v = me->m_vol;
- int i = 0;
- while (!spin_trylock(&me->m_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_lock))
- return FALSE;
- while (!spin_trylock(&v->dirty_mft_entries_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&v->dirty_mft_entries_lock)) {
- spin_unlock(&me->m_lock);
- return FALSE;
- }
list_add_tail(&me->m_dirty_list, &v->dirty_mft_entries);
v->nr_dirty_mft_entries++;
- spin_unlock(&v->dirty_mft_entries_lock);
- spin_unlock(&me->m_lock);
return TRUE;
}
@@ -134,7 +111,4 @@
return NULL;
memset(me, 0, sizeof(mft_entry));
- spin_lock_init(&me->m_lock);
- spin_lock_init(&me->m_rec_lock);
- &me->m_count = ATOMIC_INIT(0);
INIT_LIST_HEAD(me->m_list);
INIT_LIST_HEAD(me->m_dirty_list);
@@ -144,8 +118,6 @@
__inline__ int __free_mft_entry(mft_entry *me)
{
- if (spin_is_locked(&me->m_lock) || atomic_read(&me->count) ||
- MftEntryDirty(me) || MftEntryMapped(me)) {
+ if (me->count || MftEntryDirty(me) || MftEntryMapped(me))
return -EBUSY;
- }
free(me);
return 0;
@@ -197,12 +169,6 @@
return -ENOTSUP;
}
- i = 0;
- while (!spin_trylock(&me->m_rec_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_rec_lock))
- return -EDEADLK;
i = mst_pread(vol->fd, (__u8*)mrec, vol->mft_record_size, 1,
(lcn << vol->cluster_size_bits) + ofs);
- spin_unlock(&me->m_mrec_lock);
if (i != 1) {
SetMftEntryError(me);
@@ -211,12 +177,6 @@
return -EIO;
}
- i = 0;
- while (!spin_trylock(&me->m_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_lock))
- return -EDEADLK;
me->m_rec = mrec;
SetMftEntryMapped(me);
- spin_unlock(&me->m_lock);
return 0;
err_ret_errno:
@@ -228,5 +188,5 @@
int i;
- if (atomic_read(&me->m_count))
+ if (me->m_count)
return -EBUSY;
if (!test_and_clear_bit(ME_mapped, &me->m_flags))
@@ -234,28 +194,10 @@
if (MftEntryDirty(me) && (i = flush_mft_entry(me)))
goto err_map_ret;
- i = 0;
- while (!spin_trylock(&me->m_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_lock)) {
- i = -EDEADLK;
- goto err_map_ret;
- }
if (MftEntryDirty(me)) {
i = -EBUSY;
- goto err_unl_map_ret;
- }
- i = 0;
- while (!spin_trylock(&me->m_rec_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_rec_lock)) {
- i = -EDEADLK;
- goto err_unl_map_out;
+ goto err_map_ret;
}
free(me->m_rec);
- spin_unlock(&me->m_rec_lock);
- spin_unlock(&me->m_lock);
return 0;
-err_unl_map_ret:
- spin_unlock(&me->m_lock);
err_map_ret:
SetMftEntryMapped(me);
@@ -306,23 +248,9 @@
me->m_file = f;
if (f)
- atomic_inc(&me->m_file);
+ me->m_file++;
if (!MftEntryDirty(me))
return 0;
- i = 0;
- while (!spin_trylock(&vol->dirty_mft_entries_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&vol->dirty_mft_entries_lock))
- goto try_to_clean_ret;
- i = 0;
- while (!spin_trylock(&me->m_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_lock)) {
- spin_unlock(&vol->dirty_mft_entries_lock);
- goto try_to_clean_ret;
- }
list_add_tail(&me->m_dirty_list, &vol->dirty_mft_entries);
- spin_unlock(&me->m_lock);
vol->nr_dirty_mft_entries++;
- spin_unlock(&vol->dirty_mft_entries_lock);
return 0;
try_to_clean_ret:
@@ -333,38 +261,18 @@
{
ntfs_volume *vol = me->m_vol;
- int i, err = 0;
+ int err = 0;
if (MftEntryDirty(me))
err = flush_mft_entry(me);
- i = 0;
- while (!spin_trylock(&me->m_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_lock))
- return -EDEADLK;
- if (MftEntryDirty(me)) {
- spin_unlock(&me->m_lock);
+ if (MftEntryDirty(me))
return err < 0 ? err : -EBUSY;
- }
- if (me->m_file && (err = __remove_mft_entry_from_ntfs_file(me))) {
- spin_unlock(&me->m_lock);
+ if (me->m_file && (err = __remove_mft_entry_from_ntfs_file(me)))
return err < 0 ? err : -EBUSY;
- }
- if (atomic_read(&me->count)) {
- spin_unlock(&me->m_lock);
+ if (me->count)
return -EBUSY;
- }
- i = 0;
- while (!spin_trylock(&me->m_rec_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&me->m_rec_lock)) {
- spin_unlock(&me->m_lock);
- return -EDEADLK;
- }
free(me->m_rec);
ClearMftEntryMapped(me);
- spin_unlock(&me->m_rec_lock);
list_del(&me->m_list);
vol->nr_mft_entries--;
- spin_unlock(&me->m_lock);
free(me);
return 0;
@@ -377,5 +285,4 @@
return NULL;
memset(f, 0, sizeof(ntfs_file));
- &f->f_count = ATOMIC_INIT(0);
INIT_LIST_HEAD(f->f_list);
return f;
@@ -384,5 +291,5 @@
__inline__ int __free_ntfs_file(ntfs_file *f)
{
- if (atomic_read(&f->f_count) || f->nr_m_refs)
+ if (f->f_count || f->nr_m_refs)
return -EBUSY;
free(f);
@@ -396,5 +303,5 @@
mft_entry *m;
- if (atomic_read(&f->f_count))
+ if (f->f_count)
return - EBUSY;
for (i = f->nr_m_refs - 1; i > 0; i--) {
@@ -422,5 +329,5 @@
if (me->m_file == f)
return 0;
- atomic_inc(me->m_count);
+ me->m_count++;
me->m_file = f;
for (i = 0; i < f->nr_m_refs; i++)
@@ -447,5 +354,5 @@
undo_add_ret:
f->nr_m_refs--;
- atomic_dec(me->m_count);
+ me->m_count--;
me->m_file = NULL;
return -errno;
@@ -508,5 +415,5 @@
free(f);
finished:
- atomic_dec(&me->m_count);
+ me->m_count--;
me->m_file = NULL;
return 0;
@@ -546,7 +453,7 @@
/* Add f to m. */
m->m_file = f;
- atomic_inc(&m->m_count);
+ m->m_count++;
/* Add v to f and vice versa. */
- atomic_inc(&f->f_count);
+ f->f_count++;
f->f_vol = v;
v->nr_open_files++;
@@ -595,6 +502,6 @@
if (!f->nr_m_refs || i == f->nr_m_refs)
goto err_ret_no_entry;
- atomic_inc(&f->f_count);
- if (atomic_read(&f->f_count) > 1)
+ f->f_count++;
+ if (f->f_count > 1)
return f;
/* File wasn't open, so move it to the open list now. */
@@ -660,8 +567,7 @@
{
ntfs_volume *v;
- if (atomic_read(&f->f_count) > 0 &&
- !atomic_dec_and_test(&f->f_count))
+ if (f->f_count > 0 && --f->f_count)
return 0;
- atomic_set(&f->f_count, 0);
+ f->f_count = 0;
list_del(&f->f_list);
v = f->f_vol;
Index: ntfsd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfsd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- ntfsd.c 2001/04/07 17:29:41 1.3
+++ ntfsd.c 2001/04/10 23:37:19 1.4
@@ -22,4 +22,5 @@
*/
+#include <asm/atomic.h>
#include <sys/time.h>
#include <signal.h>
@@ -35,16 +36,15 @@
*/
LISTHEAD(ntfs_mounted_volumes);
-atomic_t nr_ntfs_mounted_volumes = 0;
-spinlock_t ntfs_mounted_volumes_lock = SPIN_LOCK_UNLOCKED;
+int nr_ntfs_mounted_volumes = 0;
+BOOL ntfs_need_sync = FALSE;
/*
- * Global flags describing ntfsd state.
+ * Keep track of how many times the timer has been starter.
*/
-int ntfsd_flags = 0;
static atomic_t ntfsd_times_started = ATOMIC_INIT(0);
/*
* We need this global to preserve the old sigalrm_action between calls to
- * ntfsd_start() and ntfsd_stop().
+ * ntfs_timer_start() and ntfs_timer_stop().
*/
static struct sigaction ntfsd_old_sigalrm_action;
@@ -55,46 +55,26 @@
"the SIGALRM signal.";
-/*
- * The ntfsd daemon / thread which syncs all volumes everytime it is called.
- * (Every 5 seconds.)
- */
-static void ntfsd_thread(int i)
+int ntfs_sync_volumes(void)
{
- int i, j, t;
+ int i = 0;
struct list_head *tmp;
ntfs_volume *vol;
-
- if (!NtfsdStarted(ntfsd_flags) ||
- test_and_set_bit(NTFSD_running, &ntfsd_flags))
- return;
- if (atomic_read(&nr_ntfs_mounted_volumes) <= 0) {
- goto unl_ret;
- i = 0;
- while (!spin_trylock(&ntfs_mounted_volumes_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&ntfs_mounted_volumes_lock))
- goto unl_ret;
+
+ ntfs_need_sync = FALSE;
+ if (!nr_ntfs_mounted_volumes)
+ return 0;
list_for_each(tmp, &ntfs_mounted_volumes) {
vol = list_entry(tmp, ntfs_volume, v_list);
- i = j = t = 0;
+ i = 0;
repeat_sync:
if (!ntfs_sync_volume(vol)) {
switch (errno) {
- case EBUSY:
- if (j++ < 100 && t++ < 1000) {
- i = 0;
- sched_yield();
- goto repeat_sync;
- }
- break;
case EINTR:
case EAGAIN:
- if (i++ < 3 && t++ < 1000) {
- j = 0;
+ if (i++ < 3)
goto repeat_sync;
- }
break;
}
- fprintf(stderr, "Linux-NTFS: ntfsd: sync_volume() "
+ fprintf(stderr, "Linux-NTFS: sync_volume() "
"failed for volume %s (%s): %s",
vol->vol_name, vol->dev_name,
@@ -102,11 +82,19 @@
}
}
- spin_unlock(&ntfs_mounted_volumes_lock);
-unl_ret:
- ClearNtfsdRunning(ntfsd_flags);
return;
}
-BOOL ntfsd_start(void)
+/*
+ * The signal handler which sets the ntfs_need_sync to true every time it is
+ * called. (Every 5 seconds. Only if it is started and there are some mounted
+ * volumes.)
+ */
+static void ntfsd_thread(int i)
+{
+ if (atomic_read(ntfsd_times_started) && nr_ntfs_mounted_volumes)
+ ntfs_need_sync = TRUE;
+}
+
+BOOL ntfs_timer_start(void)
{
int tries, err;
@@ -115,17 +103,12 @@
struct itimerval timer_val;
- if (test_and_set_bit(NTFSD_busy, &ntfsd_flags)) {
- errno = EBUSY;
- return FALSE;
- }
if (atomic_inc_and_test(&ntfsd_times_started)) {
fprinf(stderr, "Linux-NTFS: ntfsd started counter "
"would overflow. Not starting.\n");
- atomic_dec(&ntfsd_times_started);
- errno = EMFILE;
- return FALSE;
+ err = EMFILE;
+ goto ret_false;
}
- if (NtfsdStarted(ntfsd_flags))
- goto unl_ret_true;
+ if (atomic_read(&ntfsd_times_started) > 1)
+ return TRUE;
memset(&ntfsd_old_sigalrm_action, 0, sizeof(struct sigaction));
tries = 0;
@@ -151,8 +134,8 @@
err = EFAULT;
}
- goto unl_ret_false;
+ goto ret_false;
}
if (action.sa_handler == &ntfsd_thread)
- goto unl_ret_true;
+ goto set_timer_only;
memset(&action, 0, sizeof(struct sigaction));
tries = 0;
@@ -179,56 +162,45 @@
err = EFAULT;
}
- goto unl_ret_false;
+ goto ret_false;
}
+set_timer_only:
memset(&timer_val, 0, sizeof(struct itimerval));
timer_val.it_interval.tv_sec = 5;
timer_val.it_value.tv_sec = 5;
- if (setitimer(ITIMER_REAL, &timer_val, NULL)) {
- switch (errno) {
- case EINVAL:
- case EFAULT:
- fprintf(stderr, "%s %s\n", ntfsd_start_error,
- ntfsd_internal_error);
- break;
- default:
- perror(ntfsd_start_error);
- }
- err = EFAULT;
- tries = 0;
+ if (!setitimer(ITIMER_REAL, &timer_val, NULL))
+ return TRUE;
+ switch (errno) {
+ case EINVAL:
+ case EFAULT:
+ fprintf(stderr, "%s %s\n", ntfsd_start_error,
+ ntfsd_internal_error);
+ break;
+ default:
+ perror(ntfsd_start_error);
+ }
+ err = EFAULT;
+ tries = 0;
retry_reset_action:
- if (sigaction(SIGALRM, &ntfsd_old_sigalrm_action, NULL)) {
- if (errno == EINTR && tries++ < 2)
- goto retry_reset_action;
- err = ECANCELED;
- }
- goto unl_ret_false;
+ if (sigaction(SIGALRM, &ntfsd_old_sigalrm_action, NULL)) {
+ if (errno == EINTR && tries++ < 2)
+ goto retry_reset_action;
+ err = ECANCELED;
}
- SetNtfsdStarted(ntfsd_flags);
-unl_ret_true:
- ClearNtfsdBusy(ntfsd_flags);
- return TRUE;
-unl_ret_false:
+ret_false:
atomic_dec(&ntfsd_times_started);
- ClearNtfsdBusy(ntfsd_flags);
errno = err;
return FALSE;
}
-BOOL ntfsd_stop(void)
+BOOL ntfs_timer_stop(void)
{
int tries, err;
- const char *ntfsd_stop_error = "Linux-NTFS: failed to stop ntfsd.";
+ const char *ntfs_timer_stop_error = "Linux-NTFS: failed to stop timer.";
struct itimerval timer_val;
- if (test_and_set_bit(NTFSD_busy, &ntfsd_flags)) {
- errno = EBUSY;
- return FALSE;
- }
if (atomic_read(&ntfsd_times_started) > 0 &&
!atomic_dec_and_test(&ntfsd_times_started))
- goto unl_ret_true;
+ return TRUE;
atomic_set(&ntfsd_times_started, 0);
- if (!test_and_clear_bit(NTFSD_started, &ntfsd_flags))
- goto unl_ret_true;
memset(&timer_val, 0, sizeof(struct itimerval));
timer_val.it_interval.tv_sec = 0;
@@ -238,51 +210,45 @@
case EFAULT:
case EINVAL:
- fprintf(stderr, "%s %s\n", ntfsd_stop_error,
+ fprintf(stderr, "%s %s\n", ntfs_timer_stop_error,
ntfsd_internal_error);
break;
default:
- perror(ntfsd_stop_error);
+ perror(ntfs_timer_stop_error);
}
err = EFAULT;
- goto unl_ret_false;
+ atomic_inc(&ntfsd_times_started);
+ goto ret_false;
}
tries = 0;
retry_set_action:
- if (sigaction(SIGALRM, &ntfsd_old_sigalrm_action, NULL)) {
- switch (err = errno) {
- case EINTR:
- if (tries++ < 2)
- goto retry_set_action;
- perror(ntfsd_stop_error);
- break;
- case EINVAL:
- fprintf(stderr, "%s %s\n", ntfsd_stop_error,
- ntfsd_sigalrm_not_supported);
- err = ENOTSUP;
- break;
- case EFAULT:
- fprintf(stderr, "%s %s\n", ntfsd_stop_error,
- ntfsd_internal_error);
- break;
- default:
- perror(ntfsd_stop_error);
- err = EFAULT;
- }
- timer_val.it_interval.tv_sec = 5;
- timer_val.it_value.tv_sec = 5;
- if (setitimer(ITIMER_REAL, &timer_val, NULL)) {
- err = ECANCELED;
- goto unl_ret_false_stopped;
- }
+ if (!sigaction(SIGALRM, &ntfsd_old_sigalrm_action, NULL))
+ return TRUE;
+ switch (err = errno) {
+ case EINTR:
+ if (tries++ < 2)
+ goto retry_set_action;
+ perror(ntfs_timer_stop_error);
+ break;
+ case EINVAL:
+ fprintf(stderr, "%s %s\n", ntfs_timer_stop_error,
+ ntfsd_sigalrm_not_supported);
+ err = ENOTSUP;
+ break;
+ case EFAULT:
+ fprintf(stderr, "%s %s\n", ntfs_timer_stop_error,
+ ntfsd_internal_error);
+ break;
+ default:
+ perror(ntfs_timer_stop_error);
+ err = EFAULT;
+ }
+ timer_val.it_interval.tv_sec = 5;
+ timer_val.it_value.tv_sec = 5;
+ if (setitimer(ITIMER_REAL, &timer_val, NULL)) {
+ err = ECANCELED;
+ goto ret_false;
}
-unl_ret_true:
- ClearNtfsdBusy(ntfsd_flags);
- return TRUE;
-unl_ret_false:
- atomic_inc(&ntfsd_times_started);
- SetNtfsdStarted(ntfsd_flags);
-unl_ret_false_stopped:
+ret_false:
errno = err;
- ClearNtfsdBusy(ntfsd_flags);
return FALSE;
}
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- volume.c 2001/04/09 00:05:37 1.12
+++ volume.c 2001/04/10 23:37:19 1.13
@@ -45,14 +45,7 @@
i = nr_err = 0;
- while (!spin_trylock(&vol->dirty_mft_entries_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&vol->dirty_mft_entries_lock))
- errno = EBUSY;
- return FALSE;
- }
list_for_each(tmp, &vol->dirty_mft_entries)
if (flush_mft_entry(list_entry(tmp, mft_entry, m_dirty_list)))
nr_err++;
- spin_unlock(&vol->dirty_mft_entries_lock);
if (!nr_err)
return TRUE;
@@ -214,19 +207,6 @@
INIT_LIST_HEAD(vol->closed_files);
vol->max_files = 1000;
- spin_lock_init(&vol->files_lock);
INIT_LIST_HEAD(vol->mft_entries);
INIT_LIST_HEAD(vol->dirty_mft_entries);
- spin_lock_init(&vol->mft_entries_lock);
- spin_lock_init(&vol->dirty_mft_entries_lock);
- /* Note: No locking needed until we return from this function. */
- /*if (!(me = __allocate_mft_entry())) {
- int eo = errno;
- puts(FAILED);
- errno = eo;
- perror("Error allocating mft entry.");
- errno = eo;
- goto error_exit;
- }
- */
/* Start with $Mft. */
printf("Loading $Mft... ");
|
|
From: Anton A. <an...@us...> - 2001-04-10 23:37:21
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv24588/include
Modified Files:
mft.h ntfsd.h volume.h
Log Message:
Ok, ntfsd was a mistake for userspace. It increases complexity no end while
not giving us much functionality. Lets get it working and then worry about the
kernel. - As it was the idea originally anyway, so this is just a return on the
right track. (-8
We keep the timer and signal handler but the only thing we do is to set a bool
flag (ntfs_need_sync) and we will just check this in appropriate places and
if it is true we call ntfs_sync_volumes() which sets it back to false. This
means no more locking at all of any description and no need to worry about the
signal handler interrupting things in bad ways and/or at bad times in the main
code.
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- mft.h 2001/04/10 22:20:19 1.18
+++ mft.h 2001/04/10 23:37:19 1.19
@@ -25,11 +25,7 @@
#define MFT_H
-#ifndef __KERNEL__
-#define __KERNEL__
-#endif
-
-#include <linux/list.h>
#include <linux/bitops.h>
+#include "list.h"
#include "endians.h"
#include "ntfs_rec.h"
@@ -399,16 +395,20 @@
#define ClearMftEntryError(me) clear_bit(ME_error, &(me)->m_flags)
-typedef struct {
+struct _ntfs_file;
+
+struct {
MFT_RECORD *m_rec;
unsigned int m_flags;
MFT_REFERENCE m_ref;
unsigned int m_count;
- ntfs_file *m_file;
+ struct _ntfs_file *m_file;
struct list_head m_list;
struct list_head m_dirty_list;
- ntfs_volume *m_vol;
-} mft_entry;
+ struct _ntfs_volume *m_vol;
+} _mft_entry;
-typedef struct {
+typedef struct _mft_entry mft_entry;
+
+struct {
MFT_REFERENCE *m_refs;
mft_entry *m_entries;
@@ -416,6 +416,8 @@
int f_count;
struct list_head f_list;
- ntfs_volume *f_vol;
-} ntfs_file;
+ struct _ntfs_volume *f_vol;
+} _ntfs_file;
+
+typedef struct _ntfs_file ntfs_file;
/**
Index: ntfsd.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfsd.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ntfsd.h 2001/04/10 22:20:19 1.6
+++ ntfsd.h 2001/04/10 23:37:19 1.7
@@ -26,6 +26,6 @@
#include <linux/bitops.h>
-#include <linux/list.h>
+#include "list.h"
#include "volume.h"
#include "support.h"
@@ -35,5 +35,5 @@
* walk the dirty list for each mounted volume.
*/
-extern struct listhead ntfs_mounted_volumes;
+extern struct list_head ntfs_mounted_volumes;
extern int nr_ntfs_mounted_volumes;
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- volume.h 2001/04/10 22:20:19 1.11
+++ volume.h 2001/04/10 23:37:19 1.12
@@ -26,6 +26,6 @@
#include <stdio.h>
-#include <linux/list.h>
+#include "list.h"
#include "attrib.h"
#include "support.h"
@@ -50,5 +50,5 @@
/* The ntfs volume structure describing an open volume. */
-typedef struct {
+struct {
int fd; /* File descriptor associated with volume. */
char *dev_name; /* Name of the device/file the volume is in. */
@@ -114,5 +114,7 @@
struct list_head v_list; /* Anchor for list of all mounted
volumes. */
-} ntfs_volume;
+} _ntfs_volume;
+
+typedef struct _ntfs_volume ntfs_volume;
/**
|
|
From: Anton A. <an...@us...> - 2001-04-10 22:20:27
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv10543
Modified Files:
bitmap.h mft.h ntfsd.h volume.h
Log Message:
Ok, ntfsd was a mistake for userspace. It increases complexity no end while
not giving us much functionality. Lets get it working and then worry about the
kernel. - As it was the idea originally anyway, so this is just a return on the
right track. (-8
We keep the timer and signal handler but the only thing we do is to set a bool
flag (ntfs_need_sync) and we will just check this in appropriate places and
if it is true we call ntfs_sync_volumes() which sets it back to false. This
means no more locking at all of any description and no need to worry about the
signal handler interrupting things in bad ways and/or at bad times in the main
code.
Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- bitmap.h 2001/04/08 03:02:55 1.5
+++ bitmap.h 2001/04/10 22:20:19 1.6
@@ -49,5 +49,5 @@
/**
- * get_bit - get value of a bit in a field of bits
+ * ntfs_get_bit - get value of a bit in a field of bits
* @bitmap: field of bits
* @bit: bit to get
@@ -59,5 +59,5 @@
/**
- * get_and_set_bit - get value of a bit in a field of bits and set it
+ * ntfs_get_and_set_bit - get value of a bit in a field of bits and set it
* @bitmap: field of bits
* @bit: bit to get/set
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- mft.h 2001/04/09 00:05:37 1.17
+++ mft.h 2001/04/10 22:20:19 1.18
@@ -29,7 +29,6 @@
#endif
-#include <asm/atomic.h>
-#include <linux/spinlock.h>
#include <linux/list.h>
+#include <linux/bitops.h>
#include "endians.h"
@@ -296,7 +295,5 @@
* nr_dirty_mft_entries: Number of dirty mft_entries.
*
- * dirty_mft_entries_lock: Spinlock to serialize access to
- * {nr_}dirty_mft_entries.
- *
+ *
* The mft_entry struct.
* ---------------------
@@ -308,8 +305,4 @@
* set.)
*
- * m_rec_lock: Spinlock controlling access to m_rec. Only one
- * writer at a time (and no readers while one writer) as the mft
- * record will be corrupt during the write process.
- *
* m_flags: Atomic flags describing the mft entry / record:
*
@@ -327,10 +320,8 @@
* includes the sequence number for consistency checking purposes.)
*
- * m_count: Atomic usage count. When zero this record is not referenced by
+ * m_count: Usage count. When zero this record is not referenced by
* any files and can be thrown away safely (writing it to disk
* first if dirty flag is set).
*
- * m_lock: Lock controlling access to this entry.
- *
* m_list: Anchor for the mft_entries linked list.
*
@@ -349,5 +340,4 @@
* we are talking about, possibly which mft record it is in (+ position
* in attribute list?) and a pointer to the attribute value itself.
- * - Add aging for mft_entries.
*
* The ntfs_file struct (file = base mft record).
@@ -375,5 +365,5 @@
* a possible nr_m_entries, but refs is shorter to write. (-;
*
- * f_count: Atomic usage count. When zero this file is not open by anyone
+ * f_count: Usage count. When zero this file is not open by anyone
* and can be thrown away safely. No need to concern oneself with
* dirty state as this is done on a mft_entry level, i.e. one level
@@ -411,10 +401,8 @@
typedef struct {
MFT_RECORD *m_rec;
- struct spinlock_t m_rec_lock;
unsigned int m_flags;
MFT_REFERENCE m_ref;
- atomic_t m_count;
+ unsigned int m_count;
ntfs_file *m_file;
- struct spinlock_t m_lock;
struct list_head m_list;
struct list_head m_dirty_list;
@@ -426,5 +414,5 @@
mft_entry *m_entries;
int nr_m_refs;
- atomic_t f_count;
+ int f_count;
struct list_head f_list;
ntfs_volume *f_vol;
@@ -438,12 +426,7 @@
* removed from the dirty list of the volume (if it is on the list).
*
- * This function must be called with the volume's dirty_mft_entries_lock held,
- * if the entry is on the volume's mft_entries_dirty list. If it is not, the
- * lock doesn't need to be held.
- *
* Return 0 on success and -ERRNO on error. Following failure return values
* are defined:
* -EBADF Mft_entry is corrupt (error flag set).
- * -EDEADLK Couldn't acquire a necessary lock.
* -EIO Writing to disk failed.
* -ENOTSUP Tried to write to a sparse mft record. Should never
@@ -523,5 +506,4 @@
*
* Following failure return values are defined:
- * -EDEADLK Couldn't acquire a necessary lock.
* -EIO Reading from disk failed (or mst error detected). Error
* flag has been set.
@@ -548,5 +530,5 @@
static __inline__ int map_mft_entry(mft_entry *me)
{
- atomic_inc(&me->m_count);
+ me->m_count++;
if (MftEntryMapped(me))
return 0;
@@ -565,6 +547,6 @@
static __inline__ void unmap_mft_entry(mft_entry *me)
{
- if (MftEntryMapped(me) && atomic_read(&me->m_count) > 0)
- atomic_dec(&me->m_count);
+ if (MftEntryMapped(me) && me->m_count > 0)
+ me->m_count--;
}
@@ -578,5 +560,4 @@
* are returned:
* -EBUSY Use count is above zero or couldn't sync dirty entry.
- * -EDEADLK Failed to acquire a necessary lock.
* others Values returned by flush_mft_entry().
*/
@@ -600,5 +581,4 @@
* Return 0 on success and -ERRNO on error. On error, the following values are
* returned:
- * -EDEADLK Failed to acquire a necessary lock.
* -EEXIST Entry alread exists in the volume. There must be a bug
* somewhere. This should _really_ never happen.
@@ -619,5 +599,4 @@
* Return 0 on success and -ERRNO on error. The defined error codes are:
* -EBUSY The use count of the entry is above 0.
- * -EDEADLK Failed to acquire a necessary lock.
* others Values returned by flush_mft_entry.
*/
Index: ntfsd.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/ntfsd.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- ntfsd.h 2001/04/07 17:30:10 1.5
+++ ntfsd.h 2001/04/10 22:20:19 1.6
@@ -26,7 +26,5 @@
#include <linux/bitops.h>
-#include <linux/spinlock.h>
#include <linux/list.h>
-#include <asm/atomic.h>
#include "volume.h"
@@ -39,38 +37,18 @@
extern struct listhead ntfs_mounted_volumes;
extern int nr_ntfs_mounted_volumes;
-extern spinlock_t ntfs_mounted_volumes_lock;
/*
- * We use a set of atomic flags for locking / access serialization. No need of
- * any additional locking (using spinlocks/semaphores/whatever) due to
- * atomicity of operations.
+ * Set to true by the 5 second timer handler and set to false by
+ * ntfs_sync_volumes() which we call when we detect this to be true.
*/
-extern unsigned int ntfsd_flags;
+extern BOOL ntfs_need_sync;
-/* Ntfsd flags bit values */
-#define NTFSD_running 0
-#define NTFSD_busy 1
-#define NTFSD_started 2
- /* bits 3-31 reserved for future use */
-
-#define NtfsdRunning(a) test_bit(NTFSD_running, &(a))
-#define SetNtfsdRunning(a) set_bit(NTFSD_running, &(a))
-#define ClearNtfsdRunning(a) clear_bit(NTFSD_running, &(a))
-
-#define NtfsdBusy(a) test_bit(NTFSD_busy, &(a))
-#define SetNtfsdBusy(a) set_bit(NTFSD_busy, &(a))
-#define ClearNtfsdBusy(a) clear_bit(NTFSD_busy, &(a))
-
-#define NtfsdStarted(a) test_bit(NTFSD_started, &(a))
-#define SetNtfsdStarted(a) set_bit(NTFSD_started, &(a))
-#define ClearNtfsdStarted(a) clear_bit(NTFSD_started, &(a))
-
/**
- * ntfsd_start - start the writer daemon/thread
+ * ntfs_timer_start - start the 5 second timer setting ntfs_need_sync to true
*
- * Start the writer daemon / thread. Currently implemented using an interval
- * timer and a handler for the SIGALRM signal. This function can and should be
- * called whenever you mount a volume, so that we know how many times you need
- * to call ntfs_stop() before we actually stop the writer.
+ * Start the interval timer and setup a handler for the SIGALRM signal. This
+ * function can and should be called whenever volume is mounted, so that we
+ * know how many times you need to call ntfs_timer_stop() before we actually
+ * stop the timer.
*
* Return TRUE on success or FALSE on error. In the latter case, errno contains
@@ -82,43 +60,38 @@
* ntfsd will handle SIGALRM should it occur, but it won't do
* anything as it is not started.
- * EBUSY - Ntfsd is busy in a previous call to ntfsd_start/ntfsd_stop.
- * Try calling again later.
* EINTR - One of the system calls was interrupted more than three times
* in a row. You could try again.
* ENOTSUP - The host system does not support SIGALRM signal. )-:
* EFAULT - Internal error. This is BAD.
- * EMFILE - Ntfsd has been started too many times already. Cannot start
- * again before at least one ntfsd_stop() call is issued.
+ * EMFILE - Times has been started too many times already. Cannot start
+ * again before at least one ntfs_timer_stop() call is issued.
* others - Other error codes returned by one of the system calls.
*/
-BOOL ntfsd_start(void);
+BOOL ntfs_timer_start(void);
/**
- * ntfsd_stop - stop the writer daemon/thread
+ * ntfs_timer_start - stop the 5 second timer
*
- * Stop the writer daemon / thread. Currently implemented using an interval
- * timer and a handler for the SIGALRM signal. This functions should be called
- * once for every umount performed. The daemon will only be stopped if
- * ntfsd_stop() has been called the same number of times as ntfsd_start(), i.e.
- * for every call to ntfsd_start(), you need to issue a corresponding
- * ntfsd_stop().
+ * Stop the interval timer and remove the handler for the SIGALRM signal.
+ * This function should be called once for every umount performed. The daemon
+ * will only be stopped if ntfs_timer_stop() has been called the same number of
+ * times as ntfs_timer_start(), i.e. for every call to ntfs_timer_start(), you
+ * need to issue a corresponding ntfs_timer_stop().
*
* Return TRUE on success or FALSE on error. In the latter case, errno contains
* the error code.
*
- * On error, ntfsd remains active, unless errno is ECANCELED, in which case
- * ntfsd has been stopped (and the timer has been stopped, so no periodic
- * SIGALRM signals will be generated), but ntfsd is still registered as the
- * SIGALRM handler (since uninstallation failed), so the code has to remain
- * loaded in memory. In theory this will never occur but better catch the
- * impossible before practise makes the the theoretically impossible possible.
+ * On error, the handler remains active, unless errno is ECANCELED, in which
+ * case the timer has been stopped, so no periodic SIGALRM signals will be
+ * generated), but the SIGALRM handler is still registered (since
+ * uninstallation failed), so the code has to remain loaded in memory. In
+ * theory this will never occur but better catch the impossible before practise
+ * makes the the theoretically impossible possible.
*
* Important error codes:
* ECANCELED - The timer was stopped but the signal handler could not be
* reset. Tried restarting the timer but this failed. So,
- * ntfsd will handle SIGALRM should it occur, but it won't do
- * anything as it is not started any more.
- * EBUSY - Ntfsd is busy in a previous call to ntfsd_start/ntfsd_stop.
- * Try calling again later.
+ * we will handle SIGALRM should it occur, but we won't do
+ * anything as we are not started any more.
* EINTR - One of the system calls was interrupted more than three times
* in a row. You could try again.
@@ -127,5 +100,5 @@
* others - Other error codes returned by one of the system calls.
*/
-BOOL ntfsd_stop(void);
+BOOL ntfs_timer_stop(void);
#endif /* defined NTFSD_H */
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- volume.h 2001/04/09 00:05:37 1.10
+++ volume.h 2001/04/10 22:20:19 1.11
@@ -26,6 +26,4 @@
#include <stdio.h>
-#include <asm/atomic.h>
-#include <linux/spinlock.h>
#include <linux/list.h>
@@ -34,12 +32,4 @@
/*
- * FIXME: We should have a volume lock at some point (possibly a spinlock?) for
- * the volume structure also a lock for major modifications, much like the big
- * kernel lock. These two locks could be one and the same. Later on, we in
- * addition, will need finer grained locks to lock individual structures and
- * structure elements like the lcn_bitmap, mft_bitmap, etc. These locks will
- * need to protect operations like changing a directory, a mft record, etc.
- */
-/*
* FIXME: Do we really want to return a pointer to the actual volume structure
* to the user to play with? It would be better to completely abstract the
@@ -122,6 +112,4 @@
records which are dirty. */
int nr_dirty_mft_entries; /* Number of dirty mft_entries. */
- spinlock_t dirty_mft_entries_lock; /* Spinlock to serialize access to
- {nr_}dirty_mft_entries. */
struct list_head v_list; /* Anchor for list of all mounted
volumes. */
|
|
From: Anton A. <an...@us...> - 2001-04-09 00:05:40
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv4600/libntfs
Modified Files:
mft.c volume.c
Log Message:
More or less finished file handling. (Probably some useful functions are
still missing but they will be implemented as need arises.)
One thing that is stupid at the moment is we don't limit the amount of
cached mft_records so if you were to load loads the machine would eventually
run out of memory... Can't happen with files as they are limited to 1000,
unless you are short of memory. (Hard limit at the moment, set in ntfs_mount().
Maybe ntfsd should be monitoring memory usage and be throwing out unused cache
entries and closed_files? That would mean to have locking everywhere, though.)
Still missing: - Convert old code to use new stuff. - Add non-resident
attributes somewhere. Either into the mft_entry structure or into the
ntfs_file structure, but which? At the moment I tend to mft_entry so they can
be synced together with the entries by ntfsd.
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- mft.c 2001/04/08 01:58:29 1.5
+++ mft.c 2001/04/09 00:05:37 1.6
@@ -144,5 +144,5 @@
__inline__ int __free_mft_entry(mft_entry *me)
{
- if (spin_is_locked(&me->m_lock) || atomic_read(me->count) ||
+ if (spin_is_locked(&me->m_lock) || atomic_read(&me->count) ||
MftEntryDirty(me) || MftEntryMapped(me)) {
return -EBUSY;
@@ -263,6 +263,7 @@
}
-int insert_mft_entry(ntfs_volume *vol, mft_entry *me, const MFT_REFERENCE mref,
- const MFT_RECORD *mrec, const BOOL dirty)
+int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REFERENCE mref,
+ const MFT_RECORD *mrec, const BOOL dirty,
+ const ntfs_file *f)
{
struct list_head *tmp;
@@ -270,4 +271,6 @@
int i;
+ if (!*me && !__allocate_mft_entry())
+ return -errno;
*(__u64*)&me->m_ref = mref;
me->m_vol = vol;
@@ -279,9 +282,4 @@
} else
__map_mft_entry(me);
- i = 0;
- while (!spin_trylock(&vol->mft_entries_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&vol->mft_entries_lock))
- return -EDEADLK;
list_for_each(tmp, &vol->mft_entries) {
m = list_entry(tmp, mft_entry, m_list);
@@ -296,8 +294,9 @@
break;
}
- spin_unlock(&vol->mft_entries_lock);
fprintf(stderr, "Linux-NTFS: BUG! insert_mft_entry(): mft "
"entry already present in volume.\n");
- if (m->m_ref.sequence_number != me->m_ref.sequence_number)
+ if (m->m_ref.sequence_number != me->m_ref.sequence_number &&
+ m->m_ref.sequence_number != 0 &&
+ me->m_ref.sequence_number != 0)
fprintf(stderr, "On top of this, the sequence numbers "
"are mismatched.\n");
@@ -305,5 +304,7 @@
}
vol->nr_mft_entries++;
- spin_unlock(&vol->mft_entries_lock);
+ me->m_file = f;
+ if (f)
+ atomic_inc(&me->m_file);
if (!MftEntryDirty(me))
return 0;
@@ -344,6 +345,10 @@
spin_unlock(&me->m_lock);
return err < 0 ? err : -EBUSY;
+ }
+ if (me->m_file && (err = __remove_mft_entry_from_ntfs_file(me))) {
+ spin_unlock(&me->m_lock);
+ return err < 0 ? err : -EBUSY;
}
- if (atomic_read(me->count)) {
+ if (atomic_read(&me->count)) {
spin_unlock(&me->m_lock);
return -EBUSY;
@@ -356,33 +361,313 @@
return -EDEADLK;
}
- i = 0;
- while (!spin_trylock(&vol->mft_entries_lock) && i++ < 100)
- sched_yield();
- if (!spin_is_locked(&vol->mft_entries_lock)) {
- spin_unlock(&me->m_rec_lock);
- spin_unlock(&me->m_lock);
- return -EDEADLK;
- }
- list_del(&me->m_list);
- vol->nr_mft_entries--;
- spin_unlock(&vol->mft_entries_lock);
free(me->m_rec);
ClearMftEntryMapped(me);
spin_unlock(&me->m_rec_lock);
- spin_unlock(&me->m_rec);
+ list_del(&me->m_list);
+ vol->nr_mft_entries--;
+ spin_unlock(&me->m_lock);
free(me);
return 0;
}
+
+__inline__ ntfs_file *__allocate_ntfs_file(void)
+{
+ ntfs_file *f = (ntfs_file*)malloc(sizeof(ntfs_file));
+ if (!f)
+ return NULL;
+ memset(f, 0, sizeof(ntfs_file));
+ &f->f_count = ATOMIC_INIT(0);
+ INIT_LIST_HEAD(f->f_list);
+ return f;
+}
+
+__inline__ int __free_ntfs_file(ntfs_file *f)
+{
+ if (atomic_read(&f->f_count) || f->nr_m_refs)
+ return -EBUSY;
+ free(f);
+ return 0;
+}
+
+int __remove_all_extension_records_from_ntfs_file(ntfs_file *f)
+{
+ int i;
+ char *t;
+ mft_entry *m;
+
+ if (atomic_read(&f->f_count))
+ return - EBUSY;
+ for (i = f->nr_m_refs - 1; i > 0; i--) {
+ m = f->m_entries[i];
+ if (remove_mft_entry(m) && m->m_file)
+ return -EBUSY;
+ f->nr_m_refs--;
+ t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REFERENCE));
+ if (t)
+ f->m_refs = (MFT_REFERENCE*)t;
+ t = realloc(f->m_entries, f->nr_m_refs * sizeof(mft_entry*));
+ if (t)
+ f->m_entries = (mft_entry**)t;
+ }
+ return 0;
+}
-ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REFERENCE *mref)
+int __add_mtf_entry_to_ntfs_file(ntfs_file *f, mft_entry *me)
{
- errno = -ENOTSUP;
+ int i;
+ void *t;
+
+ if (!MftEntryMapped(me) && (i = __map_mft_entry(me)))
+ return i;
+ if (me->m_file == f)
+ return 0;
+ atomic_inc(me->m_count);
+ me->m_file = f;
+ for (i = 0; i < f->nr_m_refs; i++)
+ if (f->m_refs[i] & MFT_REFERENCE_MASK_CPU ==
+ (__u64)me->m_ref & MFT_REFERENCE_MASK_CPU)
+ return 0;
+ f->nr_m_refs++;
+ t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REFERENCE));
+ if (!t)
+ goto undo_add_ret;
+ f->m_refs = t;
+ t = realloc(f->m_entries, f->nr_m_refs * sizeof(mft_entry*));
+ if (!t) {
+ t = realloc(f->m_refs, (f->nr_m_refs - 1) *
+ sizeof(MFT_REFERENCE));
+ if (t)
+ f->m_refs = t;
+ goto undo_add_ret;
+ }
+ f->m_entries = t;
+ f->m_refs[f->nr_m_refs - 1] = me->m_ref;
+ f->m_entries[f->nr_m_refs - 1] = me;
+ return 0;
+undo_add_ret:
+ f->nr_m_refs--;
+ atomic_dec(me->m_count);
+ me->m_file = NULL;
+ return -errno;
+}
+
+int __remove_mft_entry_from_ntfs_file(mft_entry *me)
+{
+ int i;
+ MFT_REFERENCE mref = 0ULL;
+ ntfs_file *f = me->m_file;
+ if (!f)
+ return 0;
+ if (f->f_count)
+ return -EBUSY;
+ if (f->nr_m_refs <= 0)
+ goto not_there;
+ for (i = 0; i < f->nr_m_refs; i++) {
+ if ((__u64)me->m_ref & MFT_REFERENCE_MASK_CPU ==
+ (__u64)f->m_refs[i] & MFT_REFERENCE_MASK_CPU) {
+ mref = f->m_refs[i];
+ break;
+ }
+ }
+ if (!(__u64)mref)
+ goto not_there;
+ if (me->m_ref.sequence_number != mref.sequence_number &&
+ me->m_ref.sequence_number != 0 && mref.sequence_number != 0)
+ fprintf(stderr, "Linux-NTFS: BUG() "
+ "__remove_mft_entry_from_file(): Sequence "
+ "number mismatch. Removing anyway.\n");
+ /* Not a base record. Just take it out. */
+ if (i) {
+ void *t;
+ f->nr_m_refs--;
+ if (i < f->nr_m_refs) {
+ memmove(f->m_refs + i, f->m_refs + i + 1,
+ (f->nr_m_refs - i) * sizeof(MFT_REFERENCE));
+ memmove(f->m_entries + i, f->m_entries + i + 1,
+ (f->nr_m_refs - i) * sizeof(mft_entry*));
+ }
+ t = realloc(f->m_refs, f->nr_m_refs * sizeof(MFT_REFERENCE));
+ if (t)
+ f->m_refs = (MFT_REFERENCE*)t;
+ t = realloc(f->m_entries, f->nr_m_refs * sizeof(mft_entry*));
+ if (t)
+ f->m_entries = (mft_entry*)t;
+ goto finished;
+ }
+ /* This is the base record, we need to remove the file as well. */
+ if (f->nr_m_refs > 1) {
+ /* There are extension records, need to remove them all. */
+ if (i = __remove_all_extension_records_from_ntfs_file(f))
+ return i < 0 ? i : -EBUSY;
+ }
+ /* No extension records (left), kill the file. */
+ list_del(&f->f_list);
+ f->f_vol->nr_closed_files--;
+ free(f->m_refs)
+ free(f->m_entries);
+ free(f);
+finished:
+ atomic_dec(&me->m_count);
+ me->m_file = NULL;
+ return 0;
+not_there:
+ fprintf(stderr, "Linux-NTFS: BUG() "
+ "__remove_mft_entry_from_ntfs_file(): Mft entry "
+ "points to file, but not vice versa. Fixed.\n");
+ goto finished;
+}
+
+int remove_closed_ntfs_file(ntfs_file *f)
+{
+ mft_entry *m = f->m_entries[0];
+
+ if (__remove_all_extension_records_from_ntfs_file(f))
+ return -EBUSY;
+ /* Even on error, it is still possible the file has been killed. */
+ if (remove_mft_entry(m) && m->m_file)
+ return -EBUSY;
+ return 0;
+}
+
+int __insert_open_ntfs_file(ntfs_volume *v, ntfs_file *f, mft_entry *m)
+{
+ /* Add m to f. */
+ f->m_refs = (MFT_REFERENCE*)malloc(sizeof(MFT_REFERENCE));
+ if (!f->m_refs)
+ return -errno;
+ f->m_entries = (mft_entry**)malloc(sizeof(mft_entry*));
+ if (!f->m_entries) {
+ free(f->m_refs);
+ f->m_refs = NULL;
+ return -errno;
+ }
+ f->m_refs[0] = m->m_ref;
+ f->m_entries[0] = m;
+ /* Add f to m. */
+ m->m_file = f;
+ atomic_inc(&m->m_count);
+ /* Add v to f and vice versa. */
+ atomic_inc(&f->f_count);
+ f->f_vol = v;
+ v->nr_open_files++;
+ list_add(&f->f_list, &v->open_files);
+ return 0;
+}
+
+ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REFERENCE mref)
+{
+ struct list_head *tmp;
+ ntfs_file *f = NULL;
+ mft_entry *m, *have_m = NULL;
+ int i;
+
+ list_for_each(tmp, &vol->mft_entries) {
+ m = list_entry(tmp, mft_entry, m_list);
+ if ((__u64)m->m_ref & MFT_REFERENCE_MASK_CPU <
+ (__u64)mref & MFT_REFERENCE_MASK_CPU)
+ continue;
+ if ((__u64)m->m_ref & MFT_REFERENCE_MASK_CPU >
+ (__u64)mref & MFT_REFERENCE_MASK_CPU)
+ break;
+ if (m->m_ref.sequence_number != mref.sequence_number &&
+ m->m_ref.sequence_number != 0 &&
+ mref.sequence_number != 0) {
+ fprintf(stderr, "Linux-NTFS: ntfs_open_by_mref(): "
+ "mft reference sequence numbers do "
+ "not match.\nRefusing to open.");
+ errno = EEXIST;
+ return NULL;
+ }
+ if (m->m_file)
+ f = m->m_file;
+ else
+ have_m = m;
+ break;
+ }
+ if (f) { /* File is in cache. */
+ for (i = 0; i < f->nr_m_refs; i++)
+ if ((__u64)f->m_refs[i] & MFT_REFERENCE_MASK_CPU ==
+ (__u64)mref & MFT_REFERENCE_MASK_CPU)
+ break;
+ /* Only base mft records can be opened as files. */
+ if (i > 0)
+ goto ret_no_entry;
+ if (!f->nr_m_refs || i == f->nr_m_refs)
+ goto err_ret_no_entry;
+ atomic_inc(&f->f_count);
+ if (atomic_read(&f->f_count) > 1)
+ return f;
+ /* File wasn't open, so move it to the open list now. */
+ list_del(&f->f_list);
+ vol->nr_closed_files--;
+ list_add(&f->f_list, &vol->open_files);
+ vol->nr_open_files++;
+ return f;
+ }
+ /* File not present in cache. Read the mft record if not in cache. */
+ if (!have_m &&
+ (i = insert_mft_entry(vol, &have_m, mref, NULL, 0, NULL))) {
+ errno = -i;
+ return NULL;
+ }
+ /* Only base mft records can be opened as files. */
+ if (have_m->m_rec->base_mft_record)
+ goto ret_no_entry;
+ /*
+ * Do we need to free some closed files? FIXME: This is probably the
+ * wrong place, but it should work, so leaving it here for now. (AIA)
+ */
+ if ((vol->nr_open_files + vol->nr_closed_files) >= vol->max_files) {
+ i = 0;
+ if (vol->nr_closed_files < 10)
+ i = vol->nr_closed_files;
+ /* Too many files open! */
+ if (i <= 0) {
+ errno = EMFILE;
+ return NULL;
+ }
+ list_for_each(tmp, &vol->closed_files) {
+ if (!remove_closed_ntfs_file(list_entry(tmp, ntfs_file,
+ f_list)))
+ i--;
+ if (i <= 0)
+ break;
+ }
+ /* Didn't manage to free any files. )-: */
+ if ((vol->nr_open_files + vol->nr_closed_files) >=
+ vol->max_files) {
+ errno = EMFILE;
+ return NULL;
+ }
+ }
+ f = __allocate_ntfs_file();
+ if (!f)
+ return NULL;
+ if (!(i = __insert_open_ntfs_file(vol, f, have_m)))
+ return f; /* Done! */
+ free(f);
+ errno = -i;
return NULL;
+err_ret_no_entry:
+ fprintf(stderr, "Linux-NTFS: BUG() ntfs_open_by_mref(): file doesn't "
+ "contain the mft reference.\n");
+ret_no_entry:
+ errno = ENOENT;
+ return NULL;
}
-int ntfs_close(ntfs_file *fref)
+int ntfs_close(ntfs_file *f)
{
- errno = -ENOTSUP;
- return -1;
+ ntfs_volume *v;
+ if (atomic_read(&f->f_count) > 0 &&
+ !atomic_dec_and_test(&f->f_count))
+ return 0;
+ atomic_set(&f->f_count, 0);
+ list_del(&f->f_list);
+ v = f->f_vol;
+ v->nr_open_files--;
+ list_add(&f->f_list, &v->closed_files);
+ v->nr_closed_files++;
+ return 0;
}
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- volume.c 2001/04/08 03:02:55 1.11
+++ volume.c 2001/04/09 00:05:37 1.12
@@ -52,5 +52,6 @@
}
list_for_each(tmp, &vol->dirty_mft_entries)
- flush_mft_entry(list_entry(tmp, mft_entry, m_dirty_list));
+ if (flush_mft_entry(list_entry(tmp, mft_entry, m_dirty_list)))
+ nr_err++;
spin_unlock(&vol->dirty_mft_entries_lock);
if (!nr_err)
|
|
From: Anton A. <an...@us...> - 2001-04-09 00:05:40
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv4600/include
Modified Files:
mft.h volume.h
Log Message:
More or less finished file handling. (Probably some useful functions are
still missing but they will be implemented as need arises.)
One thing that is stupid at the moment is we don't limit the amount of
cached mft_records so if you were to load loads the machine would eventually
run out of memory... Can't happen with files as they are limited to 1000,
unless you are short of memory. (Hard limit at the moment, set in ntfs_mount().
Maybe ntfsd should be monitoring memory usage and be throwing out unused cache
entries and closed_files? That would mean to have locking everywhere, though.)
Still missing: - Convert old code to use new stuff. - Add non-resident
attributes somewhere. Either into the mft_entry structure or into the
ntfs_file structure, but which? At the moment I tend to mft_entry so they can
be synced together with the entries by ntfsd.
Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- mft.h 2001/04/08 01:58:29 1.16
+++ mft.h 2001/04/09 00:05:37 1.17
@@ -271,8 +271,4 @@
* max_files: Maximum number of nr_open_files + nr_closed_files.
*
- * files_lock: Spinlock to serialize access to the above
- * structure members (open_files, nr_open_files,
- * closed_files, nr_closed_files and max_files).
- *
* As files are opened/closed, records move from one list to the other. When a
* file is opened it moves to the front of files_open as we expect to do I/O on
@@ -292,7 +288,4 @@
* nr_mft_entries: Number of mft_entries.
*
- * mft_entries_lock: Spinlock to serialize access to
- * {nr_}mft_entries.
- *
* dirty_mft_entries: Linked list of all loaded mft records which are dirty.
* Used by the disk writer thread. When a mft_entry is
@@ -347,4 +340,6 @@
* m_vol: Volume this entry and its mft record belong to.
*
+ * m_file: Ntfs file this mft entry belongs to.
+ *
* Future:
*
@@ -362,11 +357,11 @@
* members:
*
- * f_mft_refs: The mft references of the file (i.e. the on disk inode number).
+ * m_refs: The mft references of the file (i.e. the on disk inode number).
* This is an array of MFT_REFERENCEs. The first reference is the
* base mft record and if any others exist they are the associated
* loaded extension mft records. Used for attribute list purposes.
*
- * f_mft_entries: The loaded mft records for the file. This is an array of
- * pointers to mft_entries, corresponding to the f_mft_refs. This
+ * m_entries: The loaded mft records for the file. This is an array of
+ * pointers to mft_entries, corresponding to the m_refs. This
* is not strictly necessary but results in a big speed up as we
* don't need to search the vol->mft_entries list every time...
@@ -375,12 +370,9 @@
* corresponding entry is increased by one.
*
- * f_nr_mft_refs: Number of records in the f_mft_* arrays. If > 1, we
+ * nr_mft_refs: Number of records in the m_* arrays. If > 1, we
* know there must be an attribute list attribute (but if 1, we
* cannot assume there isn't one). This is of course the same as
- * a possible f_nr_mft_entries, but refs is shorter to write. (-;
+ * a possible nr_m_entries, but refs is shorter to write. (-;
*
- * f_lock: Spinlock for serializing access to the above struct
- * members (f_mft_refs, f_mft_entries and f_nr_mft_refs).
- *
* f_count: Atomic usage count. When zero this file is not open by anyone
* and can be thrown away safely. No need to concern oneself with
@@ -388,5 +380,6 @@
* below the idea of files.
*
- * f_list: Anchor into vol->open/closed_files list.
+ * f_list: Anchor into vol->open/closed_files list. If f_count is > 0,
+ * into open_files list, otherwise into closed_files list.
*
* Notes:
@@ -422,4 +415,5 @@
MFT_REFERENCE m_ref;
atomic_t m_count;
+ ntfs_file *m_file;
struct spinlock_t m_lock;
struct list_head m_list;
@@ -429,10 +423,10 @@
typedef struct {
- MFT_REFERENCE *f_mft_refs;
- mft_entry *f_mft_entries;
- int f_nr_mft_refs;
- struct spinlock_t f_lock;
+ MFT_REFERENCE *m_refs;
+ mft_entry *m_entries;
+ int nr_m_refs;
atomic_t f_count;
struct list_head f_list;
+ ntfs_volume *f_vol;
} ntfs_file;
@@ -592,13 +586,16 @@
* insert_mft_entry - insert a mft_entry into a volume
* @vol: volume to insert into
- * @me: mft_entry to insert
- * @mref: mft reference the mft entry will have
+ * @me: mft_entry to insert (see notes)
+ * @mref: mft reference the mft_entry will have
* @mrec: loaded MFT_RECORD corresponding to @mref (optional)
* @dirty: true if @mrec is dirty, false otherwise (only if @mrec present)
+ * @f: file associated with the mft_entry (optional)
*
- * Initialize the mft_entry with the values of @mref, @mrec and @dirty and
+ * Initialize the mft_entry with the values of @mref, @f, @mrec and @dirty and
* insert it into the volume @vol. If @mrec is not present, the mft record
* corresponding to @mref is loaded from the volume.
*
+ * If *@me is NULL, a new mft_entry will be allocated and returned in *@me.
+ *
* Return 0 on success and -ERRNO on error. On error, the following values are
* returned:
@@ -608,6 +605,7 @@
* others Values returned by flush_mft_entry.
*/
-int insert_mft_entry(ntfs_volume *vol, mft_entry *me, const MFT_REFERENCE mref,
- const MFT_RECORD *mrec, const BOOL dirty);
+int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REFERENCE mref,
+ const MFT_RECORD *mrec, const BOOL dirty,
+ const ntfs_file *f);
/**
@@ -627,4 +625,71 @@
/**
+ * __allocate_ntfs_file - allocate a new ntfs_file and initialize it
+ *
+ * Return the new ntfs_file on success or NULL with errno set to the error
+ * code returned from malloc().
+ */
+extern __inline__ ntfs_file *__allocate_ntfs_file(void);
+
+/**
+ * __free_ntfs_file - free a ntfs_file
+ * @f: ntfs_file to free
+ *
+ * Return 0 on success and -EBUSY on error.
+ *
+ * To succeed, the file must have a use count of 0, as well as a nr_m_ref of
+ * zero. If any of these are false, return -EBUSY.
+ */
+extern __inline__ int __free_ntfs_file(ntfs_file *f);
+
+/**
+ * __remove_all_extension_records_from_ntfs_file - as name
+ * @f: ntfs_file on which to operate
+ *
+ * Remove all extension records from ntfs_file @f. Return 0 on success and
+ * -errno on error.
+ */
+int __remove_all_extension_records_from_ntfs_file(ntfs_file *f);
+
+/**
+ * __add_mtf_entry_to_ntfs_file - as name
+ * @f: ntfs_file to which to add the mft_entry
+ * @m: mft_entry to add
+ *
+ * Add @me to @f. Return 0 on success and -errno on error.
+ */
+int __add_mtf_entry_to_ntfs_file(ntfs_file *f, mft_entry *me);
+
+/**
+ * __remove_mft_entry_from_ntfs_file - as name
+ * @me: mft_entry to remove from its associated file
+ *
+ * Remove @me from @me->m_file. This will also remove the file if @me is the
+ * base mft record of @me->m_file. The file has to be closed for anything to
+ * happen. Return 0 on success and -errno on error.
+ */
+int __remove_mft_entry_from_ntfs_file(mft_entry *me);
+
+/**
+ * remove_closed_ntfs_file - remove closed ntfs_file from its volume
+ * @f: file to remove
+ *
+ * Remove @f from @f->f_vol. @f has to be closed. Return 0 on success and
+ * -errno on error.
+ */
+int remove_closed_ntfs_file(ntfs_file *f);
+
+/**
+ * __insert_open_ntfs_file - insert ntfs_file into volume opening it
+ * @v: volume to insert the ntfs_file into
+ * @f: ntfs_file to insert
+ * @m: base mft record to associate with the ntfs_file
+ *
+ * Adds @f to @v (as an open file) and vice versa. Same for @f and @m. Makes
+ * sure @m is mapped. Return 0 on success and -errno on error.
+ */
+int __insert_open_ntfs_file(ntfs_volume *v, ntfs_file *f, mft_entry *m);
+
+/**
* ntfs_open_by_mref - open an ntfs file (mft record), given its mft reference
* @vol: ntfs volume to operate on
@@ -634,8 +699,8 @@
* reference of the mft record (i.e. the inode number). To do this, allocate an
* ntfs_file structure (adding it to the vol->open_files array), or if the file
- * is already loaded, just find it in the vol->open_/closed_files arrays.
+ * is already loaded, just return that, incrementing the use count.
*
- * Return a pointer to the ntfs_file structure in the vol->open_files array or
- * NULL on error with errno containing the error code.
+ * Return a pointer to the ntfs_file structure or NULL on error with errno
+ * set to the appropriate error code.
*
* This pointer should be treated completely opaquely by the user! Never
@@ -643,12 +708,11 @@
* pointer as a parameter.
*/
-ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REFERENCE *mref);
+ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REFERENCE mref);
/**
* ntfs_close - close an ntfs_file
- * @vol: ntfs volume to operate on
- * @f: ntfs_file pointer to close
+ * @f: ntfs_file to close
*
- * Close a previously opened ntfs file. Return zero on success or -ERRNO on
+ * Close a previously opened ntfs file. Return zero on success or -errno on
* error.
*/
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- volume.h 2001/04/08 03:02:55 1.9
+++ volume.h 2001/04/09 00:05:37 1.10
@@ -112,8 +112,4 @@
files which are not open any more. */ int nr_closed_files; /* Number of closed files. */
int max_files; /* Maximum number of nr_open_files + nr_ closed_files. */
- spinlock_t files_lock; /* Spinlock to serialize
- access to open_files, nr_open_files,
- closed_files, nr_closed_files and
- max_files). */
struct list_head mft_entries; /* Linked list of all loaded mft records
(disk inodes) in order of ascending
@@ -123,6 +119,4 @@
struct pointers. */
int nr_mft_entries; /* Number of mft_entries. */
- spinlock_t mft_entries_lock; /* Spinlock to serialize
- access to {nr_}mft_entries. */
struct list_head dirty_mft_entries; /* Linked list of all loaded mft
records which are dirty. */
|
