Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30562/ntfsprogs Modified Files: mkntfs.c ntfscat.c ntfsclone.c ntfscluster.c ntfscmp.c ntfscp.c ntfsdecrypt.c ntfsdump_logfile.c ntfsfix.c ntfsinfo.c ntfslabel.c ntfsls.c ntfsmftalloc.c ntfsmount.c ntfsmove.c ntfsresize.c ntfsrm.c ntfstruncate.c ntfsundelete.c ntfswipe.c utils.c Log Message: - Add API (actually renamed from what Rich/FlatCap did): volume.[hc]::ntfs_libntfs_version() which returns a pointer to a static const string of the libntfs verion, i.e. at the moment this is "8.0.0". This required moving the version specifications from libntfs/Makefile.am to configure.ac. This should hopefully have the sideeffect that I will remember to increment it when incrementing the ntfsprogs version number when making a release given the two are right under one another. (Anton) - Change ALL utilities to display the libntfs version they are running on. This should make debugging easier in the case that people are running mismatched utilities/library. (Anton) Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- mkntfs.c 7 Oct 2005 12:21:32 -0000 1.70 +++ mkntfs.c 7 Oct 2005 14:10:57 -0000 1.71 @@ -137,6 +137,7 @@ #include "runlist.h" #include "utils.h" #include "ntfstime.h" +#include "version.h" #ifdef NO_NTFS_DEVICE_DEFAULT_IO_OPS # error "No default device io operations! Cannot build mkntfs. \ @@ -282,7 +283,7 @@ static void err_exit(const char *fmt, .. */ static void copyright(void) { - fprintf(stderr, "Copyright (c) 2000-2004 Anton Altaparmakov\n" + fprintf(stderr, "Copyright (c) 2000-2005 Anton Altaparmakov\n" "Copyright (c) 2001-2003 Richard Russon\n" "Create an NTFS volume on a user specified (block) " "device.\n"); @@ -342,6 +343,7 @@ static void usage(void) exit(1); } +#include "version.h" /** * parse_options */ @@ -356,7 +358,8 @@ static void parse_options(int argc, char // logfile size, list of bad blocks, check for bad blocks, ... if (argc && *argv) EXEC_NAME = *argv; - fprintf(stderr, "%s v%s\n", EXEC_NAME, VERSION); + fprintf(stderr, "%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); while ((c = getopt(argc, argv, "c:fH:h?np:qS:s:vz:CFTIL:QVl")) != EOF) switch (c) { case 'n': Index: ntfscat.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- ntfscat.c 28 Sep 2005 13:47:48 -0000 1.18 +++ ntfscat.c 7 Oct 2005 14:10:57 -0000 1.19 @@ -2,7 +2,7 @@ * ntfscat - Part of the Linux-NTFS project. * * Copyright (c) 2003-2005 Richard Russon - * Copyright (c) 2003 Anton Altaparmakov + * Copyright (c) 2003-2005 Anton Altaparmakov * * This utility will concatenate files and print on the standard output. * @@ -44,6 +44,7 @@ #include "debug.h" #include "dir.h" #include "ntfscat.h" +#include "version.h" static const char *EXEC_NAME = "ntfscat"; static struct options opts; @@ -62,10 +63,11 @@ static GEN_PRINTF (Printf, stderr, NULL */ static void version (void) { - Printf ("\n%s v%s - Concatenate files and print on the standard output.\n\n", - EXEC_NAME, VERSION); - Printf ("Copyright (c) 2003 Richard Russon\n"); - Printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); + Printf("\n%s v%s (libntfs %s) - Concatenate files and print on the " + "standard output.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); + Printf("Copyright (c) 2003 Richard Russon\n"); + Printf("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } /** Index: ntfsclone.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- ntfsclone.c 4 Oct 2005 20:36:42 -0000 1.54 +++ ntfsclone.c 7 Oct 2005 14:10:57 -0000 1.55 @@ -2,7 +2,7 @@ * ntfsclone - Part of the Linux-NTFS project. * * Copyright (c) 2003-2005 Szabolcs Szakacsits - * Copyright (c) 2004 Anton Altaparmakov + * Copyright (c) 2004-2005 Anton Altaparmakov * Special image format support copyright (c) 2004 Per Olofsson * * Clone NTFS data and/or metadata to a sparse file, image, device or stdout. @@ -65,6 +65,7 @@ #include "inode.h" #include "runlist.h" #include "utils.h" +#include "version.h" #if defined(linux) && defined(_IO) && !defined(BLKGETSIZE) #define BLKGETSIZE _IO(0x12,96) /* Get device size in 512-byte blocks. */ @@ -1443,7 +1444,8 @@ int main(int argc, char **argv) unsigned int wiped_total = 0; /* print to stderr, stdout can be an NTFS image ... */ - Eprintf("%s v%s\n", EXEC_NAME, VERSION); + Eprintf("%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); msg_out = stderr; parse_options(argc, argv); Index: ntfscluster.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- ntfscluster.c 28 Sep 2005 13:47:48 -0000 1.27 +++ ntfscluster.c 7 Oct 2005 14:10:57 -0000 1.28 @@ -1,6 +1,7 @@ /** * ntfscluster - Part of the Linux-NTFS project. * + * Copyright (c) 2005 Anton Altaparmakov * Copyright (c) 2002-2003 Richard Russon * * This utility will locate the owner of any given sector or cluster. @@ -47,6 +48,7 @@ #include "debug.h" #include "dir.h" #include "cluster.h" +#include "version.h" static const char *EXEC_NAME = "ntfscluster"; static struct options opts; @@ -64,8 +66,9 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet */ static void version (void) { - printf ("\n%s v%s - Find the owner of any given sector or cluster.\n\n", - EXEC_NAME, VERSION); + printf("\n%s v%s (libntfs %s) - Find the owner of any given sector or " + "cluster.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); printf ("Copyright (c) 2002-2003 Richard Russon\n"); printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } Index: ntfscmp.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- ntfscmp.c 4 Oct 2005 20:36:42 -0000 1.5 +++ ntfscmp.c 7 Oct 2005 14:10:57 -0000 1.6 @@ -1,10 +1,10 @@ /** * ntfscmp - compare two NTFS volumes. * + * Copyright (c) 2005 Anton Altaparmakov * Copyright (c) 2005 Szabolcs Szakacsits * * This utility is part of the Linux-NTFS project. - * */ #include "config.h" @@ -18,6 +18,7 @@ #include <getopt.h> #include "utils.h" +#include "version.h" static const char *EXEC_NAME = "ntfscmp"; @@ -782,7 +783,8 @@ int main(int argc, char **argv) ntfs_volume *vol1; ntfs_volume *vol2; - printf("%s v%s\n", EXEC_NAME, VERSION); + printf("%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); parse_options(argc, argv); Index: ntfscp.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- ntfscp.c 28 Sep 2005 13:47:48 -0000 1.27 +++ ntfscp.c 7 Oct 2005 14:10:57 -0000 1.28 @@ -50,6 +50,7 @@ #include "volume.h" #include "dir.h" #include "debug.h" +#include "version.h" struct options { char *device; /* Device/File to work with */ @@ -82,8 +83,8 @@ static GEN_PRINTF (Printf, stderr, NULL */ static void version (void) { - Printf ("\n%s v%s - Overwrite files on NTFS volume.\n\n", - EXEC_NAME, VERSION); + Printf("\n%s v%s (libntfs %s) - Overwrite files on NTFS volume.\n\n", + EXEC_NAME, VERSION, ntfs_libntfs_version()); Printf ("Copyright (c) 2004-2005 Yura Pakhuchiy\n"); Printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } Index: ntfsdecrypt.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- ntfsdecrypt.c 28 Sep 2005 13:47:48 -0000 1.19 +++ ntfsdecrypt.c 7 Oct 2005 14:10:57 -0000 1.20 @@ -70,6 +70,7 @@ #include "debug.h" #include "dir.h" #include "layout.h" +#include "version.h" typedef gcry_sexp_t ntfs_rsa_private_key; @@ -128,8 +129,9 @@ static ntfschar EFS[5] = { */ static void version(void) { - Printf("\n%s v%s - Decrypt files and print on the standard output.\n\n", - EXEC_NAME, VERSION); + Printf("\n%s v%s (libntfs %s) - Decrypt files and print on the " + "standard output.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); Printf("Copyright (c) 2005 Yuval Fledel\n"); Printf("Copyright (c) 2005 Anton Altaparmakov\n"); Printf("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); Index: ntfsdump_logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- ntfsdump_logfile.c 28 Sep 2005 13:47:48 -0000 1.29 +++ ntfsdump_logfile.c 7 Oct 2005 14:10:57 -0000 1.30 @@ -69,6 +69,7 @@ #include "logfile.h" #include "mst.h" #include "utils.h" +#include "version.h" typedef struct { BOOL is_volume; @@ -171,19 +172,20 @@ void log_err_exit(u8 *buf, const char *f void usage(const char *exec_name) __attribute__ ((noreturn)); void usage(const char *exec_name) { - Eprintf("%s v%s - Interpret and display information about the " - "journal\n($LogFile) of an NTFS volume.\n" - "Copyright (c) 2000-2004 Anton Altaparmakov.\n" - "%s is free software, released under the GNU General " - "Public License\nand you are welcome to redistribute " - "it under certain conditions.\n%s comes with " - "ABSOLUTELY NO WARRANTY; for details read the GNU\n" - "General Public License to be found in the file " - "COPYING in the main Linux-NTFS\ndistribution " - "directory.\nUsage: %s device\n e.g. %s /dev/hda6\n" - "Alternative usage: %s -f file\n e.g. %s -f " - "MyCopyOfTheLogFile\n", exec_name, VERSION, exec_name, - exec_name, exec_name, exec_name, exec_name, exec_name); + Eprintf("%s v%s (libntfs %s) - Interpret and display information " + "about the journal\n($LogFile) of an NTFS volume.\n" + "Copyright (c) 2000-2005 Anton Altaparmakov.\n" + "%s is free software, released under the GNU General " + "Public License\nand you are welcome to redistribute " + "it under certain conditions.\n%s comes with " + "ABSOLUTELY NO WARRANTY; for details read the GNU\n" + "General Public License to be found in the file " + "COPYING in the main Linux-NTFS\ndistribution " + "directory.\nUsage: %s device\n e.g. %s /dev/hda6\n" + "Alternative usage: %s -f file\n e.g. %s -f " + "MyCopyOfTheLogFile\n", exec_name, VERSION, + ntfs_libntfs_version(), exec_name, exec_name, + exec_name, exec_name, exec_name, exec_name); exit(1); } Index: ntfsfix.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- ntfsfix.c 7 Oct 2005 13:26:44 -0000 1.20 +++ ntfsfix.c 7 Oct 2005 14:10:57 -0000 1.21 @@ -73,6 +73,7 @@ #include "device.h" #include "logfile.h" #include "utils.h" +#include "version.h" #ifdef NO_NTFS_DEVICE_DEFAULT_IO_OPS # error "No default device io operations! Cannot build ntfsfix. \ @@ -97,7 +98,7 @@ struct { static int usage(void) __attribute__((noreturn)); static int usage(void) { - printf("%s v%s\n" + printf("%s v%s (libntfs %s)\n" "\n" "Usage: %s [options] device\n" " Attempt to fix an NTFS partition.\n" @@ -106,7 +107,8 @@ static int usage(void) " -V, --version Display version information\n" "\n" "For example: %s /dev/hda6\n\n", - EXEC_NAME, VERSION, EXEC_NAME, EXEC_NAME); + EXEC_NAME, VERSION, ntfs_libntfs_version(), EXEC_NAME, + EXEC_NAME); printf("%s%s", ntfs_bugs, ntfs_home); exit(1); } Index: ntfsinfo.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 --- ntfsinfo.c 4 Oct 2005 20:36:42 -0000 1.77 +++ ntfsinfo.c 7 Oct 2005 14:10:57 -0000 1.78 @@ -2,7 +2,7 @@ * ntfsinfo - Part of the Linux-NTFS project. * * Copyright (c) 2002-2004 Matthew J. Fanto - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * Copyright (c) 2002-2005 Richard Russon * Copyright (c) 2004-2005 Yura Pakhuchiy * Copyright (c) 2005 Cristian Klein @@ -76,6 +76,7 @@ #include "mst.h" #include "dir.h" #include "ntfstime.h" +#include "version.h" static const char *EXEC_NAME = "ntfsinfo"; @@ -104,11 +105,12 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet */ static void version (void) { - printf ("\n%s v%s - Display information about an NTFS Volume.\n\n", - EXEC_NAME, VERSION); + printf ("\n%s v%s (libntfs %s) - Display information about an NTFS " + "Volume.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); printf ("Copyright (c)\n"); printf (" 2002-2004 Matthew J. Fanto\n"); - printf (" 2002-2004 Anton Altaparmakov\n"); + printf (" 2002-2005 Anton Altaparmakov\n"); printf (" 2002-2003 Richard Russon\n"); printf (" 2003 Leonard Norrgård\n"); printf (" 2004-2005 Yura Pakhuchiy\n"); Index: ntfslabel.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- ntfslabel.c 28 Sep 2005 13:47:48 -0000 1.15 +++ ntfslabel.c 7 Oct 2005 14:10:57 -0000 1.16 @@ -2,7 +2,7 @@ * ntfslabel - Part of the Linux-NTFS project. * * Copyright (c) 2002 Matthew J. Fanto - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * Copyright (c) 2002-2003 Richard Russon * * This utility will display/change the label on an NTFS partition. @@ -47,6 +47,7 @@ #include "debug.h" #include "mft.h" #include "utils.h" +#include "version.h" static const char *EXEC_NAME = "ntfslabel"; @@ -72,11 +73,12 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet */ static void version (void) { - printf ("\n%s v%s - Display, or set, the label for an NTFS Volume.\n\n", - EXEC_NAME, VERSION); + printf ("\n%s v%s (libntfs %s) - Display, or set, the label for an " + "NTFS Volume.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); printf ("Copyright (c)\n"); printf (" 2002 Matthew J. Fanto\n"); - printf (" 2002-2004 Anton Altaparmakov\n"); + printf (" 2002-2005 Anton Altaparmakov\n"); printf (" 2002-2003 Richard Russon\n"); printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } Index: ntfsls.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- ntfsls.c 28 Sep 2005 13:47:48 -0000 1.30 +++ ntfsls.c 7 Oct 2005 14:10:57 -0000 1.31 @@ -2,7 +2,7 @@ * ntfsls - Part of the Linux-NTFS project. * * Copyright (c) 2003 Lode Leroy - * Copyright (c) 2003 Anton Altaparmakov + * Copyright (c) 2003-2005 Anton Altaparmakov * Copyright (c) 2003 Richard Russon * Copyright (c) 2004 Carmelo Kintana * Copyright (c) 2004 Giang Nguyen @@ -51,6 +51,7 @@ #include "dir.h" #include "list.h" #include "ntfstime.h" +#include "version.h" static const char *EXEC_NAME = "ntfsls"; @@ -135,10 +136,11 @@ GEN_PRINTF(Qprintf, stdout, &opts.quiet, */ static void version(void) { - printf("\n%s v%s - Display information about an NTFS Volume.\n\n", - EXEC_NAME, VERSION); + printf("\n%s v%s (libntfs %s) - Display information about an NTFS " + "Volume.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); printf("Copyright (c) 2003 Lode Leroy\n"); - printf("Copyright (c) 2003 Anton Altaparmakov\n"); + printf("Copyright (c) 2003-2005 Anton Altaparmakov\n"); printf("Copyright (c) 2003 Richard Russon\n"); printf("Copyright (c) 2004 Carmelo Kintana\n"); printf("Copyright (c) 2004 Giang Nguyen\n"); Index: ntfsmftalloc.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmftalloc.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- ntfsmftalloc.c 28 Sep 2005 13:47:48 -0000 1.6 +++ ntfsmftalloc.c 7 Oct 2005 14:10:57 -0000 1.7 @@ -1,7 +1,7 @@ /** * ntfsmftalloc - Part of the Linux-NTFS project. * - * Copyright (c) 2002-2003 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * * This utility will allocate and initialize an mft record. * @@ -63,6 +63,7 @@ #include "volume.h" #include "mft.h" #include "utils.h" +#include "version.h" static const char *EXEC_NAME = "ntfsmftalloc"; @@ -146,7 +147,7 @@ static void err_exit(const char *fmt, .. */ static void copyright(void) { - fprintf(stderr, "Copyright (c) 2004 Anton Altaparmakov\n" + fprintf(stderr, "Copyright (c) 2004-2005 Anton Altaparmakov\n" "Allocate and initialize a base or an extent mft " "record. If a base mft record\nis not specified, a " "base mft record is allocated and initialized. " @@ -194,7 +195,8 @@ static void parse_options(int argc, char if (argc && *argv) EXEC_NAME = *argv; - fprintf(stderr, "%s v%s\n", EXEC_NAME, VERSION); + fprintf(stderr, "%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); while ((c = getopt(argc, argv, "fh?nqvVl")) != EOF) switch (c) { case 'f': Index: ntfsmount.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- ntfsmount.c 4 Oct 2005 20:00:22 -0000 1.38 +++ ntfsmount.c 7 Oct 2005 14:10:57 -0000 1.39 @@ -1,6 +1,7 @@ /** * ntfsmount - Part of the Linux-NTFS project. * + * Copyright (c) 2005 Anton Altaparmakov * Copyright (c) 2005 Yura Pakhuchiy * * NTFS module for FUSE. @@ -64,6 +65,7 @@ #include "layout.h" #include "index.h" #include "utils.h" +#include "version.h" #ifndef PATH_MAX #define PATH_MAX 4096 @@ -1322,8 +1324,8 @@ err_exit: static void usage(void) { - Eprintf("\n%s v%s - NTFS module for FUSE.\n\n", - EXEC_NAME, VERSION); + Eprintf("\n%s v%s (libntfs %s) - NTFS module for FUSE.\n\n", + EXEC_NAME, VERSION, ntfs_libntfs_version()); Eprintf("Copyright (c) 2005 Yura Pakhuchiy\n\n"); Eprintf("usage: %s device mount_point [-o options]\n\n", EXEC_NAME); Index: ntfsmove.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ntfsmove.c 28 Sep 2005 13:47:48 -0000 1.16 +++ ntfsmove.c 7 Oct 2005 14:10:57 -0000 1.17 @@ -2,7 +2,7 @@ * ntfsmove - Part of the Linux-NTFS project. * * Copyright (c) 2003 Richard Russon - * Copyright (c) 2003 Anton Altaparmakov + * Copyright (c) 2003-2005 Anton Altaparmakov * * This utility will move files on an NTFS volume. * @@ -45,6 +45,7 @@ #include "dir.h" #include "bitmap.h" #include "ntfsmove.h" +#include "version.h" static const char *EXEC_NAME = "ntfsmove"; static struct options opts; @@ -67,8 +68,9 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet */ static void version (void) { - printf ("\n%s v%s - Move files and directories on an NTFS volume.\n\n", - EXEC_NAME, VERSION); + printf ("\n%s v%s (libntfs %s) - Move files and directories on an " + "NTFS volume.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); printf ("Copyright (c) 2003 Richard Russon\n"); printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } Index: ntfsresize.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -p -r1.95 -r1.96 --- ntfsresize.c 4 Oct 2005 22:03:13 -0000 1.95 +++ ntfsresize.c 7 Oct 2005 14:10:57 -0000 1.96 @@ -2,7 +2,7 @@ * ntfsresize - Part of the Linux-NTFS project. * * Copyright (c) 2002-2005 Szabolcs Szakacsits - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * Copyright (c) 2002-2003 Richard Russon * * This utility will resize an NTFS volume without data loss. @@ -64,6 +64,7 @@ #include "inode.h" #include "runlist.h" #include "utils.h" +#include "version.h" static const char *EXEC_NAME = "ntfsresize"; @@ -2334,7 +2335,8 @@ int main(int argc, char **argv) s64 device_size; /* in bytes */ ntfs_volume *vol; - printf("%s v%s\n", EXEC_NAME, VERSION); + printf("%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); if (!parse_options(argc, argv)) return 1; Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- ntfsrm.c 29 Sep 2005 12:50:39 -0000 1.63 +++ ntfsrm.c 7 Oct 2005 14:10:57 -0000 1.64 @@ -1,6 +1,7 @@ /** * ntfsrm - Part of the Linux-NTFS project. * + * Copyright (c) 2005 Anton Altaparmakov * Copyright (c) 2004-2005 Richard Russon * * This utility will delete files from an NTFS volume. @@ -46,6 +47,7 @@ #include "lcnalloc.h" #include "mft.h" #include "ntfstime.h" +#include "version.h" static const char *EXEC_NAME = "ntfsrm"; static struct options opts; @@ -66,8 +68,8 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet */ static void version (void) { - printf ("\n%s v%s - Delete files from an NTFS volume.\n\n", - EXEC_NAME, VERSION); + printf("\n%s v%s (libntfs %s) - Delete files from an NTFS volume.\n\n", + EXEC_NAME, VERSION, ntfs_libntfs_version()); printf ("Copyright (c) 2004 Richard Russon\n"); printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } Index: ntfstruncate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- ntfstruncate.c 28 Sep 2005 13:47:48 -0000 1.27 +++ ntfstruncate.c 7 Oct 2005 14:10:57 -0000 1.28 @@ -1,7 +1,7 @@ /** * ntfstruncate - Part of the Linux-NTFS project. * - * Copyright (c) 2002-2003 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * * This utility will truncate a specified attribute belonging to a * specified inode, i.e. file or directory, to a specified length. @@ -64,6 +64,7 @@ #include "layout.h" #include "volume.h" #include "utils.h" +#include "version.h" extern const unsigned char attrdef_ntfs12_array[2400]; @@ -156,7 +157,7 @@ static void err_exit(const char *fmt, .. */ static void copyright(void) { - fprintf(stderr, "Copyright (c) 2002-2003 Anton Altaparmakov\n" + fprintf(stderr, "Copyright (c) 2002-2005 Anton Altaparmakov\n" "Copyright (c) 2003 Richard Russon\n" "Truncate a specified attribute of a specified " "inode.\n"); @@ -206,7 +207,8 @@ static void parse_options(int argc, char if (argc && *argv) EXEC_NAME = *argv; - fprintf(stderr, "%s v%s\n", EXEC_NAME, VERSION); + fprintf(stderr, "%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); while ((c = getopt(argc, argv, "fh?nqvVl")) != EOF) switch (c) { case 'f': Index: ntfsundelete.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -r1.47 -r1.48 --- ntfsundelete.c 4 Oct 2005 20:36:42 -0000 1.47 +++ ntfsundelete.c 7 Oct 2005 14:10:57 -0000 1.48 @@ -79,6 +79,7 @@ #include "utils.h" #include "debug.h" #include "ntfstime.h" +#include "version.h" static const char *EXEC_NAME = "ntfsundelete"; static const char *MFTFILE = "mft"; @@ -225,8 +226,9 @@ static int parse_inode_arg (void) */ static void version (void) { - printf ("\n%s v%s - Recover deleted files from an NTFS Volume.\n\n", - EXEC_NAME, VERSION); + printf("\n%s v%s (libntfs %s) - Recover deleted files from an NTFS " + "Volume.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); printf ("Copyright (c) 2002-2005 Richard Russon\n" "Copyright (c) 2004-2005 Holger Ohmacht\n"); printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); Index: ntfswipe.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- ntfswipe.c 28 Sep 2005 13:47:48 -0000 1.38 +++ ntfswipe.c 7 Oct 2005 14:10:57 -0000 1.39 @@ -1,6 +1,7 @@ /** * ntfswipe - Part of the Linux-NTFS project. * + * Copyright (c) 2005 Anton Altaparmakov * Copyright (c) 2002-2003 Richard Russon * Copyright (c) 2004 Yura Pakhuchiy * @@ -53,6 +54,7 @@ #include "debug.h" #include "dir.h" #include "mst.h" +#include "version.h" static const char *EXEC_NAME = "ntfswipe"; static struct options opts; @@ -70,8 +72,9 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet */ static void version (void) { - printf ("\n%s v%s - Overwrite the unused space on an NTFS Volume.\n\n", - EXEC_NAME, VERSION); + printf("\n%s v%s (libntfs %s) - Overwrite the unused space on an NTFS " + "Volume.\n\n", EXEC_NAME, VERSION, + ntfs_libntfs_version()); printf ("Copyright (c) 2002-2003 Richard Russon\n"); printf ("Copyright (c) 2004 Yura Pakhuchiy\n"); printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); Index: utils.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- utils.c 4 Oct 2005 21:42:07 -0000 1.48 +++ utils.c 7 Oct 2005 14:10:57 -0000 1.49 @@ -68,6 +68,7 @@ #include "volume.h" #include "debug.h" #include "dir.h" +#include "version.h" const char *ntfs_bugs = "Developers' email address: lin...@li...\n"; const char *ntfs_home = "Linux NTFS homepage: http://linux-ntfs.sourceforge.net\n"; |
