From d16c0f581b337c9f182e162d28293b65dee61a60 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sat, 25 Nov 2023 22:12:41 -0600 Subject: [PATCH 1/7] Fix alignment of -q help text --- README.md | 2 +- agrephlp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 077f124..6906030 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ AGREP [-#cdehi[a|#]klnprstvwxyABDGIRS] [-f patternfile] [-H dir] pattern [files] -i# digits-match-digits, letters-letters -i0 case-sensitive search -k treat pattern literally - no meta-characters -l output the names of files that contain a match --n print line numbers of matches -q print buffer byte offsets +-n print line numbers of matches -q print buffer byte offsets -p supersequence search -CP 850|437 set codepage -r recurse subdirectories (UNIX style) -s silent -t for use when delimiter is at the end of records diff --git a/agrephlp.c b/agrephlp.c index d3df89c..d4ad60c 100644 --- a/agrephlp.c +++ b/agrephlp.c @@ -134,7 +134,7 @@ fprintf(stderr,"-i case-insensitive search; ISO <> ASCII -ia ISO chars mapped fprintf(stderr,"-i# digits-match-digits, letters-letters -i0 case-sensitive search\n"); fprintf(stderr,"-k treat pattern literally - no meta-characters\n"); fprintf(stderr,"-l output the names of files that contain a match\n"); -fprintf(stderr,"-n print line numbers of matches -q print buffer byte offsets\n"); +fprintf(stderr,"-n print line numbers of matches -q print buffer byte offsets\n"); fprintf(stderr,"-p supersequence search -CP 850|437 set codepage\n"); fprintf(stderr,"-r recurse subdirectories (UNIX style) -s silent\n"); fprintf(stderr,"-t for use when delimiter is at the end of records\n"); From 9da34353df917205e2caaa168f17ce5f711a9252 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sat, 25 Nov 2023 22:32:09 -0600 Subject: [PATCH 2/7] Fix alignment of -s help text --- README.md | 2 +- agrephlp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6906030..1f5e888 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ AGREP [-#cdehi[a|#]klnprstvwxyABDGIRS] [-f patternfile] [-H dir] pattern [files] -l output the names of files that contain a match -n print line numbers of matches -q print buffer byte offsets -p supersequence search -CP 850|437 set codepage --r recurse subdirectories (UNIX style) -s silent +-r recurse subdirectories (UNIX style) -s silent -t for use when delimiter is at the end of records -v output those records without matches -V[012345V] version / verbose more -w pattern has to match as a word: "win" will not match "wind" diff --git a/agrephlp.c b/agrephlp.c index d4ad60c..b0a00c8 100644 --- a/agrephlp.c +++ b/agrephlp.c @@ -136,7 +136,7 @@ fprintf(stderr,"-k treat pattern literally - no meta-characters\n"); fprintf(stderr,"-l output the names of files that contain a match\n"); fprintf(stderr,"-n print line numbers of matches -q print buffer byte offsets\n"); fprintf(stderr,"-p supersequence search -CP 850|437 set codepage\n"); -fprintf(stderr,"-r recurse subdirectories (UNIX style) -s silent\n"); +fprintf(stderr,"-r recurse subdirectories (UNIX style) -s silent\n"); fprintf(stderr,"-t for use when delimiter is at the end of records\n"); fprintf(stderr,"-v output those records without matches -V[012345V] version / verbose more\n"); fprintf(stderr,"-w pattern has to match as a word: \"win\" will not match \"wind\"\n"); From af38a14dc3370b9b700e12797b3e3567e8476f95 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sat, 25 Nov 2023 22:14:56 -0600 Subject: [PATCH 3/7] Change "unterdruecke" to "suppress" in -u help text --- README.md | 2 +- agrephlp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1f5e888..1224503 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ AGREP [-#cdehi[a|#]klnprstvwxyABDGIRS] [-f patternfile] [-H dir] pattern [files] -t for use when delimiter is at the end of records -v output those records without matches -V[012345V] version / verbose more -w pattern has to match as a word: "win" will not match "wind" --u unterdruecke record output -x pattern must match a whole line +-u suppress record output -x pattern must match a whole line -y suppresses the prompt when used with -B best match option @listfile use the filenames in listfile <1>23456Q ``` diff --git a/agrephlp.c b/agrephlp.c index b0a00c8..1e28537 100644 --- a/agrephlp.c +++ b/agrephlp.c @@ -140,7 +140,7 @@ fprintf(stderr,"-r recurse subdirectories (UNIX style) -s silent\n"); fprintf(stderr,"-t for use when delimiter is at the end of records\n"); fprintf(stderr,"-v output those records without matches -V[012345V] version / verbose more\n"); fprintf(stderr,"-w pattern has to match as a word: \"win\" will not match \"wind\"\n"); -fprintf(stderr,"-u unterdruecke record output -x pattern must match a whole line\n"); +fprintf(stderr,"-u suppress record output -x pattern must match a whole line\n"); fprintf(stderr,"-y suppresses the prompt when used with -B best match option\n"); fprintf(stderr,"@listfile use the filenames in listfile <1>23456Q"); From 0016d6d26d840df36086018601a31e7dea0fd399 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sat, 25 Nov 2023 22:15:45 -0600 Subject: [PATCH 4/7] Change "suppresses" to "suppress" in -y help text --- README.md | 2 +- agrephlp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1224503..98801e4 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ AGREP [-#cdehi[a|#]klnprstvwxyABDGIRS] [-f patternfile] [-H dir] pattern [files] -v output those records without matches -V[012345V] version / verbose more -w pattern has to match as a word: "win" will not match "wind" -u suppress record output -x pattern must match a whole line --y suppresses the prompt when used with -B best match option +-y suppress the prompt when used with -B best match option @listfile use the filenames in listfile <1>23456Q ``` diff --git a/agrephlp.c b/agrephlp.c index 1e28537..3c6bb8f 100644 --- a/agrephlp.c +++ b/agrephlp.c @@ -141,7 +141,7 @@ fprintf(stderr,"-t for use when delimiter is at the end of records\n"); fprintf(stderr,"-v output those records without matches -V[012345V] version / verbose more\n"); fprintf(stderr,"-w pattern has to match as a word: \"win\" will not match \"wind\"\n"); fprintf(stderr,"-u suppress record output -x pattern must match a whole line\n"); -fprintf(stderr,"-y suppresses the prompt when used with -B best match option\n"); +fprintf(stderr,"-y suppress the prompt when used with -B best match option\n"); fprintf(stderr,"@listfile use the filenames in listfile <1>23456Q"); userw; From 6eaab1024862d5aa970b5c217881d9c61c185f5f Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sat, 25 Nov 2023 22:16:31 -0600 Subject: [PATCH 5/7] Change "include" to "enclose" in help text --- agrephlp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agrephlp.c b/agrephlp.c index 3c6bb8f..bf40369 100644 --- a/agrephlp.c +++ b/agrephlp.c @@ -149,7 +149,7 @@ userw; PAGE2: one_line_help(); fprintf(stderr,"\nThe pattern MUST BE ENCLOSED in \"DOUBLE QUOTES\" if it contains one of the\n"); -fprintf(stderr,"following METASYMBOLS. Good practice is always to include it in double quotes.\n\n"); +fprintf(stderr,"following METASYMBOLS. Good practice is always to enclose it in double quotes.\n\n"); fprintf(stderr,"METASYMBOLS:\n"); fprintf(stderr,"\\z turns off any special meaning of character z (\\# matches #)\n"); From 57defd46b24dddd98257dd286a8dcdcbaed4c6c2 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sat, 25 Nov 2023 22:20:42 -0600 Subject: [PATCH 6/7] Change "begin of" to "beginning of" --- agrep.c | 8 ++++---- agrep.h | 4 ++-- agrephlp.c | 2 +- maskgen.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/agrep.c b/agrep.c index 765eeb5..ad1d683 100644 --- a/agrep.c +++ b/agrep.c @@ -579,7 +579,7 @@ int Text, M, D; } r3 = Init0; r2 = ((Next[r3>>hh] | Next1[r3&LL]) & CMask) | Init0; - /* match begin of line */ + /* match beginning of line */ if (DELIMITER) CurrentByteOffset += 1*D_length; else CurrentByteOffset += 1*1; } @@ -636,7 +636,7 @@ int Text, M, D; } r2 = Init0; r3 = ((Next[r2>>hh] | Next1[r2&LL]) & CMask) | Init0; - /* match begin of line */ + /* match beginning of line */ if (DELIMITER) CurrentByteOffset += 1*D_length; else CurrentByteOffset += 1*1; } @@ -714,7 +714,7 @@ int Text, M, D; } r3 = Init0; r2 = ((Next[r3>>hh] | Next1[r3&LL]) & CMask) | Init0; - /* match begin of line */ + /* match beginning of line */ if (DELIMITER) CurrentByteOffset += 1*D_length; else CurrentByteOffset += 1*1; } @@ -771,7 +771,7 @@ int Text, M, D; } r2 = Init0; r3 = ((Next[r2>>hh] | Next1[r2&LL]) & CMask) | Init0; - /* match begin of line */ + /* match beginning of line */ if (DELIMITER) CurrentByteOffset += 1*D_length; else CurrentByteOffset += 1*1; } diff --git a/agrep.h b/agrep.h index 9bfd0ec..70047ce 100644 --- a/agrep.h +++ b/agrep.h @@ -79,7 +79,7 @@ #define STAR 145 /* closure */ #define HYPHEN 129 /* - */ #define NOCARE 130 /* . */ -#define NNLINE 131 /* special symbol for newline in begin of pattern*/ +#define NNLINE 131 /* special symbol for newline in beginning of pattern */ /* matches '\n' and NNLINE */ #define USERRANGE_MIN 128 /* min char in pattern of user: give warning */ #define USERRANGE_MAX 145 /* max char in pattern of user: give warning */ @@ -117,7 +117,7 @@ extern unsigned char metasymb[16]; #define STAR metasymb[12] /* * closure */ #define HYPHEN metasymb[13] /* - */ #define NOCARE metasymb[14] /* . */ -#define NNLINE metasymb[15] /* special symbol for newline in begin of pattern*/ +#define NNLINE metasymb[15] /* special symbol for newline in beginning of pattern */ /* matches '\n' and NNLINE */ /* not used anymore: [TG] */ diff --git a/agrephlp.c b/agrephlp.c index bf40369..8791f8b 100644 --- a/agrephlp.c +++ b/agrephlp.c @@ -153,7 +153,7 @@ fprintf(stderr,"following METASYMBOLS. Good practice is always to enclose it in fprintf(stderr,"METASYMBOLS:\n"); fprintf(stderr,"\\z turns off any special meaning of character z (\\# matches #)\n"); -fprintf(stderr,"^ begin-of-line symbol\n"); +fprintf(stderr,"^ beginning-of-line symbol\n"); fprintf(stderr,"$ end-of-line symbol\n"); fprintf(stderr,". matches any single character (except newline)\n"); fprintf(stderr,"# matches any number > 0 of arbitrary characters\n"); diff --git a/maskgen.c b/maskgen.c index e8e28e9..df30571 100644 --- a/maskgen.c +++ b/maskgen.c @@ -225,7 +225,7 @@ int D; Init[0] = Init[0] | endposition; /* not necessary for INit[i], i>0, */ - /* but at every begining of the matching process append one + /* but at every beginning of the matching process append one no-match character to initialize the error vectors */ endposition = ( endposition << 1 ) + 1; From a0850ccfaaf13dbc80ed580ddd1fba95881b4f4b Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sat, 25 Nov 2023 22:22:07 -0600 Subject: [PATCH 7/7] Change "built-in" to "built into" in help text --- agrephlp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agrephlp.c b/agrephlp.c index 8791f8b..f982034 100644 --- a/agrephlp.c +++ b/agrephlp.c @@ -229,7 +229,7 @@ if ((cpage=get_current_codepage()) != -1) fprintf(stderr,"is CP %d.\n\n",cpage); else fprintf(stderr,"could not be detected. AGREP will use CP850 by default.\n\n"); fprintf(stderr," The codepage setting affects the uppercase-lowercase translation table\n"); -fprintf(stderr," built-in AGREP when you use one of the options -i, -ia or -i# .\n"); +fprintf(stderr," built into AGREP when you use one of the options -i, -ia or -i# .\n"); fprintf(stderr," The translation table can be printed by using verbose option -V5.\n\n"); fprintf(stderr,"The default verbose option is %d 123<4>56Q",VERBOSE);