summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorpaul@teton.kitebird.com <>2004-03-09 11:48:32 -0600
committerpaul@teton.kitebird.com <>2004-03-09 11:48:32 -0600
commit4bbb3573ac68471cb253320f143924a89b9db442 (patch)
tree7d4d7746f32affaa39e6558cdab51673b5ccf163 /extra
parentb55cf65bbd60021360945d991b9acaa18d639d72 (diff)
downloadmariadb-git-4bbb3573ac68471cb253320f143924a89b9db442.tar.gz
Reword comment/help message.
Fix comment typos. (Skipp -> Skip)
Diffstat (limited to 'extra')
-rw-r--r--extra/replace.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/extra/replace.c b/extra/replace.c
index 41312f5e3d4..792684918ea 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -15,6 +15,12 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Replace strings in textfile
+ This program replaces strings in files or from stdin to stdout.
+ It accepts a list of from-string/to-string pairs and replaces
+ each occurrence of a from-string with the corresponding to-string.
+ The first occurrence of a found string is matched. If there is more
+ than one possibility for the string to replace, longer matches
+ are preferred before shorter matches.
This program replace strings in a file or on stdin/stdout.
It accepts a list of from-strings and to-strings and replaces all
occurents of from-strings to to-strings.
@@ -167,7 +173,7 @@ register char **argv[];
break;
case '#':
DBUG_PUSH (++pos);
- pos= (char*) " "; /* Skipp rest of arguments */
+ pos= (char*) " "; /* Skip rest of arguments */
break;
case 'V':
version=1;
@@ -179,12 +185,13 @@ register char **argv[];
if (version)
break;
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
- puts("This program replace strings in a file or on stdin/stdout.\n"
- "It accepts a list of from-strings and to-strings and replaces\n"
- "all occurents of from-strings to to-strings.\n"
- "The first occurents of a found string is matched. Longer matches\n"
- "are prefered before shorter matches.\n\n"
- "Special characters in from string:\n"
+ puts("This program replaces strings in files or from stdin to stdout.\n"
+ "It accepts a list of from-string/to-string pairs and replaces\n"
+ "each occurrence of a from-string with the corresponding to-string.\n"
+ "The first occurrence of a found string is matched. If there is\n"
+ "more than one possibility for the string to replace, longer\n"
+ "matches are preferred before shorter matches.\n\n"
+ "A from-string can contain these special characters:\n"
" \\^ Match start of line.\n"
" \\$ Match end of line.\n"
" \\b Match space-character, start of line or end of line.\n"
@@ -237,7 +244,7 @@ POINTER_ARRAY *from_array,*to_array;
(*argv)++;
}
if (*argc)
- { /* Skipp "--" argument */
+ { /* Skip "--" argument */
(*argc)--;
(*argv)++;
}