updated par2cmdline naming and confirm multithreaded merge

Signed-off-by: BlackEagle <[email protected]>

AUTHORS

@@ -1,9 +1,4 @@
-par2cmdline-mt:
-
-Jussi Kansanen <[email protected]>
-
-par2cmdline:
-
 Peter Brian Clements <[email protected]>
 Marcel Partap <[email protected]>
 Ike Devolder <[email protected]>
+Jussi Kansanen <[email protected]>

README

@@ -1,10 +1,10 @@
-par2cmdline-mt is a multithreaded (OpenMP) PAR 2.0 compatible file verification and repair tool.
+par2cmdline is a PAR 2.0 compatible file verification and repair tool.
 
-To see the ongoing development see
-https://github.com/jkansanen/par2cmdline-mt
+To see the ongoing development see:
+https://github.com/parchive/par2cmdline
 
-Par2cmdline was forked from
-https://github.com/BlackIkeEagle/par2cmdline
+OpenMP multithreading was originally developed by Jussi Kansanen:
+https://github.com/jkansanen/par2cmdline-mt
 
 The original development was done on Sourceforge but stalled.
 For more information from the original authors see
@@ -69,7 +69,7 @@ If you have only downloaded a precompiled executable, then the source
 code should be available from the same location where you downloaded the
 executable from.
 
-*NOT TESTED WITH PAR2CMDLINE-MT* If you have MS Visual Studio .NET, then just open the par2cmdline.sln
+If you have MS Visual Studio .NET, then just open the par2cmdline.sln
 file and compile. You should then copy par2cmdline.exe to an appropriate
 location that is on your path.
 

README.md

@@ -1,10 +1,10 @@
-#par2cmdline-mt
+#par2cmdline
 
-**par2cmdline-mt** is a multithreaded (OpenMP) PAR 2.0 compatible file verification and repair tool.
+**par2cmdline** is a PAR 2.0 compatible file verification and repair tool.
 
-To see the ongoing development see <https://github.com/jkansanen/par2cmdline-mt>
+To see the ongoing development see: <https://github.com/parchive/par2cmdline>
 
-Par2cmdline was forked from <https://github.com/BlackIkeEagle/par2cmdline>
+OpenMP multithreading was originally developed by Jussi Kansanen: <https://github.com/jkansanen/par2cmdline-mt>
 
 The original development was done on Sourceforge but stalled.
 
@@ -48,7 +48,7 @@ You should have received par2cmdline in the form of source code which you can co
 
 If you have only downloaded a precompiled executable, then the source code should be available from the same location where you downloaded the executable from.
 
-*NOT TESTED WITH PAR2CMDLINE-MT* If you have MS Visual Studio .NET, then just open the *par2cmdline.sln* file and compile. You should then copy *par2cmdline.exe* to an appropriate location that is on your path.
+If you have MS Visual Studio .NET, then just open the *par2cmdline.sln* file and compile. You should then copy *par2cmdline.exe* to an appropriate location that is on your path.
 
 To compile on Linux and other Unix variants use the following commands:
 

commandline.cpp

@@ -90,10 +90,10 @@ void CommandLine::banner(void)
 {
   cout << "Copyright (C) 2003-2015 Peter Brian Clements." << endl
     << "Copyright (C) 2011-2012 Marcel Partap." << endl
-    << "Copyright (C) 2012-2015 Ike Devolder." << endl
-    << "Copyright (C) 2014-2016 Jussi Kansanen." << endl
+    << "Copyright (C) 2012-2017 Ike Devolder." << endl
+    << "Copyright (C) 2014-2017 Jussi Kansanen." << endl
     << endl
-    << "par2cmdline-mt comes with ABSOLUTELY NO WARRANTY." << endl
+    << "par2cmdline comes with ABSOLUTELY NO WARRANTY." << endl
     << endl
     << "This is free software, and you are welcome to redistribute it and/or modify" << endl
     << "it under the terms of the GNU General Public License as published by the" << endl
@@ -360,8 +360,8 @@ bool CommandLine::Parse(int argc, char *argv[])
               nthreads = nthreads * 10 + (*p - '0');
               p++;
             }
-            
-            if (!nthreads) 
+
+            if (!nthreads)
             {
               cerr << "Invalid thread option: " << argv[0] << endl;
               return false;

configure.ac

@@ -22,7 +22,7 @@ dnl                                               -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.62)
-AC_INIT([par2cmdline-mt], [0.6.14-mt1], [jussi.kansanen@gmail.com])
+AC_INIT([par2cmdline], [0.6.14], [ike.devolder@gmail.com])
 AC_CONFIG_SRCDIR([par2cmdline.cpp])
 
 AC_CANONICAL_HOST

par2.1

@@ -1,8 +1,8 @@
 .\" Manpage for par2
 .\" Contact [email protected] for mistakes.
-.TH par2 1 "nov 2016" "0.6.14-mt1" "Parity archive utils"
+.TH par2 1 "apr 2017" "0.6.14" "Parity archive utils"
 .SH NAME
-par2 \- Multithreaded PAR 2.0 compatible file verification and repair tool.
+par2 \- PAR 2.0 compatible file verification and repair tool.
 .SH SYNOPSIS
 .B par2 c|v|r
 .RI "[options] <" "PAR2 file" "> [" "files" "]"
@@ -30,7 +30,7 @@ Also:
 .RI "[options] <" "PAR2 file" "> [" "files" "]"
 .br
 .SH DESCRIPTION
-par2cmdline-mt is a program for creating and using PAR2 files to detect damage in data files and repair them if necessary. It can be used with any kind of file.
+par2cmdline is a program for creating and using PAR2 files to detect damage in data files and repair them if necessary. It can be used with any kind of file.
 .SH OPTIONS
 .TP
 .B \-h
@@ -190,6 +190,6 @@ Marcel Partap <[email protected]>
 .br
 Ike Devolder <[email protected]>
 .br
-par2cmdline-mt: Jussi Kansanen <[email protected]>
+Jussi Kansanen <[email protected]>
 .br
 

par2cmdline.vcproj

@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PACKAGE=\&quot;par2cmdline\&quot;;VERSION=\&quot;0.6.14-mt1\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PACKAGE=\&quot;par2cmdline\&quot;;VERSION=\&quot;0.6.14\&quot;"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -73,7 +73,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PACKAGE=\&quot;par2cmdline\&quot;;VERSION=\&quot;0.6.14-mt1\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PACKAGE=\&quot;par2cmdline\&quot;;VERSION=\&quot;0.6.14\&quot;"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"