diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c index e8a3ef5e..467083b2 100644 --- a/ntfsprogs/mkntfs.c +++ b/ntfsprogs/mkntfs.c @@ -260,7 +260,7 @@ static void mkntfs_usage(void) */ static void mkntfs_version(void) { - ntfs_log_info("\n%s v%s (libntfs %s)\n\n", EXEC_NAME, VERSION, ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g)\n\n", EXEC_NAME, VERSION); ntfs_log_info("Create an NTFS volume on a user specified (block) device.\n\n"); ntfs_log_info("Copyright (c) 2000-2006 Anton Altaparmakov\n"); ntfs_log_info("Copyright (c) 2001-2005 Richard Russon\n"); diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c index ec03ec83..08acc06b 100644 --- a/ntfsprogs/ntfscat.c +++ b/ntfsprogs/ntfscat.c @@ -60,9 +60,8 @@ static struct options opts; */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Concatenate files and print on the " - "standard output.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Concatenate files and print on the " + "standard output.\n\n", EXEC_NAME, VERSION); ntfs_log_info("Copyright (c) 2003-2005 Richard Russon\n"); ntfs_log_info("Copyright (c) 2003-2005 Anton Altaparmakov\n"); ntfs_log_info("Copyright (c) 2003-2005 Szabolcs Szakacsits\n"); diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c index 8809955d..3c687361 100644 --- a/ntfsprogs/ntfsclone.c +++ b/ntfsprogs/ntfsclone.c @@ -1643,8 +1643,7 @@ int main(int argc, char **argv) unsigned int wiped_total = 0; /* print to stderr, stdout can be an NTFS image ... */ - fprintf(stderr, "%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + fprintf(stderr, "%s v%s (libntfs-3g)\n", EXEC_NAME, VERSION); msg_out = stderr; parse_options(argc, argv); diff --git a/ntfsprogs/ntfscluster.c b/ntfsprogs/ntfscluster.c index 8a218461..c34c17f7 100644 --- a/ntfsprogs/ntfscluster.c +++ b/ntfsprogs/ntfscluster.c @@ -65,9 +65,8 @@ static struct options opts; */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Find the owner of any given sector or " - "cluster.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Find the owner of any given sector or " + "cluster.\n\n", EXEC_NAME, VERSION); ntfs_log_info("Copyright (c) 2002-2003 Richard Russon\n"); ntfs_log_info("Copyright (c) 2005 Anton Altaparmakov\n"); ntfs_log_info("Copyright (c) 2005-2006 Szabolcs Szakacsits\n"); diff --git a/ntfsprogs/ntfscmp.c b/ntfsprogs/ntfscmp.c index 8fdf88b7..89014885 100644 --- a/ntfsprogs/ntfscmp.c +++ b/ntfsprogs/ntfscmp.c @@ -852,8 +852,7 @@ int main(int argc, char **argv) ntfs_volume *vol1; ntfs_volume *vol2; - printf("%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + printf("%s v%s (libntfs-3g)\n", EXEC_NAME, VERSION); parse_options(argc, argv); diff --git a/ntfsprogs/ntfscp.c b/ntfsprogs/ntfscp.c index 0450e4c3..d9b9589e 100644 --- a/ntfsprogs/ntfscp.c +++ b/ntfsprogs/ntfscp.c @@ -80,8 +80,8 @@ volatile sig_atomic_t caught_terminate = 0; */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Overwrite files on NTFS " - "volume.\n\n", EXEC_NAME, VERSION, ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Overwrite files on NTFS " + "volume.\n\n", EXEC_NAME, VERSION); ntfs_log_info("Copyright (c) 2004-2005 Yura Pakhuchiy\n"); ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } diff --git a/ntfsprogs/ntfsdecrypt.c b/ntfsprogs/ntfsdecrypt.c index 31ebf2da..43c45861 100644 --- a/ntfsprogs/ntfsdecrypt.c +++ b/ntfsprogs/ntfsdecrypt.c @@ -143,9 +143,8 @@ static ntfschar EFS[5] = { */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Decrypt files and print on the " - "standard output.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Decrypt files and print on the " + "standard output.\n\n", EXEC_NAME, VERSION); ntfs_log_info("Copyright (c) 2005 Yuval Fledel\n"); ntfs_log_info("Copyright (c) 2005 Anton Altaparmakov\n"); ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); diff --git a/ntfsprogs/ntfsdump_logfile.c b/ntfsprogs/ntfsdump_logfile.c index d6500379..08568cf1 100644 --- a/ntfsprogs/ntfsdump_logfile.c +++ b/ntfsprogs/ntfsdump_logfile.c @@ -169,7 +169,7 @@ static void log_err_exit(u8 *buf, const char *fmt, ...) __attribute__((noreturn)) static void usage(const char *exec_name) { - ntfs_log_error("%s v%s (libntfs %s) - Interpret and display information " + ntfs_log_error("%s v%s (libntfs-3g) - 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 " @@ -181,7 +181,7 @@ static void usage(const char *exec_name) "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, exec_name, exec_name); exit(1); } diff --git a/ntfsprogs/ntfsfix.c b/ntfsprogs/ntfsfix.c index a2869e4b..e763ba94 100644 --- a/ntfsprogs/ntfsfix.c +++ b/ntfsprogs/ntfsfix.c @@ -96,7 +96,7 @@ struct { __attribute__((noreturn)) static int usage(void) { - ntfs_log_info("%s v%s (libntfs %s)\n" + ntfs_log_info("%s v%s (libntfs-3g)\n" "\n" "Usage: %s [options] device\n" " Attempt to fix an NTFS partition.\n" @@ -105,7 +105,7 @@ static int usage(void) " -V, --version Display version information\n" "\n" "For example: %s /dev/hda6\n\n", - EXEC_NAME, VERSION, ntfs_libntfs_version(), EXEC_NAME, + EXEC_NAME, VERSION, EXEC_NAME, EXEC_NAME); ntfs_log_info("%s%s", ntfs_bugs, ntfs_home); exit(1); diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c index 62f54829..b9a54187 100644 --- a/ntfsprogs/ntfsinfo.c +++ b/ntfsprogs/ntfsinfo.c @@ -103,9 +103,8 @@ static struct options { */ static void version(void) { - printf("\n%s v%s (libntfs %s) - Display information about an NTFS " - "Volume.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + printf("\n%s v%s (libntfs-3g) - Display information about an NTFS " + "Volume.\n\n", EXEC_NAME, VERSION); printf("Copyright (c)\n"); printf(" 2002-2004 Matthew J. Fanto\n"); printf(" 2002-2006 Anton Altaparmakov\n"); diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c index 3797bb1e..c38662bf 100644 --- a/ntfsprogs/ntfslabel.c +++ b/ntfsprogs/ntfslabel.c @@ -71,9 +71,8 @@ static struct options { */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Display, or set, the label for an " - "NTFS Volume.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Display, or set, the label for an " + "NTFS Volume.\n\n", EXEC_NAME, VERSION); ntfs_log_info("Copyright (c)\n"); ntfs_log_info(" 2002 Matthew J. Fanto\n"); ntfs_log_info(" 2002-2005 Anton Altaparmakov\n"); diff --git a/ntfsprogs/ntfsls.c b/ntfsprogs/ntfsls.c index 022c933a..4a458992 100644 --- a/ntfsprogs/ntfsls.c +++ b/ntfsprogs/ntfsls.c @@ -139,9 +139,8 @@ static int list_dir_entry(ntfsls_dirent * dirent, const ntfschar * name, */ static void version(void) { - printf("\n%s v%s (libntfs %s) - Display information about an NTFS " - "Volume.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + printf("\n%s v%s (libntfs-3g) - Display information about an NTFS " + "Volume.\n\n", EXEC_NAME, VERSION); printf("Copyright (c) 2003 Lode Leroy\n"); printf("Copyright (c) 2003-2005 Anton Altaparmakov\n"); printf("Copyright (c) 2003 Richard Russon\n"); diff --git a/ntfsprogs/ntfsmftalloc.c b/ntfsprogs/ntfsmftalloc.c index c10899e9..49ceb17e 100644 --- a/ntfsprogs/ntfsmftalloc.c +++ b/ntfsprogs/ntfsmftalloc.c @@ -159,8 +159,7 @@ static void parse_options(int argc, char *argv[]) if (argc && *argv) EXEC_NAME = *argv; - ntfs_log_info("%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + ntfs_log_info("%s v%s (libntfs-3g)\n", EXEC_NAME, VERSION); while ((c = getopt(argc, argv, "fh?nqvVl")) != EOF) { switch (c) { case 'f': diff --git a/ntfsprogs/ntfsmove.c b/ntfsprogs/ntfsmove.c index 050a8586..93ff7a8b 100644 --- a/ntfsprogs/ntfsmove.c +++ b/ntfsprogs/ntfsmove.c @@ -60,9 +60,8 @@ static struct options opts; */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Move files and directories on an " - "NTFS volume.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Move files and directories on an " + "NTFS volume.\n\n", EXEC_NAME, VERSION); ntfs_log_info("Copyright (c) 2003 Richard Russon\n"); ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c index 919ede42..8d1e071c 100644 --- a/ntfsprogs/ntfsresize.c +++ b/ntfsprogs/ntfsresize.c @@ -2387,8 +2387,7 @@ int main(int argc, char **argv) ntfs_log_set_handler(ntfs_log_handler_outerr); - printf("%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + printf("%s v%s (libntfs-3g)\n", EXEC_NAME, VERSION); if (!parse_options(argc, argv)) return 1; diff --git a/ntfsprogs/ntfsrm.c b/ntfsprogs/ntfsrm.c index c121eae1..a651556f 100644 --- a/ntfsprogs/ntfsrm.c +++ b/ntfsprogs/ntfsrm.c @@ -66,8 +66,8 @@ static const char *space_line = " */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Delete files from an NTFS volume.\n\n", - EXEC_NAME, VERSION, ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Delete files from an NTFS volume.\n\n", + EXEC_NAME, VERSION); ntfs_log_info("Copyright (c) 2004 Richard Russon\n"); ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } diff --git a/ntfsprogs/ntfstruncate.c b/ntfsprogs/ntfstruncate.c index c771c04c..647bb2d7 100644 --- a/ntfsprogs/ntfstruncate.c +++ b/ntfsprogs/ntfstruncate.c @@ -169,8 +169,7 @@ static void parse_options(int argc, char *argv[]) if (argc && *argv) EXEC_NAME = *argv; - fprintf(stderr, "%s v%s (libntfs %s)\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + fprintf(stderr, "%s v%s (libntfs-3g)\n", EXEC_NAME, VERSION); while ((c = getopt(argc, argv, "fh?nqvVl")) != EOF) switch (c) { case 'f': diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c index 7ab52292..0968f82f 100644 --- a/ntfsprogs/ntfsundelete.c +++ b/ntfsprogs/ntfsundelete.c @@ -222,9 +222,8 @@ static int parse_inode_arg(void) */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Recover deleted files from an NTFS " - "Volume.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Recover deleted files from an NTFS " + "Volume.\n\n", EXEC_NAME, VERSION); ntfs_log_info("Copyright (c) 2002-2005 Richard Russon\n" "Copyright (c) 2004-2005 Holger Ohmacht\n"); ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); diff --git a/ntfsprogs/ntfswipe.c b/ntfsprogs/ntfswipe.c index da713ca0..42ff7d0e 100644 --- a/ntfsprogs/ntfswipe.c +++ b/ntfsprogs/ntfswipe.c @@ -69,9 +69,8 @@ static struct options opts; */ static void version(void) { - ntfs_log_info("\n%s v%s (libntfs %s) - Overwrite the unused space on an NTFS " - "Volume.\n\n", EXEC_NAME, VERSION, - ntfs_libntfs_version()); + ntfs_log_info("\n%s v%s (libntfs-3g) - Overwrite the unused space on an NTFS " + "Volume.\n\n", EXEC_NAME, VERSION); ntfs_log_info("Copyright (c) 2002-2005 Richard Russon\n"); ntfs_log_info("Copyright (c) 2004 Yura Pakhuchiy\n"); ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); diff --git a/ntfsprogs/utils.h b/ntfsprogs/utils.h index b863ebd2..d0b97753 100644 --- a/ntfsprogs/utils.h +++ b/ntfsprogs/utils.h @@ -101,10 +101,6 @@ int mft_next_record(struct mft_search_ctx *ctx); #define DM_BLUE (1 << 5) #define DM_BOLD (1 << 6) -static __inline__ const char *ntfs_libntfs_version(void) { - return "ntfs-3g unknown version (TODO: find or create a way to extract ntfs-3g version from library)"; -} - /* MAX_PATH definition was missing in ntfs-3g's headers. */ #ifndef MAX_PATH #define MAX_PATH 1024