opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing all references to the libntfs library version until we have such functionality in libntfs-3g.

edge.strict_endians
Erik Larsson 2010-11-22 14:00:04 +01:00
parent bcc00717b0
commit 5b9b4c7e49
20 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ntfsprogs/mkntfs.c
View File

@ -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");

5
ntfsprogs/ntfscat.c
View File

@ -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");

3
ntfsprogs/ntfsclone.c
View File

@ -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);

5
ntfsprogs/ntfscluster.c
View File

@ -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");

3
ntfsprogs/ntfscmp.c
View File

@ -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);

4
ntfsprogs/ntfscp.c
View File

@ -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);
}

5
ntfsprogs/ntfsdecrypt.c
View File

@ -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);

4
ntfsprogs/ntfsdump_logfile.c
View File

@ -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);
}

4
ntfsprogs/ntfsfix.c
View File

@ -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);

5
ntfsprogs/ntfsinfo.c
View File

@ -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");

5
ntfsprogs/ntfslabel.c
View File

@ -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");

5
ntfsprogs/ntfsls.c
View File

@ -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");

3
ntfsprogs/ntfsmftalloc.c
View File

@ -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':

5
ntfsprogs/ntfsmove.c
View File

@ -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);
}

3
ntfsprogs/ntfsresize.c
View File

@ -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;

4
ntfsprogs/ntfsrm.c
View File

@ -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);
}

3
ntfsprogs/ntfstruncate.c
View File

@ -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':

5
ntfsprogs/ntfsundelete.c
View File

@ -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);

5
ntfsprogs/ntfswipe.c
View File

@ -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);

4
ntfsprogs/utils.h
View File

@ -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