LineageOS/android_external_ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merged

Browse Source 
2002/12/08 20:15:29+00:00 cantab.net!aia21
rename run{ ,_,-}list to runlist

(Logical change 1.31)
This commit is contained in:
cantab.net!aia21
2002-12-08 20:36:02 +00:00
parent bd25eebb4a
commit c4eb64a730
4 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
ntfsprogs/mkntfs.c
View File

@@ -129,8 +129,8 @@ int mft_bitmap_size, mft_bitmap_byte_size;
unsigned char *mft_bitmap = NULL; unsigned char *mft_bitmap = NULL;
int lcn_bitmap_byte_size; int lcn_bitmap_byte_size;
unsigned char *lcn_bitmap = NULL; unsigned char *lcn_bitmap = NULL;
run_list *rl = NULL, *rl_mft = NULL, *rl_mft_bmp = NULL, *rl_mftmirr = NULL; runlist *rl = NULL, *rl_mft = NULL, *rl_mft_bmp = NULL, *rl_mftmirr = NULL;
run_list *rl_logfile = NULL, *rl_boot = NULL, *rl_bad = NULL, *rl_index; runlist *rl_logfile = NULL, *rl_boot = NULL, *rl_bad = NULL, *rl_index;
INDEX_ALLOCATION *index_block = NULL; INDEX_ALLOCATION *index_block = NULL;
ntfs_volume *vol; ntfs_volume *vol;
@@ -291,7 +291,7 @@ __inline__ long long mkntfs_write(int fd, const void *buf, long long count)
} }
/* /*
* Write to disk the clusters contained in the run list @rl taking the data * Write to disk the clusters contained in the runlist @rl taking the data
* from @val. Take @val_len bytes from @val and pad the rest with zeroes. * from @val. Take @val_len bytes from @val and pad the rest with zeroes.
* *
* If the @rl specifies a completely sparse file, @val is allowed to be NULL. * If the @rl specifies a completely sparse file, @val is allowed to be NULL.
@@ -303,7 +303,7 @@ __inline__ long long mkntfs_write(int fd, const void *buf, long long count)
* Return the number of bytes written (minus padding) or -1 on error. Errno * Return the number of bytes written (minus padding) or -1 on error. Errno
* will be set to the error code. * will be set to the error code.
*/ */
s64 ntfs_rlwrite(int fd, const run_list *rl, const char *val, s64 ntfs_rlwrite(int fd, const runlist *rl, const char *val,
const s64 val_len, s64 *inited_size) const s64 val_len, s64 *inited_size)
{ {
s64 bytes_written, total, length, delta; s64 bytes_written, total, length, delta;
@@ -911,14 +911,14 @@ int resize_resident_attribute_value(MFT_RECORD *m, ATTR_RECORD *a,
return 0; return 0;
} }
void deallocate_scattered_clusters(const run_list *rl) void deallocate_scattered_clusters(const runlist *rl)
{ {
LCN j; LCN j;
int i; int i;
if (!rl) if (!rl)
return; return;
/* Iterate over all runs in the run list @rl. */ /* Iterate over all runs in the runlist @rl. */
for (i = 0; rl[i].length; i++) { for (i = 0; rl[i].length; i++) {
/* Skip sparse runs. */ /* Skip sparse runs. */
if (rl[i].lcn == -1LL) if (rl[i].lcn == -1LL)
@@ -930,9 +930,9 @@ void deallocate_scattered_clusters(const run_list *rl)
} }
/* /*
* Allocate @clusters and create a run list of the allocated clusters. * Allocate @clusters and create a runlist of the allocated clusters.
* *
* Return the allocated run list. Caller has to free the run list when finished * Return the allocated runlist. Caller has to free the runlist when finished
* with it. * with it.
* *
* On error return NULL and errno is set to the error code. * On error return NULL and errno is set to the error code.
@@ -940,9 +940,9 @@ void deallocate_scattered_clusters(const run_list *rl)
* TODO: We should be returning the size as well, but for mkntfs this is not * TODO: We should be returning the size as well, but for mkntfs this is not
* necessary. * necessary.
*/ */
run_list *allocate_scattered_clusters(s64 clusters) runlist *allocate_scattered_clusters(s64 clusters)
{ {
run_list *rl = NULL, *rlt; runlist *rl = NULL, *rlt;
VCN vcn = 0LL; VCN vcn = 0LL;
LCN lcn, end, prev_lcn = 0LL; LCN lcn, end, prev_lcn = 0LL;
int rlpos = 0; int rlpos = 0;
@@ -962,7 +962,7 @@ run_list *allocate_scattered_clusters(s64 clusters)
* Reallocate memory if necessary. Make sure we have * Reallocate memory if necessary. Make sure we have
* enough for the terminator entry as well. * enough for the terminator entry as well.
*/ */
if ((rlpos + 2) * sizeof(run_list) >= rlsize) { if ((rlpos + 2) * sizeof(runlist) >= rlsize) {
rlsize += 4096; /* PAGE_SIZE */ rlsize += 4096; /* PAGE_SIZE */
rlt = realloc(rl, rlsize); rlt = realloc(rl, rlsize);
if (!rlt) if (!rlt)
@@ -1004,7 +1004,7 @@ err_end:
rl[rlpos].length = 0LL; rl[rlpos].length = 0LL;
/* Deallocate all allocated clusters. */ /* Deallocate all allocated clusters. */
deallocate_scattered_clusters(rl); deallocate_scattered_clusters(rl);
/* Free the run list. */ /* Free the runlist. */
free(rl); free(rl);
} }
return NULL; return NULL;
@@ -1012,14 +1012,14 @@ err_end:
/* /*
* Create a non-resident attribute with a predefined on disk location * Create a non-resident attribute with a predefined on disk location
* specified by the run_list @rl. The clusters specified by @rl are assumed to * specified by the runlist @rl. The clusters specified by @rl are assumed to
* be allocated already. * be allocated already.
* *
* Return 0 on success and -errno on error. * Return 0 on success and -errno on error.
*/ */
int insert_positioned_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type, int insert_positioned_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type,
const char *name, u32 name_len, const IGNORE_CASE_BOOL ic, const char *name, u32 name_len, const IGNORE_CASE_BOOL ic,
const ATTR_FLAGS flags, const run_list *rl, const ATTR_FLAGS flags, const runlist *rl,
const char *val, const s64 val_len) const char *val, const s64 val_len)
{ {
ntfs_attr_search_ctx *ctx; ntfs_attr_search_ctx *ctx;
@@ -1124,7 +1124,7 @@ int insert_positioned_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type,
// does it fit now? yes -> do it. // does it fit now? yes -> do it.
// m is a base record? yes -> allocate extension record // m is a base record? yes -> allocate extension record
// does the new attribute fit in there? yes -> do it. // does the new attribute fit in there? yes -> do it.
// split up run_list into extents and place each in an extension // split up runlist into extents and place each in an extension
// record. // record.
// FIXME: the check for needing extension records should be // FIXME: the check for needing extension records should be
// earlier on as it is very quick: asize > m->bytes_allocated? // earlier on as it is very quick: asize > m->bytes_allocated?
@@ -1207,7 +1207,7 @@ int insert_non_resident_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type,
ATTR_RECORD *a; ATTR_RECORD *a;
u16 hdr_size; u16 hdr_size;
int asize, mpa_size, err, i; int asize, mpa_size, err, i;
run_list *rl = NULL; runlist *rl = NULL;
s64 bw = 0; s64 bw = 0;
uchar_t *uname; uchar_t *uname;
/* /*
@@ -1307,7 +1307,7 @@ int insert_non_resident_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type,
// does it fit now? yes -> do it. // does it fit now? yes -> do it.
// m is a base record? yes -> allocate extension record // m is a base record? yes -> allocate extension record
// does the new attribute fit in there? yes -> do it. // does the new attribute fit in there? yes -> do it.
// split up run_list into extents and place each in an extension // split up runlist into extents and place each in an extension
// record. // record.
// FIXME: the check for needing extension records should be // FIXME: the check for needing extension records should be
// earlier on as it is very quick: asize > m->bytes_allocated? // earlier on as it is very quick: asize > m->bytes_allocated?
@@ -1445,7 +1445,7 @@ int insert_resident_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type,
// does it fit now? yes -> do it. // does it fit now? yes -> do it.
// m is a base record? yes -> allocate extension record // m is a base record? yes -> allocate extension record
// does the new attribute fit in there? yes -> do it. // does the new attribute fit in there? yes -> do it.
// split up run_list into extents and place each in an extension // split up runlist into extents and place each in an extension
// record. // record.
// FIXME: the check for needing extension records should be // FIXME: the check for needing extension records should be
// earlier on as it is very quick: asize > m->bytes_allocated? // earlier on as it is very quick: asize > m->bytes_allocated?
@@ -1661,14 +1661,14 @@ int add_attr_data(MFT_RECORD *m, const char *name, const u32 name_len,
/* /*
* Create a non-resident data attribute with a predefined on disk location * Create a non-resident data attribute with a predefined on disk location
* specified by the run_list @rl. The clusters specified by @rl are assumed to * specified by the runlist @rl. The clusters specified by @rl are assumed to
* be allocated already. * be allocated already.
* *
* Return 0 on success or -errno on error. * Return 0 on success or -errno on error.
*/ */
int add_attr_data_positioned(MFT_RECORD *m, const char *name, int add_attr_data_positioned(MFT_RECORD *m, const char *name,
const u32 name_len, const IGNORE_CASE_BOOL ic, const u32 name_len, const IGNORE_CASE_BOOL ic,
const ATTR_FLAGS flags, const run_list *rl, const ATTR_FLAGS flags, const runlist *rl,
const char *val, const s64 val_len) const char *val, const s64 val_len)
{ {
int err; int err;
@@ -1855,14 +1855,14 @@ int add_attr_bitmap(MFT_RECORD *m, const char *name, const u32 name_len,
/* /*
* Create a non-resident bitmap attribute with a predefined on disk location * Create a non-resident bitmap attribute with a predefined on disk location
* specified by the run_list @rl. The clusters specified by @rl are assumed to * specified by the runlist @rl. The clusters specified by @rl are assumed to
* be allocated already. * be allocated already.
* *
* Return 0 on success or -errno on error. * Return 0 on success or -errno on error.
*/ */
int add_attr_bitmap_positioned(MFT_RECORD *m, const char *name, int add_attr_bitmap_positioned(MFT_RECORD *m, const char *name,
const u32 name_len, const IGNORE_CASE_BOOL ic, const u32 name_len, const IGNORE_CASE_BOOL ic,
const run_list *rl, const char *bitmap, const u32 bitmap_len) const runlist *rl, const char *bitmap, const u32 bitmap_len)
{ {
int err; int err;
@@ -2779,8 +2779,8 @@ int main(int argc, char **argv)
if (!mft_bitmap) if (!mft_bitmap)
err_exit("Failed to allocate internal buffer: %s\n", err_exit("Failed to allocate internal buffer: %s\n",
strerror(errno)); strerror(errno));
/* Create run list for mft bitmap. */ /* Create runlist for mft bitmap. */
rl_mft_bmp = (run_list *)malloc(2 * sizeof(run_list)); rl_mft_bmp = (runlist *)malloc(2 * sizeof(runlist));
if (!rl_mft_bmp) if (!rl_mft_bmp)
err_exit("Failed to allocate internal buffer: %s\n", err_exit("Failed to allocate internal buffer: %s\n",
strerror(errno)); strerror(errno));
@@ -2832,8 +2832,8 @@ int main(int argc, char **argv)
* of the device. * of the device.
*/ */
opt.mft_zone_end += opt.mft_lcn; opt.mft_zone_end += opt.mft_lcn;
/* Create run list for mft. */ /* Create runlist for mft. */
rl_mft = (run_list *)malloc(2 * sizeof(run_list)); rl_mft = (runlist *)malloc(2 * sizeof(runlist));
if (!rl_mft) if (!rl_mft)
err_exit("Failed to allocate internal buffer: %s\n", err_exit("Failed to allocate internal buffer: %s\n",
strerror(errno)); strerror(errno));
@@ -2851,8 +2851,8 @@ int main(int argc, char **argv)
opt.mftmirr_lcn = (opt.nr_sectors * opt.sector_size >> 1) opt.mftmirr_lcn = (opt.nr_sectors * opt.sector_size >> 1)
/ vol->cluster_size; / vol->cluster_size;
Dprintf("$MFTMirr logical cluster number = 0x%x\n", opt.mftmirr_lcn); Dprintf("$MFTMirr logical cluster number = 0x%x\n", opt.mftmirr_lcn);
/* Create run list for mft mirror. */ /* Create runlist for mft mirror. */
rl_mftmirr = (run_list *)malloc(2 * sizeof(run_list)); rl_mftmirr = (runlist *)malloc(2 * sizeof(runlist));
if (!rl_mftmirr) if (!rl_mftmirr)
err_exit("Failed to allocate internal buffer: %s\n", err_exit("Failed to allocate internal buffer: %s\n",
strerror(errno)); strerror(errno));
@@ -2874,8 +2874,8 @@ int main(int argc, char **argv)
ntfs_set_bit(lcn_bitmap, opt.mftmirr_lcn + i, 1); ntfs_set_bit(lcn_bitmap, opt.mftmirr_lcn + i, 1);
opt.logfile_lcn = opt.mftmirr_lcn + j; opt.logfile_lcn = opt.mftmirr_lcn + j;
Dprintf("$LogFile logical cluster number = 0x%x\n", opt.logfile_lcn); Dprintf("$LogFile logical cluster number = 0x%x\n", opt.logfile_lcn);
/* Create run list for log file. */ /* Create runlist for log file. */
rl_logfile = (run_list *)malloc(2 * sizeof(run_list)); rl_logfile = (runlist *)malloc(2 * sizeof(runlist));
if (!rl_logfile) if (!rl_logfile)
err_exit("Failed to allocate internal buffer: %s\n", err_exit("Failed to allocate internal buffer: %s\n",
strerror(errno)); strerror(errno));
@@ -2923,8 +2923,8 @@ int main(int argc, char **argv)
/* Allocate clusters for log file. */ /* Allocate clusters for log file. */
for (i = 0; i < j; i++) for (i = 0; i < j; i++)
ntfs_set_bit(lcn_bitmap, opt.logfile_lcn + i, 1); ntfs_set_bit(lcn_bitmap, opt.logfile_lcn + i, 1);
/* Create run list for $Boot. */ /* Create runlist for $Boot. */
rl_boot = (run_list *)malloc(2 * sizeof(run_list)); rl_boot = (runlist *)malloc(2 * sizeof(runlist));
if (!rl_boot) if (!rl_boot)
err_exit("Failed to allocate internal buffer: %s\n", err_exit("Failed to allocate internal buffer: %s\n",
strerror(errno)); strerror(errno));
@@ -2946,8 +2946,8 @@ int main(int argc, char **argv)
if (!buf) if (!buf)
err_exit("Failed to allocate internal buffer: %s\n", err_exit("Failed to allocate internal buffer: %s\n",
strerror(errno)); strerror(errno));
/* Create run list for $BadClus, $DATA named stream $Bad. */ /* Create runlist for $BadClus, $DATA named stream $Bad. */
rl_bad = (run_list *)malloc(2 * sizeof(run_list)); rl_bad = (runlist *)malloc(2 * sizeof(runlist));
if (!rl_bad) if (!rl_bad)
err_exit("Failed to allocate internal buffer: %s\n", err_exit("Failed to allocate internal buffer: %s\n",
strerror(errno)); strerror(errno));
@@ -2955,7 +2955,7 @@ int main(int argc, char **argv)
rl_bad[0].lcn = -1LL; rl_bad[0].lcn = -1LL;
/* /*
* $BadClus named stream $Bad contains the whole volume as a single * $BadClus named stream $Bad contains the whole volume as a single
* sparse run list entry. * sparse runlist entry.
*/ */
rl_bad[1].vcn = rl_bad[0].length = opt.nr_clusters; rl_bad[1].vcn = rl_bad[0].length = opt.nr_clusters;
rl_bad[1].lcn = -1LL; rl_bad[1].lcn = -1LL;
@@ -3452,7 +3452,7 @@ bb_err:
rl_index = ntfs_decompress_mapping_pairs(vol, a, NULL); rl_index = ntfs_decompress_mapping_pairs(vol, a, NULL);
if (!rl_index) { if (!rl_index) {
ntfs_put_attr_search_ctx(ctx); ntfs_put_attr_search_ctx(ctx);
err_exit("Failed to decompress run list of $INDEX_ALLOCATION " err_exit("Failed to decompress runlist of $INDEX_ALLOCATION "
"attribute.\n"); "attribute.\n");
} }
if (sle64_to_cpu(a->initialized_size) < i) { if (sle64_to_cpu(a->initialized_size) < i) {

12
ntfsprogs/ntfsresize.c
View File

@@ -306,7 +306,7 @@ s64 nr_clusters_to_bitmap_byte_size(s64 nr_clusters)
void build_lcn_usage_bitmap(ATTR_RECORD *a) void build_lcn_usage_bitmap(ATTR_RECORD *a)
{ {
run_list *rl; runlist *rl;
int i, j; int i, j;
if (!a->non_resident) if (!a->non_resident)
@@ -492,7 +492,7 @@ void advise_on_resize()
void look_for_bad_sector(ATTR_RECORD *a) void look_for_bad_sector(ATTR_RECORD *a)
{ {
run_list *rl; runlist *rl;
int i; int i;
rl = ntfs_decompress_mapping_pairs(vol, a, NULL); rl = ntfs_decompress_mapping_pairs(vol, a, NULL);
@@ -507,7 +507,7 @@ void look_for_bad_sector(ATTR_RECORD *a)
} }
void rl_set(run_list *rl, VCN vcn, LCN lcn, s64 len) void rl_set(runlist *rl, VCN vcn, LCN lcn, s64 len)
{ {
rl->vcn = vcn; rl->vcn = vcn;
rl->lcn = lcn; rl->lcn = lcn;
@@ -532,7 +532,7 @@ void bitmap_file_data_fixup(s64 cluster, struct bitmap *bm)
*/ */
void truncate_badclust_bad_attr(ATTR_RECORD *a, s64 nr_clusters) void truncate_badclust_bad_attr(ATTR_RECORD *a, s64 nr_clusters)
{ {
run_list *rl_bad; runlist *rl_bad;
int mp_size; int mp_size;
char *mp; char *mp;
@@ -540,7 +540,7 @@ void truncate_badclust_bad_attr(ATTR_RECORD *a, s64 nr_clusters)
/* FIXME: handle resident attribute value */ /* FIXME: handle resident attribute value */
perr_exit("Resident attribute in $BadClust not supported!"); perr_exit("Resident attribute in $BadClust not supported!");
if (!(rl_bad = (run_list *)malloc(2 * sizeof(run_list)))) if (!(rl_bad = (runlist *)malloc(2 * sizeof(runlist))))
perr_exit("Couldn't get memory"); perr_exit("Couldn't get memory");
rl_set(rl_bad, 0LL, (LCN)LCN_HOLE, nr_clusters); rl_set(rl_bad, 0LL, (LCN)LCN_HOLE, nr_clusters);
@@ -566,7 +566,7 @@ void truncate_badclust_bad_attr(ATTR_RECORD *a, s64 nr_clusters)
void truncate_bitmap_unnamed_attr(ATTR_RECORD *a, s64 nr_clusters) void truncate_bitmap_unnamed_attr(ATTR_RECORD *a, s64 nr_clusters)
{ {
run_list *rl; runlist *rl;
s64 bm_bsize, size; s64 bm_bsize, size;
s64 nr_bm_clusters; s64 nr_bm_clusters;
int i, j, mp_size; int i, j, mp_size;

30
ntfsprogs/ntfsundelete.c
View File

@@ -694,8 +694,8 @@ void free_file (struct ufile *file)
Dprintf ("freeing data stream '%s'\n", d->name ? d->name : UNNAMED); Dprintf ("freeing data stream '%s'\n", d->name ? d->name : UNNAMED);
if (d->name) if (d->name)
free (d->name); free (d->name);
if (d->run_list) if (d->runlist)
free (d->run_list); free (d->runlist);
free (d); free (d);
} }
@@ -923,8 +923,8 @@ int get_data (struct ufile *file, ntfs_volume *vol)
data->size_vcn = sle64_to_cpu (rec->highest_vcn) + 1; data->size_vcn = sle64_to_cpu (rec->highest_vcn) + 1;
} }
data->run_list = ntfs_decompress_mapping_pairs (vol, rec, NULL); data->runlist = ntfs_decompress_mapping_pairs (vol, rec, NULL);
if (!data->run_list) { if (!data->runlist) {
Dprintf ("Couldn't decompress the data runs\n"); Dprintf ("Couldn't decompress the data runs\n");
} }
@@ -1106,7 +1106,7 @@ int cluster_in_use (ntfs_volume *vol, long long lcn)
*/ */
int calc_percentage (struct ufile *file, ntfs_volume *vol) int calc_percentage (struct ufile *file, ntfs_volume *vol)
{ {
run_list_element *rl = NULL; runlist_element *rl = NULL;
struct list_head *pos; struct list_head *pos;
struct data *data; struct data *data;
long long i, j; long long i, j;
@@ -1149,14 +1149,14 @@ int calc_percentage (struct ufile *file, ntfs_volume *vol)
continue; continue;
} }
rl = data->run_list; rl = data->runlist;
if (!rl) { if (!rl) {
Vprintf ("File has no run list, hence no data.\n"); Vprintf ("File has no runlist, hence no data.\n");
continue; continue;
} }
if (rl[0].length <= 0) { if (rl[0].length <= 0) {
Vprintf ("File has an empty run list, hence no data.\n"); Vprintf ("File has an empty runlist, hence no data.\n");
continue; continue;
} }
@@ -1290,11 +1290,11 @@ void dump_record (struct ufile *file)
Iprintf ("Size vcn: %lld\n", d->size_vcn); Iprintf ("Size vcn: %lld\n", d->size_vcn);
Iprintf ("Data runs:\n"); Iprintf ("Data runs:\n");
if ((!d->run_list) || (d->run_list[0].length <= 0)) { if ((!d->runlist) || (d->runlist[0].length <= 0)) {
Iprintf (" None\n"); Iprintf (" None\n");
} else { } else {
for (i = 0; d->run_list[i].length > 0; i++) { for (i = 0; d->runlist[i].length > 0; i++) {
Iprintf (" %lld @ %lld\n", d->run_list[i].length, d->run_list[i].lcn); Iprintf (" %lld @ %lld\n", d->runlist[i].length, d->runlist[i].lcn);
} }
} }
@@ -1683,7 +1683,7 @@ int undelete_file (ntfs_volume *vol, long long inode)
struct ufile *file; struct ufile *file;
int i, j; int i, j;
long long start, end; long long start, end;
run_list_element *rl; runlist_element *rl;
struct list_head *item; struct list_head *item;
int fd = -1; int fd = -1;
long long k; long long k;
@@ -1754,14 +1754,14 @@ int undelete_file (ntfs_volume *vol, long long inode)
} }
fd = -1; fd = -1;
} else { } else {
rl = d->run_list; rl = d->runlist;
if (!rl) { if (!rl) {
Vprintf ("File has no run list, hence no data.\n"); Vprintf ("File has no runlist, hence no data.\n");
continue; continue;
} }
if (rl[0].length <= 0) { if (rl[0].length <= 0) {
Vprintf ("File has an empty run list, hence no data.\n"); Vprintf ("File has an empty runlist, hence no data.\n");
continue; continue;
} }

2
ntfsprogs/ntfsundelete.h
View File

@@ -83,7 +83,7 @@ struct data {
long long size_data; /* Actual size of data */ long long size_data; /* Actual size of data */
long long size_init; /* Initialised size, may be less than data size */ long long size_init; /* Initialised size, may be less than data size */
long long size_vcn; /* Highest VCN in the data runs */ long long size_vcn; /* Highest VCN in the data runs */
run_list_element*run_list; /* Decoded data runs */ runlist_element *runlist; /* Decoded data runs */
int percent; /* Amont potentially recoverable */ int percent; /* Amont potentially recoverable */
void *data; /* If resident, a pointer to the data */ void *data; /* If resident, a pointer to the data */
}; };