From d2daead832958e1750fb802a136bcff4293db63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= Date: Sun, 16 Feb 2014 18:25:09 +0100 Subject: [PATCH] Updated copyright claims --- ntfsprogs/ntfsclone.8.in | 3 ++- ntfsprogs/ntfsclone.c | 22 +++++++++++++++++++++- ntfsprogs/ntfsfix.8.in | 3 ++- ntfsprogs/ntfsfix.c | 4 ++-- ntfsprogs/ntfsinfo.c | 2 ++ ntfsprogs/ntfslabel.8.in | 3 ++- ntfsprogs/ntfsresize.8.in | 3 ++- ntfsprogs/ntfsresize.c | 2 +- src/ntfs-3g.c | 2 +- 9 files changed, 35 insertions(+), 9 deletions(-) diff --git a/ntfsprogs/ntfsclone.8.in b/ntfsprogs/ntfsclone.8.in index 223ef7fc..d156634c 100644 --- a/ntfsprogs/ntfsclone.8.in +++ b/ntfsprogs/ntfsclone.8.in @@ -1,9 +1,10 @@ .\" Copyright (c) 2003\-2005 Richard Russon. .\" Copyright (c) 2003\-2006 Szabolcs Szakacsits. .\" Copyright (c) 2004 Per Olofsson. +.\" Copyright (c) 2010\-2013 Jean-Pierre Andre. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH NTFSCLONE 8 "February 2006" "ntfs-3g @VERSION@" +.TH NTFSCLONE 8 "February 2013" "ntfs-3g @VERSION@" .SH NAME ntfsclone \- Efficiently clone, image, restore or rescue an NTFS .SH SYNOPSIS diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c index 967dd95f..481ebf34 100644 --- a/ntfsprogs/ntfsclone.c +++ b/ntfsprogs/ntfsclone.c @@ -369,6 +369,7 @@ static void usage(void) #ifdef DEBUG " -d, --debug Show debug information\n" #endif + " -V, --version Display version information\n" "\n" " If FILE is '-' then send the image to the standard output. If SOURCE is '-'\n" " and --restore-image is used then read the image from the standard input.\n" @@ -377,9 +378,24 @@ static void usage(void) exit(1); } +/** + * version + */ +__attribute__((noreturn)) +static void version(void) +{ + fprintf(stderr, + "Efficiently clone, image, restore or rescue an NTFS Volume.\n\n" + "Copyright (c) 2003-2006 Szabolcs Szakacsits\n" + "Copyright (c) 2004-2006 Anton Altaparmakov\n" + "Copyright (c) 2010-2013 Jean-Pierre Andre\n\n"); + fprintf(stderr, "%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home); + exit(1); +} + static void parse_options(int argc, char **argv) { - static const char *sopt = "-dfhmno:O:qrst"; + static const char *sopt = "-dfhmno:O:qrstV"; static const struct option lopt[] = { #ifdef DEBUG { "debug", no_argument, NULL, 'd' }, @@ -398,6 +414,7 @@ static void parse_options(int argc, char **argv) { "new-half-serial", no_argument, NULL, 'i' }, { "save-image", no_argument, NULL, 's' }, { "preserve-timestamps", no_argument, NULL, 't' }, + { "version", no_argument, NULL, 'V' }, { NULL, 0, NULL, 0 } }; @@ -458,6 +475,9 @@ static void parse_options(int argc, char **argv) case 't': opt.preserve_timestamps++; break; + case 'V': + version(); + break; default: err_printf("Unknown option '%s'.\n", argv[optind-1]); usage(); diff --git a/ntfsprogs/ntfsfix.8.in b/ntfsprogs/ntfsfix.8.in index 8976c90c..51010001 100644 --- a/ntfsprogs/ntfsfix.8.in +++ b/ntfsprogs/ntfsfix.8.in @@ -1,8 +1,9 @@ .\" Copyright (c) 2005-2006 Szabolcs Szakacsits. .\" Copyright (c) 2005 Richard Russon. +.\" Copyright (c) 2011-2013 Jean-Pierre Andre .\" This file may be copied under the terms of the GNU Public License. .\" -.TH NTFSFIX 8 "January 2006" "ntfs-3g @VERSION@" +.TH NTFSFIX 8 "January 2013" "ntfs-3g @VERSION@" .SH NAME ntfsfix \- fix common errors and force Windows to check NTFS .SH SYNOPSIS diff --git a/ntfsprogs/ntfsfix.c b/ntfsprogs/ntfsfix.c index 375e1527..86bb0a6b 100644 --- a/ntfsprogs/ntfsfix.c +++ b/ntfsprogs/ntfsfix.c @@ -153,8 +153,8 @@ static void version(void) "Attempt to fix an NTFS partition.\n\n" "Copyright (c) 2000-2006 Anton Altaparmakov\n" "Copyright (c) 2002-2006 Szabolcs Szakacsits\n" - "Copyright (c) 2007 Yura Pakhuchiy\n\n" - "Copyright (c) 2011 Jean-Pierre Andre\n\n", + "Copyright (c) 2007 Yura Pakhuchiy\n" + "Copyright (c) 2011-2012 Jean-Pierre Andre\n\n", EXEC_NAME, VERSION); ntfs_log_info("%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home); exit(1); diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c index 32f82e76..d8a540b6 100644 --- a/ntfsprogs/ntfsinfo.c +++ b/ntfsprogs/ntfsinfo.c @@ -8,6 +8,7 @@ * Copyright (c) 2004-2005 Yuval Fledel * Copyright (c) 2004-2007 Yura Pakhuchiy * Copyright (c) 2005 Cristian Klein + * Copyright (c) 2011-2012 Jean-Pierre Andre * * This utility will dump a file's attributes. * @@ -118,6 +119,7 @@ static void version(void) printf(" 2003 Leonard Norrgård\n"); printf(" 2004-2005 Yuval Fledel\n"); printf(" 2004-2007 Yura Pakhuchiy\n"); + printf(" 2011-2012 Jean-Pierre Andre\n"); printf("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); } diff --git a/ntfsprogs/ntfslabel.8.in b/ntfsprogs/ntfslabel.8.in index 291ba539..dcd4d00e 100644 --- a/ntfsprogs/ntfslabel.8.in +++ b/ntfsprogs/ntfslabel.8.in @@ -1,8 +1,9 @@ .\" Copyright (c) 2002\-2004 Anton Altaparmakov. .\" Copyright (c) 2005 Richard Russon. +.\" Copyright (c) 2012 Jean-Pierre Andre. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH NTFSLABEL 8 "November 2005" "ntfs-3g @VERSION@" +.TH NTFSLABEL 8 "January 2012" "ntfs-3g @VERSION@" .SH NAME ntfslabel \- display/change the label on an ntfs file system .SH SYNOPSIS diff --git a/ntfsprogs/ntfsresize.8.in b/ntfsprogs/ntfsresize.8.in index 6927cc4b..177eb500 100644 --- a/ntfsprogs/ntfsresize.8.in +++ b/ntfsprogs/ntfsresize.8.in @@ -1,8 +1,9 @@ .\" Copyright (c) 2002\-2006 Szabolcs Szakacsits. .\" Copyright (c) 2005 Richard Russon. +.\" Copyright (c) 2011\-2013 Jean-Pierre Andre. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH NTFSRESIZE 8 "February 2006" "ntfs-3g @VERSION@" +.TH NTFSRESIZE 8 "July 2013" "ntfs-3g @VERSION@" .SH NAME ntfsresize \- resize an NTFS filesystem without data loss .SH SYNOPSIS diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c index 6f541811..552bfd3a 100644 --- a/ntfsprogs/ntfsresize.c +++ b/ntfsprogs/ntfsresize.c @@ -404,7 +404,7 @@ static void version(void) printf("Copyright (c) 2002-2005 Anton Altaparmakov\n"); printf("Copyright (c) 2002-2003 Richard Russon\n"); printf("Copyright (c) 2007 Yura Pakhuchiy\n"); - printf("Copyright (c) 2011-2012 Jean-Pierre Andre\n"); + printf("Copyright (c) 2011-2013 Jean-Pierre Andre\n"); printf("\n%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home); } diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c index d05ae1f5..cdf91f21 100644 --- a/src/ntfs-3g.c +++ b/src/ntfs-3g.c @@ -168,7 +168,7 @@ static const char *usage_msg = "\n" "Copyright (C) 2005-2007 Yura Pakhuchiy\n" "Copyright (C) 2006-2009 Szabolcs Szakacsits\n" -"Copyright (C) 2007-2012 Jean-Pierre Andre\n" +"Copyright (C) 2007-2013 Jean-Pierre Andre\n" "Copyright (C) 2009 Erik Larsson\n" "\n" "Usage: %s [-o option[,...]] \n"