From 7553a8da53c0ceaa6139bee92d5e80fcb2496ddc Mon Sep 17 00:00:00 2001 From: cha0smaster Date: Tue, 5 Jul 2005 01:18:02 +0000 Subject: [PATCH] * ntfsmount: change default fmask and dmask to 0177 and 0077 respectively. * Update NEWS, ntfsprogs.8.in, .cvsignore * Update build system to install nftsmount man page. --- NEWS | 5 +++-- configure | 3 ++- configure.ac | 1 + ntfsprogs/.cvsignore | 1 + ntfsprogs/Makefile.am | 3 ++- ntfsprogs/Makefile.in | 14 +++++++++----- ntfsprogs/ntfsmount.c | 3 ++- ntfsprogs/ntfsprogs.8.in | 4 ++++ 8 files changed, 24 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 29ce324a..e6b1915f 100644 --- a/NEWS +++ b/NEWS @@ -3,8 +3,9 @@ Current news Add new utility - ntfsmount. It's a FUSE module that rely on libntfs. So, you need FUSE to compile it, xattr is also highly recommended. This module -support file overwrite changing it size and can list/read/write/add/remove -named data streams via xattr interface. (Yura) +support file overwrite changing it size and can read/write/add/remove +named data streams via "file:stream" interface and list them via +"ntfs.streams.list" extended attribute. (Yura) Attribute resize code for normal and sparse files is completed. Thus, ntfscp should always successfully overwrite any normal or sparse file even if file diff --git a/configure b/configure index 32d7c4eb..d9d9c3ae 100755 --- a/configure +++ b/configure @@ -23542,7 +23542,7 @@ done # Makefiles to be created by configure. - ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile include/ntfs/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfscp.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec" + ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile include/ntfs/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfscp.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsmount.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -24138,6 +24138,7 @@ do "ntfsprogs/ntfsinfo.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsinfo.8" ;; "ntfsprogs/ntfslabel.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfslabel.8" ;; "ntfsprogs/ntfsls.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsls.8" ;; + "ntfsprogs/ntfsmount.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsmount.8" ;; "ntfsprogs/ntfsprogs.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsprogs.8" ;; "ntfsprogs/ntfsresize.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsresize.8" ;; "ntfsprogs/ntfsundelete.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsundelete.8" ;; diff --git a/configure.ac b/configure.ac index c103a09e..2a63edee 100644 --- a/configure.ac +++ b/configure.ac @@ -265,6 +265,7 @@ AC_CONFIG_FILES([ ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 + ntfsprogs/ntfsmount.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 diff --git a/ntfsprogs/.cvsignore b/ntfsprogs/.cvsignore index 049839c8..d3161032 100644 --- a/ntfsprogs/.cvsignore +++ b/ntfsprogs/.cvsignore @@ -12,6 +12,7 @@ ntfsinfo ntfslabel ntfsls ntfsmftalloc +ntfsmount ntfsmove ntfsresize ntfsrm diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index 5358a34e..d8713bc6 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -19,7 +19,8 @@ EXTRA_PROGRAMS = ntfsdump_logfile ntfswipe ntfstruncate ntfsmove \ man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \ - ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8 + ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8 \ + ntfsmount.8 EXTRA_MANS = CLEANFILES = $(EXTRA_PROGRAMS) diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in index adb90dfe..43810251 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -54,8 +54,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/ntfsclone.8.in $(srcdir)/ntfscluster.8.in \ $(srcdir)/ntfscp.8.in $(srcdir)/ntfsfix.8.in \ $(srcdir)/ntfsinfo.8.in $(srcdir)/ntfslabel.8.in \ - $(srcdir)/ntfsls.8.in $(srcdir)/ntfsprogs.8.in \ - $(srcdir)/ntfsresize.8.in $(srcdir)/ntfsundelete.8.in + $(srcdir)/ntfsls.8.in $(srcdir)/ntfsmount.8.in \ + $(srcdir)/ntfsprogs.8.in $(srcdir)/ntfsresize.8.in \ + $(srcdir)/ntfsundelete.8.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -63,8 +64,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = mkntfs.8 ntfscat.8 ntfsclone.8 ntfscluster.8 \ - ntfscp.8 ntfsfix.8 ntfsinfo.8 ntfslabel.8 ntfsls.8 ntfsprogs.8 \ - ntfsresize.8 ntfsundelete.8 + ntfscp.8 ntfsfix.8 ntfsinfo.8 ntfslabel.8 ntfsls.8 ntfsmount.8 \ + ntfsprogs.8 ntfsresize.8 ntfsundelete.8 @ENABLE_FUSE_MODULE_TRUE@am__EXEEXT_1 = ntfsmount$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \ "$(DESTDIR)$(man8dir)" @@ -294,7 +295,8 @@ target_vendor = @target_vendor@ LINK = $(STATIC_LINK) $(LIBTOOL_LINK) man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \ - ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8 + ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8 \ + ntfsmount.8 EXTRA_MANS = CLEANFILES = $(EXTRA_PROGRAMS) @@ -410,6 +412,8 @@ ntfslabel.8: $(top_builddir)/config.status $(srcdir)/ntfslabel.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ntfsls.8: $(top_builddir)/config.status $(srcdir)/ntfsls.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +ntfsmount.8: $(top_builddir)/config.status $(srcdir)/ntfsmount.8.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ntfsprogs.8: $(top_builddir)/config.status $(srcdir)/ntfsprogs.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ntfsresize.8: $(top_builddir)/config.status $(srcdir)/ntfsresize.8.in diff --git a/ntfsprogs/ntfsmount.c b/ntfsprogs/ntfsmount.c index 26d144df..63cac775 100644 --- a/ntfsprogs/ntfsmount.c +++ b/ntfsprogs/ntfsmount.c @@ -613,7 +613,8 @@ static int ntfs_fuse_init(void) .state = NF_FreeClustersOutdate | NF_FreeMFTOutdate, .uid = geteuid(), .gid = getegid(), - .fmask = 0111, + .fmask = 0177, + .dmask = 0077, }; return 0; } diff --git a/ntfsprogs/ntfsprogs.8.in b/ntfsprogs/ntfsprogs.8.in index 033a4c5e..502675df 100644 --- a/ntfsprogs/ntfsprogs.8.in +++ b/ntfsprogs/ntfsprogs.8.in @@ -51,6 +51,10 @@ or directories within it. .PP .BR ntfsls (8) : List information about files in a directory residing on an NTFS partition. +.SS ntfsmount +.PP +.BR ntfsmount (8) +: NTFS module for FUSE. .SS ntfsresize .PP .BR ntfsresize (8)