diff --git a/include/ntfs/volume.h b/include/ntfs/volume.h index 4bb88a90..a6948af0 100644 --- a/include/ntfs/volume.h +++ b/include/ntfs/volume.h @@ -60,6 +60,7 @@ typedef enum { NTFS_MNT_FORENSIC = 2, NTFS_MNT_CASE_SENSITIVE = 4, NTFS_MNT_NOT_EXCLUSIVE = 8, + NTFS_MNT_FORCE = 16, } ntfs_mount_flags; /** diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c index 88a12fe8..31564f6a 100644 --- a/ntfsprogs/ntfscat.c +++ b/ntfsprogs/ntfscat.c @@ -410,7 +410,8 @@ int main(int argc, char *argv[]) utils_set_locale(); - vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY | + (opts.force ? NTFS_MNT_FORCE : 0)); if (!vol) { ntfs_log_perror("ERROR: couldn't mount volume"); return 1; diff --git a/ntfsprogs/ntfscluster.c b/ntfsprogs/ntfscluster.c index d72f5e8f..23f0e7b0 100644 --- a/ntfsprogs/ntfscluster.c +++ b/ntfsprogs/ntfscluster.c @@ -492,7 +492,8 @@ int main(int argc, char *argv[]) utils_set_locale(); - vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY | + (opts.force ? NTFS_MNT_FORCE : 0)); if (!vol) return 1; diff --git a/ntfsprogs/ntfscp.c b/ntfsprogs/ntfscp.c index b2425174..0a6988d4 100644 --- a/ntfsprogs/ntfscp.c +++ b/ntfsprogs/ntfscp.c @@ -345,8 +345,10 @@ int main(int argc, char *argv[]) if (opts.noaction) flags = NTFS_MNT_RDONLY; + if (opts.force) + flags |= NTFS_MNT_FORCE; - vol = utils_mount_volume(opts.device, flags, opts.force); + vol = utils_mount_volume(opts.device, flags); if (!vol) { ntfs_log_perror("ERROR: couldn't mount volume"); return 1; diff --git a/ntfsprogs/ntfsdecrypt.c b/ntfsprogs/ntfsdecrypt.c index bf77f4a8..cd0e72b9 100644 --- a/ntfsprogs/ntfsdecrypt.c +++ b/ntfsprogs/ntfsdecrypt.c @@ -1307,7 +1307,8 @@ int main(int argc, char *argv[]) return 1; } /* Mount the ntfs volume. */ - vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY | + (opts.force ? NTFS_MNT_FORCE : 0)); if (!vol) { ntfs_log_error("Failed to mount ntfs volume. Aborting.\n"); ntfs_rsa_private_key_release(rsa_key); diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c index e7863e1f..e3adfe1d 100644 --- a/ntfsprogs/ntfsinfo.c +++ b/ntfsprogs/ntfsinfo.c @@ -2246,7 +2246,8 @@ int main(int argc, char **argv) utils_set_locale(); - vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY | + (opts.force ? NTFS_MNT_FORCE : 0)); if (!vol) { printf("Failed to open '%s'.\n", opts.device); exit(1); diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c index 6f642670..1e6f60ba 100644 --- a/ntfsprogs/ntfslabel.c +++ b/ntfsprogs/ntfslabel.c @@ -394,8 +394,9 @@ int main(int argc, char **argv) if (!opts.label) opts.noaction++; - vol = utils_mount_volume(opts.device, opts.noaction ? - NTFS_MNT_RDONLY : 0, opts.force); + vol = utils_mount_volume(opts.device, + (opts.noaction ? NTFS_MNT_RDONLY : 0) | + (opts.force ? NTFS_MNT_FORCE : 0)); if (!vol) return 1; diff --git a/ntfsprogs/ntfsls.c b/ntfsprogs/ntfsls.c index a5c6cc20..77b29b7a 100644 --- a/ntfsprogs/ntfsls.c +++ b/ntfsprogs/ntfsls.c @@ -651,7 +651,8 @@ int main(int argc, char **argv) utils_set_locale(); - vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY | + (opts.force ? NTFS_MNT_FORCE : 0)); if (!vol) { // FIXME: Print error... (AIA) return 2; diff --git a/ntfsprogs/ntfsmount.c b/ntfsprogs/ntfsmount.c index 736e6ad2..9d88a73b 100644 --- a/ntfsprogs/ntfsmount.c +++ b/ntfsprogs/ntfsmount.c @@ -1662,8 +1662,8 @@ static int ntfs_fuse_mount(void) vol = utils_mount_volume(ctx->device, (ctx->case_insensitive ? 0 : NTFS_MNT_CASE_SENSITIVE) | (ctx->blkdev ? NTFS_MNT_NOT_EXCLUSIVE : 0) | - (ctx->ro ? NTFS_MNT_RDONLY : 0), - ctx->force); + (ctx->force ? NTFS_MNT_FORCE : 0) | + (ctx->ro ? NTFS_MNT_RDONLY : 0)); if (!vol) { ntfs_log_error("Mount failed.\n"); return -1; diff --git a/ntfsprogs/ntfsmove.c b/ntfsprogs/ntfsmove.c index bda2b88c..fb6de815 100644 --- a/ntfsprogs/ntfsmove.c +++ b/ntfsprogs/ntfsmove.c @@ -876,8 +876,10 @@ int main(int argc, char *argv[]) if (opts.noaction) flags |= NTFS_MNT_RDONLY; + if (opts.force) + flags |= NTFS_MNT_FORCE; - vol = utils_mount_volume(opts.device, flags, opts.force); + vol = utils_mount_volume(opts.device, flags); if (!vol) { ntfs_log_info("!vol\n"); return 1; diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c index 0dac320c..10f2d158 100644 --- a/ntfsprogs/ntfsundelete.c +++ b/ntfsprogs/ntfsundelete.c @@ -2155,7 +2155,8 @@ int main(int argc, char *argv[]) utils_set_locale(); - vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY | + (opts.force ? NTFS_MNT_FORCE : 0)); if (!vol) return 1; diff --git a/ntfsprogs/ntfswipe.c b/ntfsprogs/ntfswipe.c index 78acc94b..f955500a 100644 --- a/ntfsprogs/ntfswipe.c +++ b/ntfsprogs/ntfswipe.c @@ -1341,8 +1341,10 @@ int main(int argc, char *argv[]) if (opts.info || opts.noaction) flags = NTFS_MNT_RDONLY; + if (opts.force) + flags |= NTFS_MNT_FORCE; - vol = utils_mount_volume(opts.device, flags, opts.force); + vol = utils_mount_volume(opts.device, flags); if (!vol) goto free; diff --git a/ntfsprogs/utils.c b/ntfsprogs/utils.c index 2af7361d..d6c7e7b7 100644 --- a/ntfsprogs/utils.c +++ b/ntfsprogs/utils.c @@ -206,8 +206,7 @@ int utils_valid_device(const char *name, int force) /** * utils_mount_volume - Mount an NTFS volume */ -ntfs_volume * utils_mount_volume(const char *device, unsigned long flags, - BOOL force) +ntfs_volume * utils_mount_volume(const char *device, ntfs_mount_flags flags) { ntfs_volume *vol; @@ -216,7 +215,7 @@ ntfs_volume * utils_mount_volume(const char *device, unsigned long flags, return NULL; } - if (!utils_valid_device(device, force)) + if (!utils_valid_device(device, flags & NTFS_MNT_FORCE)) return NULL; vol = ntfs_mount(device, flags); @@ -238,7 +237,7 @@ ntfs_volume * utils_mount_volume(const char *device, unsigned long flags, } if (NVolWasDirty(vol)) { - if (!force) { + if (!(flags & NTFS_MNT_FORCE)) { ntfs_log_error("%s", dirty_volume_msg); ntfs_umount(vol, FALSE); return NULL; diff --git a/ntfsprogs/utils.h b/ntfsprogs/utils.h index 02712c82..a38f4310 100644 --- a/ntfsprogs/utils.h +++ b/ntfsprogs/utils.h @@ -56,7 +56,7 @@ ATTR_RECORD * find_attribute(const ATTR_TYPES type, ntfs_attr_search_ctx *ctx); ATTR_RECORD * find_first_attribute(const ATTR_TYPES type, MFT_RECORD *mft); int utils_valid_device(const char *name, int force); -ntfs_volume * utils_mount_volume(const char *device, unsigned long flags, BOOL force); +ntfs_volume * utils_mount_volume(const char *device, ntfs_mount_flags flags); /** * defines...