diff --git a/configure b/configure index a2fff4ce..cf03ee9b 100755 --- a/configure +++ b/configure @@ -11026,7 +11026,7 @@ done # Makefiles to be created by configure. - ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile libntfs/Makefile ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.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 libntfs/Makefile ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.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 @@ -11603,6 +11603,7 @@ do "libntfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libntfs/Makefile" ;; "ntfsprogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/Makefile" ;; "ntfsprogs/mkntfs.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/mkntfs.8" ;; + "ntfsprogs/ntfscat.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfscat.8" ;; "ntfsprogs/ntfsclone.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsclone.8" ;; "ntfsprogs/ntfscluster.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfscluster.8" ;; "ntfsprogs/ntfsfix.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsfix.8" ;; diff --git a/configure.ac b/configure.ac index c5fd4ded..3cbf20fa 100644 --- a/configure.ac +++ b/configure.ac @@ -140,6 +140,7 @@ AC_CONFIG_FILES([ libntfs/Makefile ntfsprogs/Makefile ntfsprogs/mkntfs.8 + ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfsfix.8 diff --git a/ntfsprogs.spec.in b/ntfsprogs.spec.in index 8bfa2ebf..3392be45 100644 --- a/ntfsprogs.spec.in +++ b/ntfsprogs.spec.in @@ -42,7 +42,8 @@ NTFS partition. See man 8 ntfscluster for details. files or directories within it. See man 8 ntfsinfo for details. ntfsls - List information about files in a directory residing on an NTFS partition. See man 8 ntfsls for details. - + ntfscat - Concatenate files and print their contents on the standard +output. See man 8 ntfscat for details. %package devel Summary : files required to compile software that uses libntfs @@ -87,6 +88,9 @@ rm -rf "$RPM_BUILD_ROOT" %{prefix}/lib/*.la* %changelog +* Fri Oct 19 2003 Richard Russon +- added the new utility ntfscat + * Tue Sep 30 2003 Anton Altaparmakov - added the new utilities, ntfsclone, ntfscluster, ntfsinfo, ntfsls. diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index d699ab63..6c9a73f2 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -25,13 +25,13 @@ endif # Workaround to make REALLYSTATIC work with automake 1.5. LINK=$(STATIC_LINK) $(LIBTOOL_LINK) -bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls +bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls ntfscat sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone -EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate ntfscat +EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \ - ntfsclone.8 ntfscluster.8 + ntfsclone.8 ntfscluster.8 ntfscat.8 EXTRA_MANS = CLEANFILES = $(EXTRA_PROGRAMS) @@ -77,12 +77,12 @@ ntfsls_SOURCES = ntfsls.c utils.c utils.h ntfsls_LDADD = $(AM_LIBS) ntfsls_LDFLAGS = $(AM_LFLAGS) -# We don't distribute these - ntfscat_SOURCES = ntfscat.c ntfscat.h utils.c utils.h ntfscat_LDADD = $(AM_LIBS) ntfscat_LDFLAGS = $(AM_LFLAGS) +# We don't distribute these + ntfstruncate_SOURCES = attrdef.c ntfstruncate.c utils.c utils.h ntfstruncate_LDADD = $(AM_LIBS) ntfstruncate_LDFLAGS = $(AM_LFLAGS) diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in index 7d802246..e4821e38 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -111,13 +111,13 @@ install_sh = @install_sh@ # Workaround to make REALLYSTATIC work with automake 1.5. LINK = $(STATIC_LINK) $(LIBTOOL_LINK) -bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls +bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls ntfscat sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone -EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate ntfscat +EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \ - ntfsclone.8 ntfscluster.8 + ntfsclone.8 ntfscluster.8 ntfscat.8 EXTRA_MANS = @@ -164,12 +164,12 @@ ntfsls_SOURCES = ntfsls.c utils.c utils.h ntfsls_LDADD = $(AM_LIBS) ntfsls_LDFLAGS = $(AM_LFLAGS) - -# We don't distribute these ntfscat_SOURCES = ntfscat.c ntfscat.h utils.c utils.h ntfscat_LDADD = $(AM_LIBS) ntfscat_LDFLAGS = $(AM_LFLAGS) + +# We don't distribute these ntfstruncate_SOURCES = attrdef.c ntfstruncate.c utils.c utils.h ntfstruncate_LDADD = $(AM_LIBS) ntfstruncate_LDFLAGS = $(AM_LFLAGS) @@ -188,13 +188,13 @@ dumplog_LDFLAGS = $(AM_LFLAGS) subdir = ntfsprogs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = mkntfs.8 ntfsclone.8 ntfscluster.8 ntfsfix.8 \ - ntfsinfo.8 ntfslabel.8 ntfsls.8 ntfsprogs.8 ntfsresize.8 \ - ntfsundelete.8 +CONFIG_CLEAN_FILES = mkntfs.8 ntfscat.8 ntfsclone.8 ntfscluster.8 \ + ntfsfix.8 ntfsinfo.8 ntfslabel.8 ntfsls.8 ntfsprogs.8 \ + ntfsresize.8 ntfsundelete.8 EXTRA_PROGRAMS = ntfsdump_logfile$(EXEEXT) dumplog$(EXEEXT) \ - ntfswipe$(EXEEXT) ntfstruncate$(EXEEXT) ntfscat$(EXEEXT) + ntfswipe$(EXEEXT) ntfstruncate$(EXEEXT) bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) \ - ntfsls$(EXEEXT) + ntfsls$(EXEEXT) ntfscat$(EXEEXT) sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) ntfsundelete$(EXEEXT) \ ntfsresize$(EXEEXT) ntfsclone$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) @@ -317,9 +317,10 @@ DIST_SOURCES = $(dumplog_SOURCES) $(mkntfs_SOURCES) $(ntfscat_SOURCES) \ NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in mkntfs.8.in ntfsclone.8.in \ - ntfscluster.8.in ntfsfix.8.in ntfsinfo.8.in ntfslabel.8.in \ - ntfsls.8.in ntfsprogs.8.in ntfsresize.8.in ntfsundelete.8.in +DIST_COMMON = Makefile.am Makefile.in mkntfs.8.in ntfscat.8.in \ + ntfsclone.8.in ntfscluster.8.in ntfsfix.8.in ntfsinfo.8.in \ + ntfslabel.8.in ntfsls.8.in ntfsprogs.8.in ntfsresize.8.in \ + ntfsundelete.8.in SOURCES = $(dumplog_SOURCES) $(mkntfs_SOURCES) $(ntfscat_SOURCES) $(ntfsclone_SOURCES) $(ntfscluster_SOURCES) $(ntfsdump_logfile_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(ntfslabel_SOURCES) $(ntfsls_SOURCES) $(ntfsresize_SOURCES) $(ntfstruncate_SOURCES) $(ntfsundelete_SOURCES) $(ntfswipe_SOURCES) all: all-am @@ -333,6 +334,8 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.s cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mkntfs.8: $(top_builddir)/config.status mkntfs.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +ntfscat.8: $(top_builddir)/config.status ntfscat.8.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ntfsclone.8: $(top_builddir)/config.status ntfsclone.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ntfscluster.8: $(top_builddir)/config.status ntfscluster.8.in