Description: fix some typos and mistakes in binaries.
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Last-Update: 2014-10-01
Index: afflib-3.7.4+dfsg/tools/affcopy.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affcopy.cpp
+++ afflib-3.7.4+dfsg/tools/affcopy.cpp
@@ -51,7 +51,7 @@ using namespace aff;
 #include "unix4win32.h"
 #endif
 
-const char *progname = "afcopy";
+const char *progname = "affcopy";
 
 int opt_verbose = 0;
 int opt_debug = 0;
@@ -99,7 +99,7 @@ void usage()
     printf("   -k filename.key   = specify private key for signing\n");
     printf("   -c filename.cer   = specify a X.509 certificate that matches the private key\n");
     printf("                       (by default, the file is assumed to be the same one\n");
-    printf("                       provided with the -k option.)");
+    printf("                       provided with the -k option.)\n");
     printf("   -n  = read notes to accompany the copy from standard in.\n");
     printf("\n");
     printf("\nEncryption Options:");
@@ -469,7 +469,7 @@ int afcopy(char *infile,vector<string> &
 	AFFILE *af = afouts.begin()->af;
 	uint64_t w = af->bytes_written;
 	double sec = ((t1.tv_sec-t0.tv_sec)+(t1.tv_usec-t0.tv_usec)/1000000.0);
-	printf("%s: %"I64d" bytes transfered in %.2f seconds. xfer rate: %.2f MBytes/sec\n",
+	printf("%s: %"I64d" bytes transferred in %.2f seconds. xfer rate: %.2f MBytes/sec\n",
 	       af_filename(af),w,sec,(w/1000000.0) / sec);
     }
 	
Index: afflib-3.7.4+dfsg/tools/affcat.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affcat.cpp
+++ afflib-3.7.4+dfsg/tools/affcat.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 vector <int64_t> pages;
 
-const char *progname = "afcat";
+const char *progname = "affcat";
 int  opt_info     = 0;
 char *opt_segname=0;
 int64_t  opt_pagenum = -1;
@@ -37,8 +37,8 @@ vector<string> opt_r;
 
 void usage()
 {
-    printf("afcat version %s\n",PACKAGE_VERSION);
-    printf("usage: afcat [options] infile [... more infiles]\n");
+    printf("affcat version %s\n",PACKAGE_VERSION);
+    printf("usage: affcat [options] infile [... more infiles]\n");
     printf("options:\n");
     printf("    -s name --- Just output segment name\n");
     printf("    -p ###  --- just output data page number ###\n");
@@ -59,7 +59,7 @@ const char *current_fname = 0;
 int64_t current_page = -1;
 void sig_info(int arg)
 {
-    fprintf(stderr,"afcat ");
+    fprintf(stderr,"affcat ");
     if(current_fname) fprintf(stderr,"%s: ",current_fname);
     if(current_page>=0) fprintf(stderr,"[%"PRId64"] ",current_page);
     fflush(stderr);
@@ -99,12 +99,12 @@ int output_page(AFFILE *af,FILE *outfile
     int bytes = af_read(af,buf,af->image_pagesize); // read what we can
 
     if(bytes<0){
-	if(opt_debug) fprintf(stderr,"afcat: cannot read page %"I64d"\n",pagenum);
+	if(opt_debug) fprintf(stderr,"affcat: cannot read page %"I64d"\n",pagenum);
 	return -1;
     }
 
     if(opt_debug){
-	fprintf(stderr,"afcat: page:%"I64d" bytes: %d offset:%"I64d"\n",
+	fprintf(stderr,"affcat: page:%"I64d" bytes: %d offset:%"I64d"\n",
 		pagenum, bytes,offset);
     }
 
@@ -136,7 +136,7 @@ int afcat(AFFILE *af)
 #ifdef WIN32
     _setmode(fileno(stdout),_O_BINARY);
 #endif
-    if(opt_debug) fprintf(stderr,"afcat(%s)\n",af_filename(af));
+    if(opt_debug) fprintf(stderr,"affcat(%s)\n",af_filename(af));
 
     if(opt_segname){
 	/* First figure out how big the segment is */
@@ -244,8 +244,8 @@ int afcat(AFFILE *af)
     sort(pages.begin(),pages.end());
 
     if(pages.size()==0 && encrypted_segments){
-	fprintf(stderr,"afcat: This file has %d encrypted segments.\n",encrypted_segments);
-	fprintf(stderr,"afcat: No unencrypted pages could be found.\n");
+	fprintf(stderr,"affcat: This file has %d encrypted segments.\n",encrypted_segments);
+	fprintf(stderr,"affcat: No unencrypted pages could be found.\n");
     }
 	
     /* Now I have a list of pages; cat each one */
@@ -256,10 +256,10 @@ int afcat(AFFILE *af)
 	int page = *i;
 	if(page != next_page && opt_quiet==0){
 	    if(page == next_page+1 ){
-		fprintf(stderr,"afcat: page %d not in file\n",next_page);
+		fprintf(stderr,"affcat: page %d not in file\n",next_page);
 	    }
 	    else{
-		fprintf(stderr,"afcat: pages %d through %d not in file\n",
+		fprintf(stderr,"affcat: pages %d through %d not in file\n",
 			next_page,page-1);
 	    }
 	}
@@ -270,7 +270,7 @@ int afcat(AFFILE *af)
 
 	//fprintf(stderr,"bytes written=%qd imagesize=%qd\n",total_bytes_written,imagesize);
 	if((total_bytes_written > imagesize) && (imagesize>0)){
-	    err(1,"afcat internal error. bytes written=%"I64d" imagesize=%" I64d,
+	    err(1,"affcat internal error. bytes written=%"I64d" imagesize=%" I64d,
 		(int64_t)total_bytes_written,
 		(int64_t)imagesize);
 	    return -1;
Index: afflib-3.7.4+dfsg/tools/affcompare.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affcompare.cpp
+++ afflib-3.7.4+dfsg/tools/affcompare.cpp
@@ -92,7 +92,7 @@ void usage()
     printf("       compares file1 with file2\n");
     printf("\n");
     printf("or     affcompare [options] -r dir1 dir2\n");
-    printf("       comparses similarly-named files in dir1 and dir2\n");
+    printf("       compares similarly-named files in dir1 and dir2\n");
     printf("\n");
     printf("or     affcompare [options] -s file1 file2...\n");
     printf("       Reports if file was successfully copied to Amazon S3\n");
@@ -118,7 +118,6 @@ void usage()
     printf("       -c        --- print the contents of differing sectors\n");
     printf("       -m        --- Just report about the data (ignore metadata)\n");
     printf("       -P ###    --- Just examine the differences on page ###\n");
-    printf("       -q        --- Quiet; no output except for errors.\n");
     printf("\n");
     printf("Options documented above:\n");
     printf("       -r dir1 dir2 --- recursively compare what's in dir1 with dir2, and\n");
Index: afflib-3.7.4+dfsg/tools/affcrypto.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affcrypto.cpp
+++ afflib-3.7.4+dfsg/tools/affcrypto.cpp
@@ -83,8 +83,8 @@ void get_and_change_passphrase(const cha
 
 void usage()
 {
-    printf("afcrypto version %s\n",PACKAGE_VERSION);
-    printf("usage: afcrypto [options] filename.aff [filename2.aff ... ]\n");
+    printf("affcrypto version %s\n",PACKAGE_VERSION);
+    printf("usage: affcrypto [options] filename.aff [filename2.aff ... ]\n");
     printf("   prints if each file is encrypted or not.\n");
     printf("options:\n");
     printf("    -x      --- output in XML\n");
@@ -525,7 +525,7 @@ int main(int argc,char **argv)
 	
 	if(opt_xml){
 	    /* This should be replaced with our xml.cpp object */
-	    printf("<afcrypto>\n");
+	    printf("<affcrypto>\n");
 	    printf("  <image_filename>%s</image_filename>\n",fname);
 	    printf("  <segment_count_total>%d</segment_count_total>\n",vni.segment_count_total);
 	    printf("  <segment_count_signed>%d</segment_count_signed>\n",vni.segment_count_signed);
@@ -535,7 +535,7 @@ int main(int argc,char **argv)
 	    if(the_passphrase){
 		printf("  <passphrase correct='1'>%s</passphrase>\n",the_passphrase);
 	    }
-	    printf("</afcrypto>\n");
+	    printf("</affcrypto>\n");
 	}
 	else{
 	    /* re-run vstat because counts may have changed */
Index: afflib-3.7.4+dfsg/tools/affdiskprint.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affdiskprint.cpp
+++ afflib-3.7.4+dfsg/tools/affdiskprint.cpp
@@ -69,7 +69,7 @@ using namespace std;
 #define O_BINARY 0
 #endif
 
-const char *progname = "afdiskprint";
+const char *progname = "affdiskprint";
 const char *xml_special_chars = "<>\r\n&'\"";
 
 void usage()
Index: afflib-3.7.4+dfsg/tools/affinfo.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affinfo.cpp
+++ afflib-3.7.4+dfsg/tools/affinfo.cpp
@@ -49,7 +49,7 @@ using namespace std;
 #include "unix4win32.h"
 #endif
 
-const char *progname = "afinfo";
+const char *progname = "affinfo";
 
 #define VALIDATE_MD5  0x01
 #define VALIDATE_SHA1 0x02
Index: afflib-3.7.4+dfsg/tools/affrecover.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affrecover.cpp
+++ afflib-3.7.4+dfsg/tools/affrecover.cpp
@@ -39,7 +39,7 @@
 using namespace std;
 using namespace aff;
 
-const char *progname = "affix";
+const char *progname = "affrecover";
 
 
 int opt_b = 0;
Index: afflib-3.7.4+dfsg/tools/affsegment.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affsegment.cpp
+++ afflib-3.7.4+dfsg/tools/affsegment.cpp
@@ -66,7 +66,7 @@ extern "C" {
 using namespace std;
 
 
-const char *progname = "afsegment";
+const char *progname = "affsegment";
 
 int opt_create = 0;
 int opt_quad = 0;
@@ -78,9 +78,9 @@ int opt_x = 0;
 
 void usage()
 {
-    printf("afsegment version %s\n",PACKAGE_VERSION);
+    printf("affsegment version %s\n",PACKAGE_VERSION);
 #ifdef REG_EXTENDED
-    printf("usage: afsegment [options] file1.aff [file2.aff ...]\n");
+    printf("usage: affsegment [options] file1.aff [file2.aff ...]\n");
     printf("options:\n");
     printf("    -c              Create AFF files if they do not exist\n");
     printf("    -ssegval        Sets the value of a segment; may be repeated\n");
@@ -110,7 +110,7 @@ void usage()
     printf("Note: All deletions are done first, then all updates. Don't specify the\n");
     printf("same segment twice on one command line.\n");
 #else
-    printf("afsegment requires a functioning regex package to be installed\n");
+    printf("affsegment requires a functioning regex package to be installed\n");
 #endif    
     exit(0);
 }
Index: afflib-3.7.4+dfsg/tools/affsign.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affsign.cpp
+++ afflib-3.7.4+dfsg/tools/affsign.cpp
@@ -32,7 +32,7 @@ const char *opt_sign_cert_file = 0;
 using namespace std;
 using namespace aff;
 
-const char *progname = "afsign";
+const char *progname = "affsign";
 
 void usage()
 {
@@ -307,7 +307,7 @@ int main(int argc,char **argv)
 #else
 int main(int argc,char **argv)
 {
-    fprintf(stderr,"afflib compiled without USE_AFFSIGS.  afsign cannot run.\n");
+    fprintf(stderr,"afflib compiled without USE_AFFSIGS.  affsign cannot run.\n");
     exit(-1);
 }
 
Index: afflib-3.7.4+dfsg/tools/affstats.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affstats.cpp
+++ afflib-3.7.4+dfsg/tools/affstats.cpp
@@ -82,7 +82,7 @@
 #include <malloc.h>
 #endif
 
-const char *progname = "afstats";
+const char *progname = "affstats";
 int  opt_m = 0;
 
 void usage()
Index: afflib-3.7.4+dfsg/tools/affverify.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affverify.cpp
+++ afflib-3.7.4+dfsg/tools/affverify.cpp
@@ -30,15 +30,15 @@
 using namespace std;
 using namespace aff;
 
-const char *progname = "afcrypto";
+const char *progname = "affverify";
 int opt_change = 0;
 int opt_verbose = 0;
 int opt_all = 0;
 
 void usage()
 {
-    printf("afverify version %s\n",PACKAGE_VERSION);
-    printf("usage: afverify [options] filename.aff\n");
+    printf("affverify version %s\n",PACKAGE_VERSION);
+    printf("usage: affverify [options] filename.aff\n");
     printf("Verifies the digital signatures on a file\n");
     printf("options:\n");
     printf("    -a      --- print all segments\n");
Index: afflib-3.7.4+dfsg/tools/affxml.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affxml.cpp
+++ afflib-3.7.4+dfsg/tools/affxml.cpp
@@ -72,7 +72,7 @@ using namespace std;
 #define isalphanum(c) (isalpha(c)||isdigit(c))
 #endif
 
-const char *progname = "afxml";
+const char *progname = "affxml";
 
 int opt_x = 0;
 char **opt_j = 0;
@@ -149,7 +149,7 @@ int xml_info(const char *infile)
     struct page_stat_block psb;
     memset(&psb,0,sizeof(psb));
 
-    printf("<!-- XML generated by afxml version %s -->\n",PACKAGE_VERSION);
+    printf("<!-- XML generated by affxml version %s -->\n",PACKAGE_VERSION);
     printf("<affinfo");
     if(!opt_x) printf(" image_filename='%s'",infile);
     printf(">\n");
Index: afflib-3.7.4+dfsg/tools/affconvert.cpp
===================================================================
--- afflib-3.7.4+dfsg.orig/tools/affconvert.cpp
+++ afflib-3.7.4+dfsg/tools/affconvert.cpp
@@ -83,7 +83,8 @@ void usage()
     printf("\n");
     printf("usage:   %s [options] file1 [... files] \n",progname);
     printf("\n");
-    printf("examples:\n");
+    printf("Please, see more info in manpage.");
+/*    printf("examples:\n");
     printf("  %s file1.iso --- convert file1.iso to file1.aff\n",progname);
     printf("  %s file1.iso file2.iso file3.iso...  --- batch convert files\n",progname);
     printf("  %s -r -e iso image.aff --- convert image.aff to image.iso\n",progname);
@@ -116,6 +117,7 @@ void usage()
     printf("      -Z       -- Do not automatically probe for gzip/bzip2 compression.\n");
     printf("      -y       -- Always answer yes/no questions 'yes.'\n");
     printf("      -V = Just print the version number and exit.\n");
+*/
     printf("\n");
     exit(0);
 }
