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

Hi, 

This is important. kilo-, mega- or gigabytes prefixes use decimal, not
binary units according to biggest standards (SI, ATA, IEEE, disk
manufacturers, etc). Also only [kMG] accepted and [Kmg] not anymore.
Manual updated according to this. "Side-effect" of the patch: user
can't destroy his fs if uses the same or slightly bigger decimal unit
for disk partitioning (e.g. by cfdisk or recent fdisk) as he did for
ntfsresize [used binary units before]. From now on new/old volume
sizes are printed in bytes and MB's, not in clusters and MB's.
Cheers,

Szaka

(Logical change 1.18)
edge.strict_endians
cantab.net!aia21 2002-11-24 17:52:26 +00:00
parent 51d2a5d007
commit 1cdf00a894
2 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ntfstools/ntfsresize.8.in
View File

@ -9,7 +9,7 @@ ntfsresize \- resize an NTFS filesystem
[\fB\-fhin\fR]
[\fB\-c
.I clusters\fR]
[\fB\-s \fIsize\fR[\fBK\fR|\fBM\fR|\fBG\fR]]
[\fB\-s \fIsize\fR[\fBk\fR|\fBM\fR|\fBG\fR]]
.I device
.SH DESCRIPTION
The
@ -24,9 +24,12 @@ bytes.
The
.I size
parameter may have one of the optional modifiers
\fBK\fR, \fBM\fR, \fBG\fR, which means the
\fBk\fR, \fBM\fR, \fBG\fR, which means the
.I size
parameter is given in kilo-, mega- or gigabytes respectively.
.B ntfsresize
conforms to the SI, ATA, IEEE standards and the disk manufacturers
by using k=10^3, M=10^6 and G=10^9.
.PP
The
.B ntfsresize
@ -82,12 +85,12 @@ displays what it would do if it were to resize the filesystem.
Shrink volume to size given in NTFS
.I clusters\fR.
.TP
.B -s \fIsize\fR[\fBK\fR|\fBM\fR|\fBG\fR]
Shrink volume to \fIsize\fR[\fBK\fR|\fBM\fR|\fBG\fR] bytes.
The optional modifiers \fBK\fR, \fBM\fR, \fBG\fR mean the
.B -s \fIsize\fR[\fBk\fR|\fBM\fR|\fBG\fR]
Shrink volume to \fIsize\fR[\fBk\fR|\fBM\fR|\fBG\fR] bytes.
The optional modifiers \fBk\fR, \fBM\fR, \fBG\fR mean the
.I size
parameter is given in kilo-, mega- or gigabytes respectively.
The corresponding lowercase letters are also accepted.
Conforming to standards, k=10^3, M=10^6 and G=10^9.
.SH BUGS
No bugs are known or has been reported so far in the current version.
If you find otherwise, please report it to <linux-ntfs-dev@lists.sf.net>

39
ntfstools/ntfsresize.c
View File

@ -90,6 +90,7 @@ struct progress_bar {
ntfs_volume *vol = NULL;
struct bitmap lcn_bitmap;
#define NTFS_MBYTE (1000 * 1000)
#define ERR_PREFIX "ERROR"
#define PERR_PREFIX ERR_PREFIX "(%d): "
@ -146,7 +147,7 @@ int perr_exit(const char *fmt, ...)
void usage()
{
printf("\n");
printf ("Usage: %s [-fhin] [-c clusters] [-s size[K|M|G]] device\n", EXEC_NAME);
printf ("Usage: %s [-fhin] [-c clusters] [-s size[k|M|G]] device\n", EXEC_NAME);
printf("Shrink a defragmented NTFS volume.\n");
printf("\n");
printf (" -c clusters Shrink volume to size given in NTFS clusters\n");
@ -155,7 +156,7 @@ void usage()
printf (" -h This help text\n");
printf (" -i Calculate the smallest shrunken size supported (read-only)\n");
printf (" -n Make a test run without write operations (read-only)\n");
printf (" -s size[K|M|G] Shrink volume to size[K|M|G] bytes\n");
printf (" -s size[k|M|G] Shrink volume to size[k|M|G] bytes (k=10^3, M=10^6, G=10^9)\n");
/* printf (" -v Verbose operation\n"); */
printf("%s", NTFS_REPORT_BANNER);
exit(1);
@ -195,17 +196,26 @@ s64 get_new_volume_size(char *s)
if (strlen(suffix) > 1)
usage();
/* We follow the SI prefixes:
http://physics.nist.gov/cuu/Units/prefixes.html
http://physics.nist.gov/cuu/Units/binary.html
Disk partitioning tools use prefixes as,
k M G
old fdisk 2^10 2^20 10^3*2^20
recent fdisk 10^3 10^6 10^9
cfdisk 10^3 10^6 10^9
sfdisk 2^10 2^20
parted 2^10 2^20 (may change)
fdisk (DOS) 2^10 2^20
*/
/* FIXME: check for overflow */
switch (*suffix) {
case 'G':
case 'g':
size *= 1024;
size *= 1000;
case 'M':
case 'm':
size *= 1024;
case 'K':
size *= 1000;
case 'k':
size *= 1024;
size *= 1000;
break;
default:
usage();
@ -465,7 +475,7 @@ void advise_on_resize()
printf(NERR_PREFIX "However, ");
printf("You could resize at cluster %lld gaining %lld MB.\n",
i, ((vol->nr_clusters - i) * vol->cluster_size) >> 20);
i, ((vol->nr_clusters - i) * vol->cluster_size) / NTFS_MBYTE);
exit(1);
}
@ -741,8 +751,11 @@ void update_bootsector(s64 nr_clusters)
void print_volume_size(char *str, ntfs_volume *v, s64 nr_clusters)
{
printf("%s: %lld clusters (%lld MB)\n",
str, nr_clusters, (nr_clusters * v->cluster_size) >> 20);
s64 b; /* volume size in bytes */
b = nr_clusters * v->cluster_size;
printf("%s: %lld bytes (%lld MB)\n",
str, b, rounded_up_division(b, NTFS_MBYTE));
}
@ -822,6 +835,10 @@ int main(int argc, char **argv)
mount_volume();
if (opt.size || opt.bytes) {
/* Take the integer part: when shrinking we don't want
to make the volume to be bigger than requested.
Later on we will also decrease this value to save
room for the backup boot sector */
new_volume_size = opt.bytes / vol->cluster_size;
if (opt.size)
new_volume_size = opt.size;