[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, master, updated. gawk-4.1.0-3909-g6514b3a
|
From: |
Arnold Robbins |
|
Subject: |
[SCM] gawk branch, master, updated. gawk-4.1.0-3909-g6514b3a |
|
Date: |
Mon, 9 Mar 2020 06:54:26 -0400 (EDT) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, master has been updated
via 6514b3a2f5ed8c593d7d49526a27122989e673d0 (commit)
from e26cf22ad5c7d772ecc0c195bfbc612f1bb1f5b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=6514b3a2f5ed8c593d7d49526a27122989e673d0
commit 6514b3a2f5ed8c593d7d49526a27122989e673d0
Author: Arnold D. Robbins <address@hidden>
Date: Mon Mar 9 12:54:05 2020 +0200
First round of message improvements.
diff --git a/ChangeLog b/ChangeLog
index 13ed060..06bb90f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-09 Arnold D. Robbins <address@hidden>
+
+ * array.c, awk.h, awkgram.y, builtin.c, command.y, debug.c,
+ ext.c, int_array.c, io.c, main.c, symbol.c: Messages refined
+ based on suggestions from Roland Illig <address@hidden>.
+
2020-03-06 Jannick <address@hidden>
* Makefile.am: Replace AM_MAKEFLAGS with AM_CFLAGS and AM_LDFLAGS.
diff --git a/array.c b/array.c
index fa9c2d9..4a0d856 100644
--- a/array.c
+++ b/array.c
@@ -779,7 +779,7 @@ do_adump(int nargs)
}
symbol = POP_PARAM();
if (symbol->type != Node_var_array)
- fatal(_("adump: first argument not an array"));
+ fatal(_("%s: first argument is not an array"), "adump");
ndump.type = Node_dump_array;
ndump.adepth = depth;
@@ -820,39 +820,33 @@ asort_actual(int nargs, sort_context_t ctxt)
if (nargs >= 2) { /* 2nd optional arg */
dest = POP_PARAM();
if (dest->type != Node_var_array) {
- fatal(ctxt == ASORT ?
- _("asort: second argument not an array") :
- _("asorti: second argument not an array"));
+ fatal(_("%s: second argument is not an array"),
+ ctxt == ASORT ? "asort" : "asorti");
}
}
array = POP_PARAM();
if (array->type != Node_var_array) {
- fatal(ctxt == ASORT ?
- _("asort: first argument not an array") :
- _("asorti: first argument not an array"));
+ fatal(_("%s: first argument is not an array"),
+ ctxt == ASORT ? "asort" : "asorti");
}
else if (array == symbol_table)
- fatal(ctxt == ASORT ?
- _("asort: first argument cannot be SYMTAB") :
- _("asorti: first argument cannot be SYMTAB"));
+ fatal(_("%s: first argument cannot be SYMTAB"),
+ ctxt == ASORT ? "asort" : "asorti");
else if (array == func_table)
- fatal(ctxt == ASORT ?
- _("asort: first argument cannot be FUNCTAB") :
- _("asorti: first argument cannot be FUNCTAB"));
+ fatal(_("%s: first argument cannot be FUNCTAB"),
+ ctxt == ASORT ? "asort" : "asorti");
if (dest != NULL) {
for (r = dest->parent_array; r != NULL; r = r->parent_array) {
if (r == array)
- fatal(ctxt == ASORT ?
- _("asort: cannot use a subarray of
first arg for second arg") :
- _("asorti: cannot use a subarray of
first arg for second arg"));
+ fatal(_("%s: cannot use a subarray of first
argument for second argument"),
+ ctxt == ASORT ? "asort" : "asorti");
}
for (r = array->parent_array; r != NULL; r = r->parent_array) {
if (r == dest)
- fatal(ctxt == ASORT ?
- _("asort: cannot use a subarray of
second arg for first arg") :
- _("asorti: cannot use a subarray of
second arg for first arg"));
+ fatal(_("%s: cannot use a subarray of second
argument for first argument"),
+ ctxt == ASORT ? "asort" : "asorti");
}
}
diff --git a/awk.h b/awk.h
index ff14250..f15fe7e 100644
--- a/awk.h
+++ b/awk.h
@@ -1989,7 +1989,7 @@ emalloc_real(size_t count, const char *where, const char
*var, const char *file,
ret = (void *) malloc(count);
if (ret == NULL)
- fatal(_("%s:%d:%s: %s: can't allocate %ld bytes of memory
(%s)"),
+ fatal(_("%s:%d:%s: %s: cannot allocate %ld bytes of memory:
%s"),
file, line, where, var, (long) count, strerror(errno));
return ret;
@@ -2007,7 +2007,7 @@ ezalloc_real(size_t count, const char *where, const char
*var, const char *file,
ret = (void *) calloc(1, count);
if (ret == NULL)
- fatal(_("%s:%d:%s: %s: can't allocate %ld bytes of memory
(%s)"),
+ fatal(_("%s:%d:%s: %s: cannot allocate %ld bytes of memory:
%s"),
file, line, where, var, (long) count, strerror(errno));
return ret;
@@ -2025,7 +2025,7 @@ erealloc_real(void *ptr, size_t count, const char *where,
const char *var, const
ret = (void *) realloc(ptr, count);
if (ret == NULL)
- fatal(_("%s:%d:%s: %s: can't reallocate %ld bytes of memory
(%s)"),
+ fatal(_("%s:%d:%s: %s: cannot reallocate %ld bytes of memory:
%s"),
file, line, where, var, (long) count, strerror(errno));
return ret;
diff --git a/awkgram.c b/awkgram.c
index b5354bc..cb24643 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -4303,7 +4303,7 @@ regular_print:
f->opcode = Op_indirect_func_call;
name = estrdup(f->func_name, strlen(f->func_name));
if (is_std_var(name))
- yyerror(_("can not use special variable `%s' for
indirect function call"), name);
+ yyerror(_("cannot use special variable `%s' for
indirect function call"), name);
indirect_var = variable(f->source_line, name, Node_var_new);
t = instruction(Op_push);
t->memory = indirect_var;
@@ -5439,8 +5439,8 @@ add_srcfile(enum srctype stype, char *src, SRCFILE
*thisfile, bool *already_incl
}
/* use full messages to ease translation */
fatal(stype != SRC_EXTLIB
- ? _("can't open source file `%s' for reading (%s)")
- : _("can't open shared library `%s' for reading (%s)"),
+ ? _("cannot open source file `%s' for reading: %s")
+ : _("cannot open shared library `%s' for reading: %s"),
src,
errno_val ? strerror(errno_val) : _("reason
unknown"));
}
@@ -5451,7 +5451,7 @@ add_srcfile(enum srctype stype, char *src, SRCFILE
*thisfile, bool *already_incl
if (stype == SRC_INC || stype == SRC_EXTLIB) {
/* eliminate duplicates */
if ((stype == SRC_INC) && (s->stype ==
SRC_FILE))
- fatal(_("can't include `%s' and use it
as a program file"), src);
+ fatal(_("cannot include `%s' and use it
as a program file"), src);
if (do_lint) {
int line = sourceline;
@@ -5475,7 +5475,7 @@ add_srcfile(enum srctype stype, char *src, SRCFILE
*thisfile, bool *already_incl
} else {
/* duplicates are allowed for -f */
if (s->stype == SRC_INC)
- fatal(_("can't include `%s' and use it
as a program file"), src);
+ fatal(_("cannot include `%s' and use it
as a program file"), src);
/* no need to scan for further matches, since
* they must be of homogeneous type */
break;
@@ -5517,7 +5517,7 @@ include_source(INSTRUCTION *file, void **srcfile_p)
if (already_included)
return true;
error_ln(file->source_line,
- _("can't open source file `%s' for reading (%s)"),
+ _("cannot open source file `%s' for reading: %s"),
src, errcode ? strerror(errcode) : _("reason unknown"));
return false;
}
@@ -5577,7 +5577,7 @@ load_library(INSTRUCTION *file, void **srcfile_p)
if (already_included)
return true;
error_ln(file->source_line,
- _("can't open shared library `%s' for reading
(%s)"),
+ _("cannot open shared library `%s' for reading:
%s"),
src, errcode ? strerror(errcode) : _("reason
unknown"));
return false;
}
@@ -5755,7 +5755,7 @@ get_src_buf()
/* suppress file name and line no. in error mesg */
in = source;
source = NULL;
- error(_("can't open source file `%s' for reading (%s)"),
+ error(_("cannot open source file `%s' for reading: %s"),
in, strerror(errno));
errcount++;
lexeof = true;
@@ -5823,7 +5823,7 @@ get_src_buf()
n = (*readfunc)(sourcefile->fd, lexptr, sourcefile->bufsize - savelen);
if (n == -1) {
- error(_("can't read sourcefile `%s' (%s)"),
+ error(_("cannot read source file `%s': %s"),
source, strerror(errno));
errcount++;
lexeof = true;
@@ -5893,7 +5893,8 @@ check_bad_char(int c)
}
if (iscntrl(c) && ! isspace(c))
- fatal(_("PEBKAC error: invalid character '\\%03o' in source
code"), c & 0xFF);
+ // This is a PEBKAC error, but we'll be nice and not say so.
+ fatal(_("error: invalid character '\\%03o' in source code"), c
& 0xFF);
}
/* nextc --- get the next input character */
@@ -6474,9 +6475,9 @@ retry:
if (! did_warn_assgn) {
did_warn_assgn = true;
if (do_lint)
- lintwarn(_("POSIX does not
allow operator `**='"));
+ lintwarn(_("POSIX does not
allow operator `%s'"), "**=");
if (do_lint_old)
- lintwarn(_("old awk does not
support operator `**='"));
+ lintwarn(_("operator `%s' is
not supported in old awk"), "**=");
}
yylval = GET_INSTRUCTION(Op_assign_exp);
return ASSIGNOP;
@@ -6485,9 +6486,9 @@ retry:
if (! did_warn_op) {
did_warn_op = true;
if (do_lint)
- lintwarn(_("POSIX does not
allow operator `**'"));
+ lintwarn(_("POSIX does not
allow operator `%s'"), "**");
if (do_lint_old)
- lintwarn(_("old awk does not
support operator `**'"));
+ lintwarn(_("operator `%s' is
not supported in old awk"), "**");
}
yylval = GET_INSTRUCTION(Op_exp);
return lasttok = '^';
@@ -6522,7 +6523,7 @@ retry:
if (nextc(true) == '=') {
if (do_lint_old && ! did_warn_assgn) {
did_warn_assgn = true;
- lintwarn(_("operator `^=' is not supported in
old awk"));
+ lintwarn(_("operator `%s' is not supported in
old awk"), "^=");
}
yylval = GET_INSTRUCTION(Op_assign_exp);
return lasttok = ASSIGNOP;
@@ -6530,7 +6531,7 @@ retry:
pushback();
if (do_lint_old && ! did_warn_op) {
did_warn_op = true;
- lintwarn(_("operator `^' is not supported in old awk"));
+ lintwarn(_("operator `%s' is not supported in old
awk"), "^");
}
yylval = GET_INSTRUCTION(Op_exp);
return lasttok = '^';
@@ -7187,7 +7188,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
ip = arg->lasti;
if (ip->opcode == Op_push_i) {
if (do_lint)
- lintwarn(_("%s: string literal as last
arg of substitute has no effect"),
+ lintwarn(_("%s: string literal as last
argument of substitute has no effect"),
operator);
r->sub_flags |= LITERAL;
} else {
@@ -7504,7 +7505,7 @@ dump_vars(const char *fname)
else if (strcmp(fname, "-") == 0)
fp = stdout;
else if ((fp = fopen(fname, "w")) == NULL) {
- warning(_("could not open `%s' for writing (%s)"), fname,
strerror(errno));
+ warning(_("could not open `%s' for writing: %s"), fname,
strerror(errno));
warning(_("sending variable list to standard error"));
fp = stderr;
}
@@ -7513,7 +7514,7 @@ dump_vars(const char *fname)
print_vars(vars, fprintf, fp);
efree(vars);
if (fp != stdout && fp != stderr && fclose(fp) != 0)
- warning(_("%s: close failed (%s)"), fname, strerror(errno));
+ warning(_("%s: close failed: %s"), fname, strerror(errno));
}
/* dump_funcs --- print all functions */
@@ -7674,10 +7675,10 @@ check_params(char *fname, int pcount, INSTRUCTION *list)
if (strcmp(name, fname) == 0) {
/* check for function foo(foo) { ... }. bleah. */
error_ln(p->source_line,
- _("function `%s': can't use function name as
parameter name"), fname);
+ _("function `%s': cannot use function name as
parameter name"), fname);
} else if (is_std_var(name)) {
error_ln(p->source_line,
- _("function `%s': can't use special variable
`%s' as a function parameter"),
+ _("function `%s': cannot use special variable
`%s' as a function parameter"),
fname, name);
} else if (strchr(name, ':') != NULL)
error_ln(p->source_line,
diff --git a/awkgram.y b/awkgram.y
index 8b9df5a..c84529c 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -2007,7 +2007,7 @@ func_call
f->opcode = Op_indirect_func_call;
name = estrdup(f->func_name, strlen(f->func_name));
if (is_std_var(name))
- yyerror(_("can not use special variable `%s' for
indirect function call"), name);
+ yyerror(_("cannot use special variable `%s' for
indirect function call"), name);
indirect_var = variable(f->source_line, name, Node_var_new);
t = instruction(Op_push);
t->memory = indirect_var;
@@ -2852,8 +2852,8 @@ add_srcfile(enum srctype stype, char *src, SRCFILE
*thisfile, bool *already_incl
}
/* use full messages to ease translation */
fatal(stype != SRC_EXTLIB
- ? _("can't open source file `%s' for reading (%s)")
- : _("can't open shared library `%s' for reading (%s)"),
+ ? _("cannot open source file `%s' for reading: %s")
+ : _("cannot open shared library `%s' for reading: %s"),
src,
errno_val ? strerror(errno_val) : _("reason
unknown"));
}
@@ -2864,7 +2864,7 @@ add_srcfile(enum srctype stype, char *src, SRCFILE
*thisfile, bool *already_incl
if (stype == SRC_INC || stype == SRC_EXTLIB) {
/* eliminate duplicates */
if ((stype == SRC_INC) && (s->stype ==
SRC_FILE))
- fatal(_("can't include `%s' and use it
as a program file"), src);
+ fatal(_("cannot include `%s' and use it
as a program file"), src);
if (do_lint) {
int line = sourceline;
@@ -2888,7 +2888,7 @@ add_srcfile(enum srctype stype, char *src, SRCFILE
*thisfile, bool *already_incl
} else {
/* duplicates are allowed for -f */
if (s->stype == SRC_INC)
- fatal(_("can't include `%s' and use it
as a program file"), src);
+ fatal(_("cannot include `%s' and use it
as a program file"), src);
/* no need to scan for further matches, since
* they must be of homogeneous type */
break;
@@ -2930,7 +2930,7 @@ include_source(INSTRUCTION *file, void **srcfile_p)
if (already_included)
return true;
error_ln(file->source_line,
- _("can't open source file `%s' for reading (%s)"),
+ _("cannot open source file `%s' for reading: %s"),
src, errcode ? strerror(errcode) : _("reason unknown"));
return false;
}
@@ -2990,7 +2990,7 @@ load_library(INSTRUCTION *file, void **srcfile_p)
if (already_included)
return true;
error_ln(file->source_line,
- _("can't open shared library `%s' for reading
(%s)"),
+ _("cannot open shared library `%s' for reading:
%s"),
src, errcode ? strerror(errcode) : _("reason
unknown"));
return false;
}
@@ -3168,7 +3168,7 @@ get_src_buf()
/* suppress file name and line no. in error mesg */
in = source;
source = NULL;
- error(_("can't open source file `%s' for reading (%s)"),
+ error(_("cannot open source file `%s' for reading: %s"),
in, strerror(errno));
errcount++;
lexeof = true;
@@ -3236,7 +3236,7 @@ get_src_buf()
n = (*readfunc)(sourcefile->fd, lexptr, sourcefile->bufsize - savelen);
if (n == -1) {
- error(_("can't read sourcefile `%s' (%s)"),
+ error(_("cannot read source file `%s': %s"),
source, strerror(errno));
errcount++;
lexeof = true;
@@ -3306,7 +3306,8 @@ check_bad_char(int c)
}
if (iscntrl(c) && ! isspace(c))
- fatal(_("PEBKAC error: invalid character '\\%03o' in source
code"), c & 0xFF);
+ // This is a PEBKAC error, but we'll be nice and not say so.
+ fatal(_("error: invalid character '\\%03o' in source code"), c
& 0xFF);
}
/* nextc --- get the next input character */
@@ -3887,9 +3888,9 @@ retry:
if (! did_warn_assgn) {
did_warn_assgn = true;
if (do_lint)
- lintwarn(_("POSIX does not
allow operator `**='"));
+ lintwarn(_("POSIX does not
allow operator `%s'"), "**=");
if (do_lint_old)
- lintwarn(_("old awk does not
support operator `**='"));
+ lintwarn(_("operator `%s' is
not supported in old awk"), "**=");
}
yylval = GET_INSTRUCTION(Op_assign_exp);
return ASSIGNOP;
@@ -3898,9 +3899,9 @@ retry:
if (! did_warn_op) {
did_warn_op = true;
if (do_lint)
- lintwarn(_("POSIX does not
allow operator `**'"));
+ lintwarn(_("POSIX does not
allow operator `%s'"), "**");
if (do_lint_old)
- lintwarn(_("old awk does not
support operator `**'"));
+ lintwarn(_("operator `%s' is
not supported in old awk"), "**");
}
yylval = GET_INSTRUCTION(Op_exp);
return lasttok = '^';
@@ -3935,7 +3936,7 @@ retry:
if (nextc(true) == '=') {
if (do_lint_old && ! did_warn_assgn) {
did_warn_assgn = true;
- lintwarn(_("operator `^=' is not supported in
old awk"));
+ lintwarn(_("operator `%s' is not supported in
old awk"), "^=");
}
yylval = GET_INSTRUCTION(Op_assign_exp);
return lasttok = ASSIGNOP;
@@ -3943,7 +3944,7 @@ retry:
pushback();
if (do_lint_old && ! did_warn_op) {
did_warn_op = true;
- lintwarn(_("operator `^' is not supported in old awk"));
+ lintwarn(_("operator `%s' is not supported in old
awk"), "^");
}
yylval = GET_INSTRUCTION(Op_exp);
return lasttok = '^';
@@ -4600,7 +4601,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
ip = arg->lasti;
if (ip->opcode == Op_push_i) {
if (do_lint)
- lintwarn(_("%s: string literal as last
arg of substitute has no effect"),
+ lintwarn(_("%s: string literal as last
argument of substitute has no effect"),
operator);
r->sub_flags |= LITERAL;
} else {
@@ -4917,7 +4918,7 @@ dump_vars(const char *fname)
else if (strcmp(fname, "-") == 0)
fp = stdout;
else if ((fp = fopen(fname, "w")) == NULL) {
- warning(_("could not open `%s' for writing (%s)"), fname,
strerror(errno));
+ warning(_("could not open `%s' for writing: %s"), fname,
strerror(errno));
warning(_("sending variable list to standard error"));
fp = stderr;
}
@@ -4926,7 +4927,7 @@ dump_vars(const char *fname)
print_vars(vars, fprintf, fp);
efree(vars);
if (fp != stdout && fp != stderr && fclose(fp) != 0)
- warning(_("%s: close failed (%s)"), fname, strerror(errno));
+ warning(_("%s: close failed: %s"), fname, strerror(errno));
}
/* dump_funcs --- print all functions */
@@ -5087,10 +5088,10 @@ check_params(char *fname, int pcount, INSTRUCTION *list)
if (strcmp(name, fname) == 0) {
/* check for function foo(foo) { ... }. bleah. */
error_ln(p->source_line,
- _("function `%s': can't use function name as
parameter name"), fname);
+ _("function `%s': cannot use function name as
parameter name"), fname);
} else if (is_std_var(name)) {
error_ln(p->source_line,
- _("function `%s': can't use special variable
`%s' as a function parameter"),
+ _("function `%s': cannot use special variable
`%s' as a function parameter"),
fname, name);
} else if (strchr(name, ':') != NULL)
error_ln(p->source_line,
diff --git a/builtin.c b/builtin.c
index 8be3b9e..4c3817b 100644
--- a/builtin.c
+++ b/builtin.c
@@ -141,7 +141,7 @@ wrerror:
if ((rp != NULL) ? is_non_fatal_redirect(rp->value, strlen(rp->value))
: is_non_fatal_std(fp))
update_ERRNO_int(errno);
else
- fatal(_("%s to \"%s\" failed (%s)"), from,
+ fatal(_("%s to \"%s\" failed: %s"), from,
rp != NULL
? rp->value
: fp == stdout
@@ -924,11 +924,11 @@ check_pos:
fw = 0;
used_dollar = true;
if (argnum <= 0) {
- msg(_("fatal: arg count with `$' must
be > 0"));
+ msg(_("fatal: argument index with `$'
must be > 0"));
goto out;
}
if (argnum >= num_args) {
- msg(_("fatal: arg count %ld greater
than total number of supplied arguments"), argnum);
+ msg(_("fatal: argument index %ld
greater than total number of supplied arguments"), argnum);
goto out;
}
} else {
diff --git a/command.c b/command.c
index eb46ad4..7d85969 100644
--- a/command.c
+++ b/command.c
@@ -1719,7 +1719,7 @@ yyreduce:
if (input_from_tty) {
dbg_prompt = eval_prompt;
fprintf(out_fp,
- _("Type (g)awk statement(s). End with the command \"end\"\n"));
+ _("Type (g)awk statement(s). End with the command `end'\n"));
rl_inhibit_completion = 1;
}
cmd_idx = -1;
@@ -1805,7 +1805,7 @@ yyreduce:
{
int idx = find_argument(yyvsp[0]);
if (idx < 0)
- yyerror(_("info: invalid option - \"%s\""),
yyvsp[0]->a_string);
+ yyerror(_("info: invalid option - `%s'"),
yyvsp[0]->a_string);
else {
efree(yyvsp[0]->a_string);
yyvsp[0]->a_string = NULL;
@@ -1856,7 +1856,7 @@ yyreduce:
#line 321 "command.y"
{
if (in_cmd_src(yyvsp[0]->a_string))
- yyerror(_("source \"%s\": already sourced."),
yyvsp[0]->a_string);
+ yyerror(_("source: `%s': already sourced."),
yyvsp[0]->a_string);
}
#line 1862 "command.c"
break;
@@ -1865,7 +1865,7 @@ yyreduce:
#line 326 "command.y"
{
if (! input_from_tty)
- yyerror(_("save \"%s\": command not permitted."),
yyvsp[0]->a_string);
+ yyerror(_("save: `%s': command not permitted."),
yyvsp[0]->a_string);
}
#line 1871 "command.c"
break;
@@ -1882,7 +1882,7 @@ yyreduce:
if (dbg_errcount != 0)
;
else if (in_commands)
- yyerror(_("Can't use command `commands' for
breakpoint/watchpoint commands"));
+ yyerror(_("cannot use command `commands' for
breakpoint/watchpoint commands"));
else if (yyvsp[0] == NULL && ! (type =
has_break_or_watch_point(&num, true)))
yyerror(_("no breakpoint/watchpoint has been set yet"));
else if (yyvsp[0] != NULL && ! (type =
has_break_or_watch_point(&num, false)))
@@ -1893,7 +1893,7 @@ yyreduce:
dbg_prompt = commands_prompt;
fprintf(out_fp, _("Type commands for when %s %d
is hit, one per line.\n"),
(type ==
D_break) ? "breakpoint" : "watchpoint", num);
- fprintf(out_fp, _("End with the command
\"end\"\n"));
+ fprintf(out_fp, _("End with the command
`end'\n"));
}
}
}
@@ -1928,7 +1928,7 @@ yyreduce:
{
int idx = find_argument(yyvsp[0]);
if (idx < 0)
- yyerror(_("trace: invalid option - \"%s\""),
yyvsp[0]->a_string);
+ yyerror(_("trace: invalid option - `%s'"),
yyvsp[0]->a_string);
else {
efree(yyvsp[0]->a_string);
yyvsp[0]->a_string = NULL;
@@ -2037,7 +2037,7 @@ yyreduce:
#line 459 "command.y"
{
if (find_option(yyvsp[0]->a_string) < 0)
- yyerror(_("option: invalid parameter - \"%s\""),
yyvsp[0]->a_string);
+ yyerror(_("option: invalid parameter - `%s'"),
yyvsp[0]->a_string);
}
#line 2043 "command.c"
break;
@@ -2046,7 +2046,7 @@ yyreduce:
#line 464 "command.y"
{
if (find_option(yyvsp[-2]->a_string) < 0)
- yyerror(_("option: invalid parameter - \"%s\""),
yyvsp[-2]->a_string);
+ yyerror(_("option: invalid parameter - `%s'"),
yyvsp[-2]->a_string);
}
#line 2052 "command.c"
break;
@@ -2057,7 +2057,7 @@ yyreduce:
NODE *n;
n = lookup(yyvsp[0]->a_string);
if (n == NULL || n->type != Node_func)
- yyerror(_("no such function - \"%s\""),
yyvsp[0]->a_string);
+ yyerror(_("no such function - `%s'"),
yyvsp[0]->a_string);
else {
yyvsp[0]->type = D_func;
efree(yyvsp[0]->a_string);
@@ -2115,7 +2115,7 @@ yyreduce:
{
int idx = find_argument(yyvsp[-1]);
if (idx < 0)
- yyerror(_("enable: invalid option - \"%s\""),
yyvsp[-1]->a_string);
+ yyerror(_("enable: invalid option - `%s'"),
yyvsp[-1]->a_string);
else {
efree(yyvsp[-1]->a_string);
yyvsp[-1]->a_string = NULL;
@@ -2906,7 +2906,7 @@ again:
/* force a quit, and let do_quit (in debug.c)
exit */
if (! seen_eof) {
if (errno != 0) {
- fprintf(stderr, _("can't read
command (%s)\n"), strerror(errno));
+ fprintf(stderr, _("cannot read
command: %s\n"), strerror(errno));
exit_val = EXIT_FAILURE;
} /* else
exit_val = EXIT_SUCCESS; */
@@ -2920,7 +2920,7 @@ again:
return '\n'; /* end command 'quit' */
}
if (errno != 0)
- d_error(_("can't read command (%s)"),
strerror(errno));
+ d_error(_("cannot read command: %s"),
strerror(errno));
if (pop_cmd_src() == 0)
goto again;
exit(EXIT_FATAL); /* shouldn't happen */
@@ -3007,7 +3007,7 @@ again:
}
return cmdtab[cmd_idx].class;
} else {
- yyerror(_("unknown command - \"%.*s\", try help"),
toklen, tokstart);
+ yyerror(_("unknown command - `%.*s', try help"),
toklen, tokstart);
return '\n';
}
}
diff --git a/command.y b/command.y
index 8daefe1..393026d 100644
--- a/command.y
+++ b/command.y
@@ -224,7 +224,7 @@ eval_prologue
if (input_from_tty) {
dbg_prompt = eval_prompt;
fprintf(out_fp,
- _("Type (g)awk statement(s). End with the command \"end\"\n"));
+ _("Type (g)awk statement(s). End with the command `end'\n"));
rl_inhibit_completion = 1;
}
cmd_idx = -1;
@@ -294,7 +294,7 @@ command
{
int idx = find_argument($2);
if (idx < 0)
- yyerror(_("info: invalid option - \"%s\""),
$2->a_string);
+ yyerror(_("info: invalid option - `%s'"), $2->a_string);
else {
efree($2->a_string);
$2->a_string = NULL;
@@ -320,12 +320,12 @@ command
| D_SOURCE D_STRING
{
if (in_cmd_src($2->a_string))
- yyerror(_("source \"%s\": already sourced."),
$2->a_string);
+ yyerror(_("source: `%s': already sourced."),
$2->a_string);
}
| D_SAVE D_STRING
{
if (! input_from_tty)
- yyerror(_("save \"%s\": command not permitted."),
$2->a_string);
+ yyerror(_("save: `%s': command not permitted."),
$2->a_string);
}
| D_COMMANDS commands_arg
{
@@ -338,7 +338,7 @@ command
if (dbg_errcount != 0)
;
else if (in_commands)
- yyerror(_("Can't use command `commands' for
breakpoint/watchpoint commands"));
+ yyerror(_("cannot use command `commands' for
breakpoint/watchpoint commands"));
else if ($2 == NULL && ! (type =
has_break_or_watch_point(&num, true)))
yyerror(_("no breakpoint/watchpoint has been set yet"));
else if ($2 != NULL && ! (type = has_break_or_watch_point(&num,
false)))
@@ -349,7 +349,7 @@ command
dbg_prompt = commands_prompt;
fprintf(out_fp, _("Type commands for when %s %d
is hit, one per line.\n"),
(type ==
D_break) ? "breakpoint" : "watchpoint", num);
- fprintf(out_fp, _("End with the command
\"end\"\n"));
+ fprintf(out_fp, _("End with the command
`end'\n"));
}
}
}
@@ -372,7 +372,7 @@ command
{
int idx = find_argument($2);
if (idx < 0)
- yyerror(_("trace: invalid option - \"%s\""),
$2->a_string);
+ yyerror(_("trace: invalid option - `%s'"),
$2->a_string);
else {
efree($2->a_string);
$2->a_string = NULL;
@@ -458,12 +458,12 @@ option_args
| D_STRING
{
if (find_option($1->a_string) < 0)
- yyerror(_("option: invalid parameter - \"%s\""),
$1->a_string);
+ yyerror(_("option: invalid parameter - `%s'"),
$1->a_string);
}
| D_STRING '=' D_STRING
{
if (find_option($1->a_string) < 0)
- yyerror(_("option: invalid parameter - \"%s\""),
$1->a_string);
+ yyerror(_("option: invalid parameter - `%s'"),
$1->a_string);
}
;
@@ -473,7 +473,7 @@ func_name
NODE *n;
n = lookup($1->a_string);
if (n == NULL || n->type != Node_func)
- yyerror(_("no such function - \"%s\""), $1->a_string);
+ yyerror(_("no such function - `%s'"), $1->a_string);
else {
$1->type = D_func;
efree($1->a_string);
@@ -530,7 +530,7 @@ enable_args
{
int idx = find_argument($1);
if (idx < 0)
- yyerror(_("enable: invalid option - \"%s\""),
$1->a_string);
+ yyerror(_("enable: invalid option - `%s'"),
$1->a_string);
else {
efree($1->a_string);
$1->a_string = NULL;
@@ -1057,7 +1057,7 @@ again:
/* force a quit, and let do_quit (in debug.c)
exit */
if (! seen_eof) {
if (errno != 0) {
- fprintf(stderr, _("can't read
command (%s)\n"), strerror(errno));
+ fprintf(stderr, _("cannot read
command: %s\n"), strerror(errno));
exit_val = EXIT_FAILURE;
} /* else
exit_val = EXIT_SUCCESS; */
@@ -1071,7 +1071,7 @@ again:
return '\n'; /* end command 'quit' */
}
if (errno != 0)
- d_error(_("can't read command (%s)"),
strerror(errno));
+ d_error(_("cannot read command: %s"),
strerror(errno));
if (pop_cmd_src() == 0)
goto again;
exit(EXIT_FATAL); /* shouldn't happen */
@@ -1158,7 +1158,7 @@ again:
}
return cmdtab[cmd_idx].class;
} else {
- yyerror(_("unknown command - \"%.*s\", try help"),
toklen, tokstart);
+ yyerror(_("unknown command - `%.*s', try help"),
toklen, tokstart);
return '\n';
}
}
diff --git a/debug.c b/debug.c
index 44038ff..25b866e 100644
--- a/debug.c
+++ b/debug.c
@@ -458,7 +458,7 @@ find_lines(SRCFILE *s)
efree(buf);
if (n == -1) {
- d_error(_("can't read source file `%s' (%s)"),
+ d_error(_("cannot read source file `%s': %s"),
s->src, strerror(errno));
return -1;
}
@@ -515,7 +515,7 @@ source_find(char *src)
efree(path);
}
- d_error(_("cannot find source file named `%s' (%s)"), src,
strerror(errno_val));
+ d_error(_("cannot find source file named `%s': %s"), src,
strerror(errno_val));
return NULL;
}
@@ -533,7 +533,7 @@ print_lines(char *src, int start_line, int nlines)
if (s == NULL)
return -1;
if (s->fd <= INVALID_HANDLE && (s->fd = srcopen(s)) <= INVALID_HANDLE) {
- d_error(_("can't open source file `%s' for reading (%s)"),
+ d_error(_("cannot open source file `%s' for reading: %s"),
src, strerror(errno));
return -1;
}
@@ -549,7 +549,7 @@ print_lines(char *src, int start_line, int nlines)
close(s->fd);
s->fd = INVALID_HANDLE;
if ((s->fd = srcopen(s)) <= INVALID_HANDLE) {
- d_error(_("can't open source file `%s' for reading
(%s)"),
+ d_error(_("cannot open source file `%s' for reading:
%s"),
src, strerror(errno));
return -1;
}
@@ -616,7 +616,7 @@ print_lines(char *src, int start_line, int nlines)
len = read(s->fd, p, supposed_len);
switch (len) {
case -1:
- d_error(_("can't read source file `%s' (%s)"),
+ d_error(_("cannot read source file `%s': %s"),
src, strerror(errno));
return -1;
@@ -2354,7 +2354,7 @@ set_breakpoint(CMDARG *arg, bool temporary)
rp = find_rule(src, ip->source_line);
assert(rp != NULL);
if ((b = set_breakpoint_next(rp, ip)) == NULL)
- fprintf(out_fp, _("Can't set breakpoint in file
`%s'\n"), src);
+ fprintf(out_fp, _("cannot set breakpoint in file
`%s'\n"), src);
else {
if (cur_frame == 0) { /* stop next time */
b->flags |= BP_IGNORE;
@@ -2387,9 +2387,9 @@ set_breakpoint(CMDARG *arg, bool temporary)
else {
rp = find_rule(src, lineno);
if (rp == NULL)
- fprintf(out_fp, _("Can't find rule!!!\n"));
+ fprintf(out_fp, _("internal error: cannot find
rule\n"));
if (rp == NULL || (b = set_breakpoint_at(rp, lineno,
false)) == NULL)
- fprintf(out_fp, _("Can't set breakpoint at
`%s':%d\n"),
+ fprintf(out_fp, _("cannot set breakpoint at
`%s':%d\n"),
src, lineno);
if (b != NULL && temporary)
b->flags |= BP_TEMP;
@@ -2401,7 +2401,7 @@ func:
func = arg->a_node;
rp = func->code_ptr;
if ((b = set_breakpoint_at(rp, rp->source_line, false)) == NULL)
- fprintf(out_fp, _("Can't set breakpoint in function
`%s'\n"),
+ fprintf(out_fp, _("cannot set breakpoint in function
`%s'\n"),
func->vname);
else if (temporary)
b->flags |= BP_TEMP;
@@ -2826,7 +2826,7 @@ debug_prog(INSTRUCTION *pc)
int fd;
fd = open_readfd(command_file);
if (fd == INVALID_HANDLE) {
- fprintf(stderr, _("can't open source file `%s' for
reading (%s)"),
+ fprintf(stderr, _("cannot open source file `%s' for
reading: %s"),
command_file, strerror(errno));
exit(EXIT_FAILURE);
}
@@ -3383,7 +3383,7 @@ func:
return true;
}
}
- fprintf(out_fp, _("Can't find specified location in function
`%s'\n"),
+ fprintf(out_fp, _("cannot find specified location in function
`%s'\n"),
func->vname);
/* fall through */
default:
@@ -3406,7 +3406,7 @@ func:
if (ip == (rp + 1)->lasti)
break;
}
- fprintf(out_fp, _("Can't find specified location %d in file `%s'\n"),
+ fprintf(out_fp, _("cannot find specified location %d in file `%s'\n"),
lineno, src);
return false;
}
@@ -4176,7 +4176,7 @@ do_dump_instructions(CMDARG *arg, int cmd
ATTRIBUTE_UNUSED)
if (arg != NULL && arg->type == D_string) {
/* dump to a file */
if ((fp = fopen(arg->a_string, "w")) == NULL) {
- d_error(_("could not open `%s' for writing (%s)"),
+ d_error(_("could not open `%s' for writing: %s"),
arg->a_string, strerror(errno));
return false;
}
@@ -4219,7 +4219,7 @@ do_save(CMDARG *arg, int cmd ATTRIBUTE_UNUSED)
int i;
if ((fp = fopen(arg->a_string, "w")) == NULL) {
- d_error(_("could not open `%s' for writing (%s)"),
+ d_error(_("could not open `%s' for writing: %s"),
arg->a_string, strerror(errno));
return false;
}
@@ -4320,8 +4320,9 @@ prompt_continue(FILE *fp)
if (os_isatty(fileno(fp)) && input_fd == 0)
quit_pager = prompt_yes_no(
- _("\t------[Enter] to continue or q [Enter] to
quit------"),
- _("q")[0], false, fp);
+ // TRANSLATORS: don't translate the 'q' inside the
brackets.
+ _("\t------[Enter] to continue or [q] + [Enter] to
quit------"),
+ 'q', false, fp);
if (quit_pager)
longjmp(pager_quit_tag, 1);
pager_lines_printed = 0;
@@ -5191,7 +5192,7 @@ do_source(CMDARG *arg, int cmd ATTRIBUTE_UNUSED)
fd = open_readfd(file);
if (fd <= INVALID_HANDLE) {
- d_error(_("can't open source file `%s' for reading (%s)"),
+ d_error(_("cannot open source file `%s' for reading: %s"),
file, strerror(errno));
return false;
}
@@ -5340,7 +5341,7 @@ set_gawk_output(const char *file)
setbuf(fp, (char *) NULL);
output_is_tty = os_isatty(fileno(fp));
} else {
- d_error(_("could not open `%s' for writing (%s)"),
+ d_error(_("could not open `%s' for writing: %s"),
file,
errno != 0 ? strerror(errno) :
_("reason unknown"));
fprintf(out_fp, _("sending output to stdout\n"));
diff --git a/ext.c b/ext.c
index c2a4b61..967492e 100644
--- a/ext.c
+++ b/ext.c
@@ -57,19 +57,19 @@ load_ext(const char *lib_name)
fatal(_("load_ext: received NULL lib_name"));
if ((dl = dlopen(lib_name, flags)) == NULL)
- fatal(_("load_ext: cannot open library `%s' (%s)"), lib_name,
+ fatal(_("load_ext: cannot open library `%s': %s"), lib_name,
dlerror());
/* Per the GNU Coding standards */
gpl_compat = (int *) dlsym(dl, "plugin_is_GPL_compatible");
if (gpl_compat == NULL)
- fatal(_("load_ext: library `%s': does not define
`plugin_is_GPL_compatible' (%s)"),
+ fatal(_("load_ext: library `%s': does not define
`plugin_is_GPL_compatible': %s"),
lib_name, dlerror());
install_func = (int (*)(const gawk_api_t *const, awk_ext_id_t))
dlsym(dl, INIT_FUNC);
if (install_func == NULL)
- fatal(_("load_ext: library `%s': cannot call function `%s'
(%s)"),
+ fatal(_("load_ext: library `%s': cannot call function `%s':
%s"),
lib_name, INIT_FUNC, dlerror());
if (install_func(& api_impl, NULL /* ext_id */) == 0)
@@ -97,7 +97,7 @@ make_builtin(const char *name_space, const awk_ext_func_t
*funcinfo)
assert(name_space != NULL);
if (name_space[0] == '\0' || strcmp(name_space, awk_namespace) == 0) {
if (check_special(name) >= 0)
- fatal(_("make_builtin: can't use gawk built-in `%s' as
function name"), name);
+ fatal(_("make_builtin: cannot use gawk built-in `%s' as
function name"), name);
f = lookup(name);
install_name = estrdup(name, strlen(name));
@@ -106,9 +106,9 @@ make_builtin(const char *name_space, const awk_ext_func_t
*funcinfo)
return awk_false;
if (check_special(name_space) >= 0)
- fatal(_("make_builtin: can't use gawk built-in `%s' as
namespace name"), name_space);
+ fatal(_("make_builtin: cannot use gawk built-in `%s' as
namespace name"), name_space);
if (check_special(name) >= 0)
- fatal(_("make_builtin: can't use gawk built-in `%s' as
function name"), name);
+ fatal(_("make_builtin: cannot use gawk built-in `%s' as
function name"), name);
size_t len = strlen(name_space) + 2 + strlen(name) + 1;
char *buf;
@@ -123,7 +123,7 @@ make_builtin(const char *name_space, const awk_ext_func_t
*funcinfo)
// found it, but it shouldn't be there if we want to install
this function
if (f->type == Node_func) {
/* user-defined function */
- fatal(_("make_builtin: can't redefine function `%s'"),
name);
+ fatal(_("make_builtin: cannot redefine function `%s'"),
name);
} else if (f->type == Node_ext_func) {
/* multiple extension() calls etc. */
if (do_lint)
diff --git a/int_array.c b/int_array.c
index 1a29215..31bc80b 100644
--- a/int_array.c
+++ b/int_array.c
@@ -236,7 +236,7 @@ int_lookup(NODE *symbol, NODE *subs)
/*
* N.B: symbol->table_size is the total # of non-integers
(symbol->xarray)
* and integer elements. Also, symbol->xarray must have at least
one
- * item in it, and can not exist if there are no integer elements.
+ * item in it, and cannot exist if there are no integer elements.
* In that case, symbol->xarray is promoted to 'symbol' (See
int_remove).
*/
diff --git a/io.c b/io.c
index 4bf389b..3f51094 100644
--- a/io.c
+++ b/io.c
@@ -426,7 +426,7 @@ after_beginfile(IOBUF **curfile)
warning(_("command line argument `%s' is a directory:
skipped"), fname);
return; /* read next file */
}
- fatal(_("cannot open file `%s' for reading (%s)"),
+ fatal(_("cannot open file `%s' for reading: %s"),
fname, strerror(errcode));
}
}
@@ -543,7 +543,7 @@ nextfile(IOBUF **curfile, bool skipping)
update_ERRNO_int(errno);
(void) iop_close(iop);
*curfile = NULL;
- fatal(_("cannot open file `%s' for reading (%s)"),
+ fatal(_("cannot open file `%s' for reading: %s"),
fname, strerror(errcode));
}
return ++i; /* run beginfile block */
@@ -672,7 +672,7 @@ iop_close(IOBUF *iop)
}
if (ret == -1)
- warning(_("close of fd %d (`%s') failed (%s)"), iop->public.fd,
+ warning(_("close of fd %d (`%s') failed: %s"), iop->public.fd,
iop->public.name, strerror(errno));
/*
* Be careful -- $0 may still reference the buffer even though
@@ -908,7 +908,7 @@ redirect_string(const char *str, size_t explen, bool
not_string,
* popen().
*/
if ((rp->output.fp = popen(str, binmode("w"))) == NULL)
- fatal(_("can't open pipe `%s' for output (%s)"),
+ fatal(_("cannot open pipe `%s' for output: %s"),
str, strerror(errno));
ignore_sigpipe();
@@ -923,7 +923,7 @@ redirect_string(const char *str, size_t explen, bool
not_string,
}
direction = "from";
if (gawk_popen(str, rp) == NULL)
- fatal(_("can't open pipe `%s' for input (%s)"),
+ fatal(_("cannot open pipe `%s' for input: %s"),
str, strerror(errno));
break;
case redirect_input:
@@ -958,7 +958,7 @@ redirect_string(const char *str, size_t explen, bool
not_string,
/* do not free rp, saving it for reuse
(save_rp = rp) */
return NULL;
} else
- fatal(_("can't open two way pipe `%s'
for input/output (%s)"),
+ fatal(_("cannot open two way pipe `%s'
for input/output: %s"),
str, strerror(errno));
}
break;
@@ -1045,10 +1045,10 @@ redirect_string(const char *str, size_t explen, bool
not_string,
|| redirtype == redirect_append)) {
/* multiple messages make life easier
for translators */
if (*direction == 'f')
- fatal(_("can't redirect from
`%s' (%s)"),
+ fatal(_("cannot redirect from
`%s': %s"),
str, strerror(errno));
else
- fatal(_("can't redirect to `%s'
(%s)"),
+ fatal(_("cannot redirect to
`%s': %s"),
str, strerror(errno));
} else {
/* do not free rp, saving it for reuse
(save_rp = rp) */
@@ -1166,7 +1166,7 @@ close_one()
rp->flag |= RED_USED;
errno = 0;
if (rp->output.gawk_fclose(rp->output.fp,
rp->output.opaque) != 0)
- warning(_("close of `%s' failed (%s)."),
+ warning(_("close of `%s' failed: %s."),
rp->value, strerror(errno));
rp->output.fp = NULL;
break;
@@ -1339,10 +1339,10 @@ close_redir(struct redirect *rp, bool exitwarn,
two_way_close_type how)
*/
if (do_lint) {
if ((rp->flag & RED_PIPE) != 0)
- lintwarn(_("failure status (%d) on pipe close
of `%s' (%s)"),
+ lintwarn(_("failure status (%d) on pipe close
of `%s': %s"),
status, rp->value, s);
else
- lintwarn(_("failure status (%d) on file close
of `%s' (%s)"),
+ lintwarn(_("failure status (%d) on file close
of `%s': %s"),
status, rp->value, s);
}
@@ -1414,8 +1414,8 @@ non_fatal_flush_std_file(FILE *fp)
} else {
update_ERRNO_int(errno);
warning(fp == stdout
- ? _("error writing standard output (%s)")
- : _("error writing standard error (%s)"),
+ ? _("error writing standard output: %s")
+ : _("error writing standard error: %s"),
strerror(errno));
}
return false;
@@ -1454,13 +1454,13 @@ flush_io()
messagefunc = r_warning;
if ((rp->flag & RED_PIPE) != 0)
- messagefunc(_("pipe flush of `%s'
failed (%s)."),
+ messagefunc(_("pipe flush of `%s'
failed: %s."),
rp->value, strerror(errno));
else if ((rp->flag & RED_TWOWAY) != 0)
- messagefunc(_("co-process flush of pipe
to `%s' failed (%s)."),
+ messagefunc(_("co-process flush of pipe
to `%s' failed: %s."),
rp->value, strerror(errno));
else
- messagefunc(_("file flush of `%s'
failed (%s)."),
+ messagefunc(_("file flush of `%s'
failed: %s."),
rp->value, strerror(errno));
status++;
}
@@ -1505,7 +1505,7 @@ close_io(bool *stdio_problem, bool *got_EPIPE)
w32_maybe_set_errno();
#endif
if (errno != EPIPE)
- warning(_("error writing standard output (%s)"),
strerror(errno));
+ warning(_("error writing standard output: %s"),
strerror(errno));
else
*got_EPIPE = true;
@@ -1518,7 +1518,7 @@ close_io(bool *stdio_problem, bool *got_EPIPE)
w32_maybe_set_errno();
#endif
if (errno != EPIPE)
- warning(_("error writing standard error (%s)"),
strerror(errno));
+ warning(_("error writing standard error: %s"),
strerror(errno));
else
*got_EPIPE = true;
@@ -2014,19 +2014,19 @@ fork_and_open_slave_pty(const char *slavenam, int
master, const char *command, p
set_slave_pty_attributes(slave);
if (close(master) == -1)
- fatal(_("close of master pty failed (%s)"),
strerror(errno));
+ fatal(_("close of master pty failed: %s"),
strerror(errno));
if (close(1) == -1)
- fatal(_("close of stdout in child failed (%s)"),
+ fatal(_("close of stdout in child failed: %s"),
strerror(errno));
if (dup(slave) != 1)
fatal(_("moving slave pty to stdout in child failed
(dup: %s)"), strerror(errno));
if (close(0) == -1)
- fatal(_("close of stdin in child failed (%s)"),
+ fatal(_("close of stdin in child failed: %s"),
strerror(errno));
if (dup(slave) != 0)
fatal(_("moving slave pty to stdin in child failed
(dup: %s)"), strerror(errno));
if (close(slave))
- fatal(_("close of slave pty failed (%s)"),
strerror(errno));
+ fatal(_("close of slave pty failed: %s"),
strerror(errno));
/* stderr does NOT get dup'ed onto child's stdout */
@@ -2066,19 +2066,19 @@ fork_and_open_slave_pty(const char *slavenam, int
master, const char *command, p
#endif
if (close(master) == -1)
- fatal(_("close of master pty failed (%s)"),
strerror(errno));
+ fatal(_("close of master pty failed: %s"),
strerror(errno));
if (close(1) == -1)
- fatal(_("close of stdout in child failed (%s)"),
+ fatal(_("close of stdout in child failed: %s"),
strerror(errno));
if (dup(slave) != 1)
fatal(_("moving slave pty to stdout in child failed
(dup: %s)"), strerror(errno));
if (close(0) == -1)
- fatal(_("close of stdin in child failed (%s)"),
+ fatal(_("close of stdin in child failed: %s"),
strerror(errno));
if (dup(slave) != 0)
fatal(_("moving slave pty to stdin in child failed
(dup: %s)"), strerror(errno));
if (close(slave))
- fatal(_("close of slave pty failed (%s)"),
strerror(errno));
+ fatal(_("close of slave pty failed: %s"),
strerror(errno));
/* stderr does NOT get dup'ed onto child's stdout */
@@ -2100,7 +2100,7 @@ fork_and_open_slave_pty(const char *slavenam, int master,
const char *command, p
if (close(slave) != 0) {
close(master);
(void) kill(*pid, SIGKILL);
- fatal(_("close of slave pty failed (%s)"), strerror(errno));
+ fatal(_("close of slave pty failed: %s"), strerror(errno));
}
return true;
@@ -2415,18 +2415,18 @@ use_pipes:
if (pid == 0) { /* child */
if (close(1) == -1)
- fatal(_("close of stdout in child failed (%s)"),
+ fatal(_("close of stdout in child failed: %s"),
strerror(errno));
if (dup(ctop[1]) != 1)
fatal(_("moving pipe to stdout in child failed (dup:
%s)"), strerror(errno));
if (close(0) == -1)
- fatal(_("close of stdin in child failed (%s)"),
+ fatal(_("close of stdin in child failed: %s"),
strerror(errno));
if (dup(ptoc[0]) != 0)
fatal(_("moving pipe to stdin in child failed (dup:
%s)"), strerror(errno));
if ( close(ptoc[0]) == -1 || close(ptoc[1]) == -1
|| close(ctop[0]) == -1 || close(ctop[1]) == -1)
- fatal(_("close of pipe failed (%s)"), strerror(errno));
+ fatal(_("close of pipe failed: %s"), strerror(errno));
/* stderr does NOT get dup'ed onto child's stdout */
set_sigpipe_to_default();
execl("/bin/sh", "sh", "-c", str, NULL);
@@ -2615,7 +2615,7 @@ gawk_popen(const char *cmd, struct redirect *rp)
*/
if (pipe(p) < 0)
- fatal(_("cannot open pipe `%s' (%s)"), cmd, strerror(errno));
+ fatal(_("cannot open pipe `%s': %s"), cmd, strerror(errno));
#if defined(__EMX__) || defined(__MINGW32__)
rp->iop = NULL;
@@ -2659,12 +2659,12 @@ gawk_popen(const char *cmd, struct redirect *rp)
#else /* NOT __EMX__, NOT __MINGW32__ */
if ((pid = fork()) == 0) {
if (close(1) == -1)
- fatal(_("close of stdout in child failed (%s)"),
+ fatal(_("close of stdout in child failed: %s"),
strerror(errno));
if (dup(p[1]) != 1)
fatal(_("moving pipe to stdout in child failed (dup:
%s)"), strerror(errno));
if (close(p[0]) == -1 || close(p[1]) == -1)
- fatal(_("close of pipe failed (%s)"), strerror(errno));
+ fatal(_("close of pipe failed: %s"), strerror(errno));
set_sigpipe_to_default();
execl("/bin/sh", "sh", "-c", cmd, NULL);
_exit(errno == ENOENT ? 127 : 126);
@@ -2679,7 +2679,7 @@ gawk_popen(const char *cmd, struct redirect *rp)
#if !defined(__EMX__) && !defined(__MINGW32__)
if (close(p[1]) == -1) {
close(p[0]);
- fatal(_("close of pipe failed (%s)"), strerror(errno));
+ fatal(_("close of pipe failed: %s"), strerror(errno));
}
#endif
os_close_on_exec(p[0], cmd, "pipe", "from");
diff --git a/main.c b/main.c
index d200b6f..e49730a 100644
--- a/main.c
+++ b/main.c
@@ -418,12 +418,12 @@ main(int argc, char **argv)
if ((BINMODE & BINMODE_INPUT) != 0)
if (os_setbinmode(fileno(stdin), O_BINARY) == -1)
- fatal(_("can't set binary mode on stdin (%s)"),
strerror(errno));
+ fatal(_("cannot set binary mode on stdin: %s"),
strerror(errno));
if ((BINMODE & BINMODE_OUTPUT) != 0) {
if (os_setbinmode(fileno(stdout), O_BINARY) == -1)
- fatal(_("can't set binary mode on stdout (%s)"),
strerror(errno));
+ fatal(_("cannot set binary mode on stdout: %s"),
strerror(errno));
if (os_setbinmode(fileno(stderr), O_BINARY) == -1)
- fatal(_("can't set binary mode on stderr (%s)"),
strerror(errno));
+ fatal(_("cannot set binary mode on stderr: %s"),
strerror(errno));
}
#ifdef GAWKDEBUG
@@ -630,10 +630,7 @@ usage(int exitval, FILE *fp)
#endif
/* This is one string to make things easier on translators. */
- /* TRANSLATORS: --help output 5 (end)
- TRANSLATORS: the placeholder indicates the bug-reporting address
- for this application. Please add _another line_ with the
- address for translation bugs.
+ /* TRANSLATORS: --help output (end)
no-wrap */
fputs(_("\nTo report bugs, see node `Bugs' in `gawk.info'\n\
which is section `Reporting Problems and Bugs' in the\n\
@@ -647,8 +644,8 @@ or by using a web forum such as Stack Overflow.\n\n"), fp);
By default it reads standard input and writes standard output.\n\n"), fp);
/* ditto */
- fputs(_("Examples:\n\tgawk '{ sum += $1 }; END { print sum }' file\n\
-\tgawk -F: '{ print $1 }' /etc/passwd\n"), fp);
+ fprintf(fp, _("Examples:\n\t%s '{ sum += $1 }; END { print sum }'
file\n\
+\tgawk -F: '{ print $1 }' /etc/passwd\n"), myname);
fflush(fp);
@@ -662,9 +659,9 @@ By default it reads standard input and writes standard
output.\n\n"), fp);
die_via_sigpipe();
if (fp == stdout)
- warning(_("error writing standard output (%s)"),
strerror(errno));
+ warning(_("error writing standard output: %s"),
strerror(errno));
else if (fp == stderr)
- warning(_("error writing standard error (%s)"),
strerror(errno));
+ warning(_("error writing standard error: %s"),
strerror(errno));
// some other problem than SIGPIPE
exit(EXIT_FAILURE);
@@ -709,7 +706,7 @@ along with this program. If not, see
http://www.gnu.org/licenses/.\n";);
#endif
/* don't warn about stdout if EPIPE, but do error exit */
if (errno != EPIPE)
- warning(_("error writing standard output (%s)"),
strerror(errno));
+ warning(_("error writing standard output: %s"),
strerror(errno));
exit(EXIT_FAILURE);
}
diff --git a/symbol.c b/symbol.c
index e2e07c3..5cbc4d3 100644
--- a/symbol.c
+++ b/symbol.c
@@ -688,7 +688,7 @@ check_param_names(void)
if (in_array(func_table, & n)) {
error(
- _("function `%s': can't use function `%s' as a
parameter name"),
+ _("function `%s': cannot use function `%s' as a
parameter name"),
list[i]->stptr,
f->fparms[j].param);
result = false;
@@ -818,7 +818,7 @@ pop_context()
assert(curr_ctxt != NULL);
if (curr_ctxt->prev == NULL)
- fatal(_("can not pop main context"));
+ fatal(_("cannot pop main context"));
ctxt = curr_ctxt->prev;
/* restore source and sourceline */
sourceline = ctxt->sourceline;
diff --git a/test/ChangeLog b/test/ChangeLog
index 87b5cac..01c28bb 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-09 Arnold D. Robbins <address@hidden>
+
+ * beginfile2.ok, funsmnam.ok, incdupe4.ok, incdupe5.ok, incdupe6.ok,
+ incdupe7.ok, lintold.ok, nofile.ok, nulinsrc.ok, paramasfunc1.ok,
+ paramasfunc2.ok, paramres.ok, space.ok: Update after code changes.
+
2020-03-07 Arnold D. Robbins <address@hidden>
* symtab11.awk, symtab11.ok: Add value of array elements
diff --git a/test/beginfile2.ok b/test/beginfile2.ok
index fed71bb..86f91a0 100644
--- a/test/beginfile2.ok
+++ b/test/beginfile2.ok
@@ -6,7 +6,7 @@ In BEGINFILE: beginfile2.in
In BEGIN
In BEGINFILE: beginfile2.in
In BEGINFILE: file/does/not/exist
-gawk: cmd. line:3: fatal: cannot open file `file/does/not/exist' for reading
(No such file or directory)
+gawk: cmd. line:3: fatal: cannot open file `file/does/not/exist' for reading:
No such file or directory
--Test 2--
In BEGINFILE: beginfile2.in
In ENDFILE: beginfile2.in
diff --git a/test/funsmnam.ok b/test/funsmnam.ok
index cce0d27..6539204 100644
--- a/test/funsmnam.ok
+++ b/test/funsmnam.ok
@@ -1,2 +1,2 @@
-gawk: funsmnam.awk:2: error: function `foo': can't use function name as
parameter name
+gawk: funsmnam.awk:2: error: function `foo': cannot use function name as
parameter name
EXIT CODE: 1
diff --git a/test/incdupe4.ok b/test/incdupe4.ok
index a6fc26e..403b75f 100644
--- a/test/incdupe4.ok
+++ b/test/incdupe4.ok
@@ -1,2 +1,2 @@
-gawk: fatal: can't include `hello.awk' and use it as a program file
+gawk: fatal: cannot include `hello.awk' and use it as a program file
EXIT CODE: 2
diff --git a/test/incdupe5.ok b/test/incdupe5.ok
index a6fc26e..403b75f 100644
--- a/test/incdupe5.ok
+++ b/test/incdupe5.ok
@@ -1,2 +1,2 @@
-gawk: fatal: can't include `hello.awk' and use it as a program file
+gawk: fatal: cannot include `hello.awk' and use it as a program file
EXIT CODE: 2
diff --git a/test/incdupe6.ok b/test/incdupe6.ok
index 42a4f9f..a337829 100644
--- a/test/incdupe6.ok
+++ b/test/incdupe6.ok
@@ -1,3 +1,3 @@
gawk: inchello:1: warning: `include' is a gawk extension
-gawk: inchello:2: fatal: can't include `hello' and use it as a program file
+gawk: inchello:2: fatal: cannot include `hello' and use it as a program file
EXIT CODE: 2
diff --git a/test/incdupe7.ok b/test/incdupe7.ok
index 42a4f9f..a337829 100644
--- a/test/incdupe7.ok
+++ b/test/incdupe7.ok
@@ -1,3 +1,3 @@
gawk: inchello:1: warning: `include' is a gawk extension
-gawk: inchello:2: fatal: can't include `hello' and use it as a program file
+gawk: inchello:2: fatal: cannot include `hello' and use it as a program file
EXIT CODE: 2
diff --git a/test/lintold.ok b/test/lintold.ok
index e3867e4..df60aad 100644
--- a/test/lintold.ok
+++ b/test/lintold.ok
@@ -1,10 +1,10 @@
gawk: lintold.awk:7: warning: `delete' is not supported in old awk
gawk: lintold.awk:8: warning: old awk does not support the keyword `in' except
after `for'
-gawk: lintold.awk:9: warning: old awk does not support operator `**='
+gawk: lintold.awk:9: warning: operator `**=' is not supported in old awk
gawk: lintold.awk:10: warning: old awk does not support the keyword `in'
except after `for'
gawk: lintold.awk:10: warning: old awk does not support multidimensional arrays
gawk: lintold.awk:11: warning: operator `^=' is not supported in old awk
-gawk: lintold.awk:11: warning: old awk does not support operator `**'
+gawk: lintold.awk:11: warning: operator `**' is not supported in old awk
gawk: lintold.awk:11: warning: operator `^' is not supported in old awk
gawk: lintold.awk:13: warning: old awk does not support multiple `BEGIN' or
`END' rules
gawk: lintold.awk:15: warning: old awk does not support the `\b' escape
sequence
diff --git a/test/nofile.ok b/test/nofile.ok
index eff8c04..fd486f0 100644
--- a/test/nofile.ok
+++ b/test/nofile.ok
@@ -1,2 +1,2 @@
-gawk: fatal: cannot open file `no/such/file' for reading (No such file or
directory)
+gawk: fatal: cannot open file `no/such/file' for reading: No such file or
directory
EXIT CODE: 2
diff --git a/test/nulinsrc.ok b/test/nulinsrc.ok
index 515f423..e424ad1 100644
--- a/test/nulinsrc.ok
+++ b/test/nulinsrc.ok
@@ -1,2 +1,2 @@
-gawk: nulinsrc.awk:1: fatal: PEBKAC error: invalid character '\000' in source
code
+gawk: nulinsrc.awk:1: fatal: error: invalid character '\000' in source code
EXIT CODE: 2
diff --git a/test/paramasfunc1.ok b/test/paramasfunc1.ok
index 9ee9511..bfde515 100644
--- a/test/paramasfunc1.ok
+++ b/test/paramasfunc1.ok
@@ -1,3 +1,3 @@
gawk: paramasfunc1.awk:6: error: attempt to use non-function `abc' in function
call
-gawk: error: function `X': can't use function `abc' as a parameter name
+gawk: error: function `X': cannot use function `abc' as a parameter name
EXIT CODE: 1
diff --git a/test/paramasfunc2.ok b/test/paramasfunc2.ok
index 2cdf4f6..c4ac75d 100644
--- a/test/paramasfunc2.ok
+++ b/test/paramasfunc2.ok
@@ -1,3 +1,3 @@
gawk: paramasfunc2.awk:8: error: attempt to use non-function `abc' in function
call
-gawk: error: function `X': can't use function `abc' as a parameter name
+gawk: error: function `X': cannot use function `abc' as a parameter name
EXIT CODE: 1
diff --git a/test/paramres.ok b/test/paramres.ok
index 0687f92..0b6a287 100644
--- a/test/paramres.ok
+++ b/test/paramres.ok
@@ -1,2 +1,2 @@
-gawk: paramres.awk:3: error: function `foo': can't use special variable `FS'
as a function parameter
+gawk: paramres.awk:3: error: function `foo': cannot use special variable `FS'
as a function parameter
EXIT CODE: 1
diff --git a/test/space.ok b/test/space.ok
index 0f76956..9e9ef00 100644
--- a/test/space.ok
+++ b/test/space.ok
@@ -1,2 +1,2 @@
-gawk: fatal: can't open source file ` ' for reading (No such file or directory)
+gawk: fatal: cannot open source file ` ' for reading: No such file or directory
EXIT CODE: 2
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 +++++
array.c | 32 ++++++++++---------------
awk.h | 6 ++---
awkgram.c | 43 +++++++++++++++++----------------
awkgram.y | 43 +++++++++++++++++----------------
builtin.c | 6 ++---
command.c | 28 +++++++++++-----------
command.y | 28 +++++++++++-----------
debug.c | 37 ++++++++++++++--------------
ext.c | 14 +++++------
int_array.c | 2 +-
io.c | 68 ++++++++++++++++++++++++++--------------------------
main.c | 21 +++++++---------
symbol.c | 4 ++--
test/ChangeLog | 6 +++++
test/beginfile2.ok | 2 +-
test/funsmnam.ok | 2 +-
test/incdupe4.ok | 2 +-
test/incdupe5.ok | 2 +-
test/incdupe6.ok | 2 +-
test/incdupe7.ok | 2 +-
test/lintold.ok | 4 ++--
test/nofile.ok | 2 +-
test/nulinsrc.ok | 2 +-
test/paramasfunc1.ok | 2 +-
test/paramasfunc2.ok | 2 +-
test/paramres.ok | 2 +-
test/space.ok | 2 +-
28 files changed, 189 insertions(+), 183 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, master, updated. gawk-4.1.0-3909-g6514b3a,
Arnold Robbins <=