commit bash-20110922 snapshot

This commit is contained in:
Chet Ramey
2012-01-09 08:28:43 -05:00
parent b13b8a87dd
commit b28ff8c95e
16 changed files with 865 additions and 510 deletions
+40
View File
@@ -12187,3 +12187,43 @@ builtins/declare.def
it as an assignment error and don't attempt any further processing
of that declaration. Fixes segfault bug reported by Diego Augusto
Molina <diegoaugustomolina@gmail.com>
9/19
----
expr.c
- exppower: replace the simple exponentiation algorithm with an
implementation of exponentiation by squaring. Inspired by report
from Nicolas ARGYROU <nargy@yahoo.com>
bashline.c
- bash_quote_filename: check for rtext being non-null before
dereferencing it
- set_saved_history: operate_and_get_next assumes that the previous
line was added to the history, even when the history is stifled and
at the max number of entries. If it wasn't, make sure the history
number is incremented properly. Partial fix for bug reported by
gregrwm <backuppc-users@whitleymott.net>
doc/{bash.1,bashref.texi},lib/readline/doc/{hsuser,rluser}.texi
- minor editorial changes inspired by suggestions from
<rogerx.oss@gmail.com>
9/20
----
lib/intl/localealias.c
- read_alias_file: close resource leak (fp) when returning on error
9/22
----
execute_command.c
- execute_intern_function: implement Posix interpretation 383 by making
it an error to define a function with the same name as a special
builtin when in Posix mode.
http://austingroupbugs.net/view.php?id=383#c692
9/25
----
doc/{bash.1,bashref.texi}
- formatting and some content changes from Benno Schulenberg
<bensberg@justemail.net>
- document new posix-mode behavior from interp 383 change of 9/22
+54
View File
@@ -12172,3 +12172,57 @@ bashline.c
sh_backslash_quote gets the table with the characters in the
variable reference removed, which means they are removed from the
set of characters to be quoted in filenames
9/10
----
bashline.c
- bash_filename_stat_hook: new function, designed to expand variable
references in filenames before readline passes them to stat(2)
to determine whether or not they are a directory
9/15
----
builtins/declare.def
- if assign_array_element fails due to a bad (or empty) subscript, mark
it as an assignment error and don't attempt any further processing
of that declaration. Fixes segfault bug reported by Diego Augusto
Molina <diegoaugustomolina@gmail.com>
9/19
----
expr.c
- exppower: replace the simple exponentiation algorithm with an
implementation of exponentiation by squaring. Inspired by report
from Nicolas ARGYROU <nargy@yahoo.com>
bashline.c
- bash_quote_filename: check for rtext being non-null before
dereferencing it
- set_saved_history: operate_and_get_next assumes that the previous
line was added to the history, even when the history is stifled and
at the max number of entries. If it wasn't, make sure the history
number is incremented properly. Partial fix for bug reported by
gregrwm <backuppc-users@whitleymott.net>
doc/{bash.1,bashref.texi},lib/readline/doc/{hsuser,rluser}.texi
- minor editorial changes inspired by suggestions from
<rogerx.oss@gmail.com>
9/20
----
lib/intl/localealias.c
- read_alias_file: close resource leak (fp) when returning on error
9/22
----
execute_command.c
- execute_intern_function: implement Posix interpretation 383 by making
it an error to define a function with the same name as a special
builtin when in Posix mode.
http://austingroupbugs.net/view.php?id=383#c692
9/25
----
doc/{bash.1,bashref.texi}
- formatting and some content changes from Benno Schulenberg
<bensberg@justemail.net>
+26 -6
View File
@@ -849,12 +849,25 @@ hostnames_matching (text)
/* The equivalent of the Korn shell C-o operate-and-get-next-history-line
editing command. */
static int saved_history_line_to_use = -1;
static int last_saved_history_line = -1;
#define HISTORY_FULL() (history_is_stifled () && history_length >= history_max_entries)
static int
set_saved_history ()
{
/* XXX - compensate for assumption that history was `shuffled' if it was
actually not. */
if (HISTORY_FULL () &&
hist_last_line_added == 0 &&
saved_history_line_to_use < history_length - 1)
saved_history_line_to_use++;
if (saved_history_line_to_use >= 0)
rl_get_previous_history (history_length - saved_history_line_to_use, 0);
{
rl_get_previous_history (history_length - saved_history_line_to_use, 0);
last_saved_history_line = saved_history_line_to_use;
}
saved_history_line_to_use = -1;
rl_startup_hook = old_rl_startup_hook;
return (0);
@@ -872,8 +885,7 @@ operate_and_get_next (count, c)
/* Find the current line, and find the next line to use. */
where = where_history ();
if ((history_is_stifled () && (history_length >= history_max_entries)) ||
(where >= history_length - 1))
if (HISTORY_FULL () || (where >= history_length - 1))
saved_history_line_to_use = where;
else
saved_history_line_to_use = where + 1;
@@ -3656,9 +3668,17 @@ bash_quote_filename (s, rtype, qcp)
/* Leave the opening quote intact. The readline completion code takes
care of avoiding doubled opening quotes. */
rlen = strlen (rtext);
ret = (char *)xmalloc (rlen + 1);
strcpy (ret, rtext);
if (rtext)
{
rlen = strlen (rtext);
ret = (char *)xmalloc (rlen + 1);
strcpy (ret, rtext);
}
else
{
ret = (char *)xmalloc (rlen = 1);
ret[0] = '\0';
}
/* If there are multiple matches, cut off the closing quote. */
if (rtype == MULT_MATCH && cs != COMPLETE_BSQUOTE)
+90 -74
View File
@@ -5,12 +5,12 @@
.\" Case Western Reserve University
.\" chet@po.cwru.edu
.\"
.\" Last Change: Fri Sep 16 08:43:45 EDT 2011
.\" Last Change: Sun Sep 25 22:01:16 EDT 2011
.\"
.\" bash_builtins, strip all but Built-Ins section
.if \n(zZ=1 .ig zZ
.if \n(zY=1 .ig zY
.TH BASH 1 "2011 September 16" "GNU Bash 4.2"
.TH BASH 1 "2011 September 25" "GNU Bash 4.2"
.\"
.\" There's some problem with having a `@'
.\" in a tagged paragraph with the BSD man macros.
@@ -294,7 +294,7 @@ executes its startup files.
If any of the files exist but cannot be read,
.B bash
reports an error.
Tildes are expanded in file names as described below under
Tildes are expanded in filenames as described below under
.B "Tilde Expansion"
in the
.SM
@@ -348,7 +348,7 @@ behaves as if the following command were executed:
but the value of the
.SM
.B PATH
variable is not used to search for the file name.
variable is not used to search for the filename.
.PP
If
.B bash
@@ -920,7 +920,7 @@ If \fINAME\fP is not supplied, the default name is \fBCOPROC\fP.
\fINAME\fP must not be supplied if \fIcommand\fP is a \fIsimple
command\fP (see above); otherwise, it is interpreted as the first word
of the simple command.
When the coproc is executed, the shell creates an array variable (see
When the coprocess is executed, the shell creates an array variable (see
.B Arrays
below) named \fINAME\fP in the context of the executing shell.
The standard output of
@@ -965,6 +965,8 @@ That command is usually a \fIlist\fP of commands between { and }, but
may be any command listed under \fBCompound Commands\fP above.
\fIcompound\-command\fP is executed whenever \fIname\fP is specified as the
name of a simple command.
When in \fIposix mode\fP, \fIname\fP may not be the name of one of the
POSIX \fIspecial builtins\fP.
Any redirections (see
.SM
.B REDIRECTION
@@ -1329,7 +1331,7 @@ option, then
.B $0
is set to the first argument after the string to be
executed, if one is present. Otherwise, it is set
to the file name used to invoke
to the filename used to invoke
.BR bash ,
as given by argument zero.
.TP
@@ -1351,7 +1353,7 @@ The following variables are set by the shell:
.PD 0
.TP
.B BASH
Expands to the full file name used to invoke this instance of
Expands to the full filename used to invoke this instance of
.BR bash .
.TP
.B BASHOPTS
@@ -1830,10 +1832,10 @@ The value of
.SM
.B BASH_ENV
is subjected to parameter expansion, command substitution, and arithmetic
expansion before being interpreted as a file name.
expansion before being interpreted as a filename.
.SM
.B PATH
is not used to search for the resultant file name.
is not used to search for the resultant filename.
.TP
.B BASH_XTRACEFD
If set to an integer corresponding to a valid file descriptor, \fBbash\fP
@@ -2128,9 +2130,9 @@ If this variable is unset, or set to a value that is not a number
greater than or equal to zero, the shell disables mail checking.
.TP
.B MAILPATH
A colon-separated list of file names to be checked for mail.
A colon-separated list of filenames to be checked for mail.
The message to be printed when mail arrives in a particular file
may be specified by separating the file name from the message with a `?'.
may be specified by separating the filename from the message with a `?'.
When used in the text of the message, \fB$_\fP expands to the name of
the current mailfile.
Example:
@@ -2393,7 +2395,7 @@ builtins. Each attribute applies to all members of an array.
Arrays are assigned to using compound assignments of the form
\fIname\fP=\fB(\fPvalue\fI1\fP ... value\fIn\fP\fB)\fP, where each
\fIvalue\fP is of the form [\fIsubscript\fP]=\fIstring\fP.
Indexed array assignments do not require the bracket and subscript.
Indexed array assignments do not require anything but \fIstring\fP.
When assigning to indexed arrays, if the optional brackets and subscript
are supplied, that index is assigned to;
otherwise the index of the element assigned is the last index assigned
@@ -2646,7 +2648,7 @@ following a
or the first
.BR = .
In these cases, tilde expansion is also performed.
Consequently, one may use file names with tildes in assignments to
Consequently, one may use filenames with tildes in assignments to
.SM
.BR PATH ,
.SM
@@ -3134,12 +3136,12 @@ If one of these characters appears, then the word is
regarded as a
.IR pattern ,
and replaced with an alphabetically sorted list of
file names matching the pattern
filenames matching the pattern
(see
.SM
.B "Pattern Matching"
below).
If no matching file names are found,
If no matching filenames are found,
and the shell option
.B nullglob
is not enabled, the word is left unchanged.
@@ -3183,16 +3185,16 @@ shell options.
The
.SM
.B GLOBIGNORE
shell variable may be used to restrict the set of file names matching a
shell variable may be used to restrict the set of filenames matching a
.IR pattern .
If
.SM
.B GLOBIGNORE
is set, each matching file name that also matches one of the patterns in
is set, each matching filename that also matches one of the patterns in
.SM
.B GLOBIGNORE
is removed from the list of matches.
The file names
The filenames
.B ``.''
and
.B ``..''
@@ -3204,10 +3206,10 @@ is set and not null. However, setting
.B GLOBIGNORE
to a non-null value has the effect of enabling the
.B dotglob
shell option, so all other file names beginning with a
shell option, so all other filenames beginning with a
.B ``.''
will match.
To get the old behavior of ignoring file names beginning with a
To get the old behavior of ignoring filenames beginning with a
.BR ``.'' ,
make
.B ``.*''
@@ -4405,7 +4407,7 @@ When
.B bash
invokes an external command, the variable
.B _
is set to the full file name of the command and passed to that
is set to the full filename of the command and passed to that
command in its environment.
.SH "EXIT STATUS"
.PP
@@ -5965,11 +5967,11 @@ will be executed by the shell.
.B glob\-complete\-word (M\-g)
The word before point is treated as a pattern for pathname expansion,
with an asterisk implicitly appended. This pattern is used to
generate a list of matching file names for possible completions.
generate a list of matching filenames for possible completions.
.TP
.B glob\-expand\-word (C\-x *)
The word before point is treated as a pattern for pathname expansion,
and the list of matching file names is inserted, replacing the word.
and the list of matching filenames is inserted, replacing the word.
If a numeric argument is supplied, an asterisk is appended before
pathname expansion.
.TP
@@ -6513,10 +6515,10 @@ one or more of the following modifiers, each preceded by a `:'.
.PP
.TP
.B h
Remove a trailing file name component, leaving only the head.
Remove a trailing filename component, leaving only the head.
.TP
.B t
Remove all leading file name components, leaving the tail.
Remove all leading filename components, leaving the tail.
.TP
.B r
Remove a trailing suffix of the form \fI.xxx\fP, leaving the
@@ -6620,7 +6622,7 @@ executed from
.IR filename .
If
.I filename
does not contain a slash, file names in
does not contain a slash, filenames in
.SM
.B PATH
are used to find the directory containing
@@ -6900,7 +6902,7 @@ option is supplied, a description of
.I command
is printed. The
.B \-v
option causes a single word indicating the command or file name
option causes a single word indicating the command or filename
used to invoke
.I command
to be displayed; the
@@ -7263,11 +7265,15 @@ turns off the attribute instead,
with the exceptions that \fB+a\fP
may not be used to destroy an array variable and \fB+r\fP will not
remove the readonly attribute.
When used in a function, makes each
When used in a function,
.B declare
and
.B typeset
make each
\fIname\fP local, as with the
.B local
command,
unless the \fB\-g\fP option is supplied,
unless the \fB\-g\fP option is supplied.
If a variable name is followed by =\fIvalue\fP, the value of
the variable is set to \fIvalue\fP.
The return value is 0 unless an invalid option is encountered,
@@ -7284,7 +7290,7 @@ an attempt is made to turn off array status for an array variable,
or an attempt is made to display a non-existent function with \fB\-f\fP.
.RE
.TP
.B dirs [+\fIn\fP] [\-\fIn\fP] [\fB\-clpv\fP]
.B dirs [\fB\-clpv\fP] [+\fIn\fP] [\-\fIn\fP]
Without options, displays the list of currently remembered directories.
The default display is on a single line with directory names separated
by spaces.
@@ -7296,6 +7302,20 @@ command removes entries from the list.
.RS
.PD 0
.TP
.B \-c
Clears the directory stack by deleting all of the entries.
.TP
.B \-l
Produces a listing using full pathnames;
the default listing format uses a tilde to denote the home directory.
.TP
.B \-p
Print the directory stack with one entry per line.
.TP
.B \-v
Print the directory stack with one entry per line,
prefixing each entry with its index in the stack.
.TP
\fB+\fP\fIn\fP
Displays the \fIn\fPth entry counting from the left of the list
shown by
@@ -7307,20 +7327,6 @@ Displays the \fIn\fPth entry counting from the right of the list
shown by
.B dirs
when invoked without options, starting with zero.
.TP
.B \-c
Clears the directory stack by deleting all of the entries.
.TP
.B \-l
Produces a longer listing; the default listing format uses a
tilde to denote the home directory.
.TP
.B \-p
Print the directory stack with one entry per line.
.TP
.B \-v
Print the directory stack with one entry per line,
prefixing each entry with its index in the stack.
.PD
.PP
The return value is 0 unless an
@@ -7329,9 +7335,9 @@ of the directory stack.
.RE
.TP
\fBdisown\fP [\fB\-ar\fP] [\fB\-h\fP] [\fIjobspec\fP ...]
Without options, each
Without options, remove each
.I jobspec
is removed from the table of active jobs.
from the table of active jobs.
If
.I jobspec
is not present, and neither \fB\-a\fP nor \fB\-r\fP is supplied,
@@ -7506,12 +7512,14 @@ to be executed with an empty environment. If
.B \-a
is supplied, the shell passes
.I name
as the zeroth argument to the executed command. If
as the zeroth argument to the executed command.
If
.I command
cannot be executed for some reason, a non-interactive shell exits,
unless the shell option
unless the
.B execfail
is enabled, in which case it returns failure.
shell option
is enabled. In that case, it returns failure.
An interactive shell returns failure if the file cannot be executed.
If
.I command
@@ -7549,7 +7557,7 @@ If no
are given, or if the
.B \-p
option is supplied, a list
of all names that are exported in this shell is printed.
of names of all exported variables is printed.
The
.B \-n
option causes the export property to be removed from each
@@ -7570,11 +7578,11 @@ that is not a function.
.TP
\fBfc\fP \fB\-s\fP [\fIpat\fP=\fIrep\fP] [\fIcmd\fP]
.PD
Fix Command. In the first form, a range of commands from
The first form selects a range of commands from
.I first
to
.I last
is selected from the history list.
from the history list and displays or edits and re-executes them.
.I First
and
.I last
@@ -7628,6 +7636,7 @@ echoed and executed.
.sp 1
In the second form, \fIcommand\fP is re-executed after each instance
of \fIpat\fP is replaced by \fIrep\fP.
\fICommand\fP is intepreted the same as \fIfirst\fP above.
A useful alias to use with this is
.if n ``r="fc -s"'',
.if t \f(CWr='fc \-s'\fP,
@@ -7730,7 +7739,7 @@ can report errors in two ways. If the first character of
.I optstring
is a colon,
.I silent
error reporting is used. In normal operation diagnostic messages
error reporting is used. In normal operation, diagnostic messages
are printed when invalid options or missing option arguments are
encountered.
If the variable
@@ -7791,7 +7800,7 @@ If the
.B \-p
option is supplied, no path search is performed, and
.I filename
is used as the full file name of the command.
is used as the full filename of the command.
The
.B \-r
option causes the shell to forget all
@@ -7895,10 +7904,10 @@ current \fBbash\fP session.
.TP
.B \-r
Read the contents of the history file
and use them as the current history.
and append them to the current history list.
.TP
.B \-w
Write the current history to the history file, overwriting the
Write the current history list to the history file, overwriting the
history file's contents.
.TP
.B \-p
@@ -7954,10 +7963,10 @@ List only the process ID of the job's process group
leader.
.TP
.B \-r
Restrict output to running jobs.
Display only running jobs.
.TP
.B \-s
Restrict output to stopped jobs.
Display only stopped jobs.
.PD
.PP
If
@@ -8455,21 +8464,26 @@ is supplied with a
that is not a function.
.TP
\fBreturn\fP [\fIn\fP]
Causes a function to exit with the return value specified by
.IR n .
Causes a function to stop executing and return the value specified by
.I n
to its caller.
If
.I n
is omitted, the return status is that of the last command
executed in the function body. If used outside a function,
executed in the function body. If
.B return
is used outside a function,
but during execution of a script by the
.B .
(\fBsource\fP) command, it causes the shell to stop executing
that script and return either
.I n
or the exit status of the last command executed within the
script as the exit status of the script. If used outside a
function and not during execution of a script by \fB.\fP\^,
the return status is false.
script as the exit status of the script.
The return status is non-zero if
.B return
is used outside a
function and not during execution of a script by \fB.\fP\^ or \fBsource\fP.
Any command associated with the \fBRETURN\fP trap is executed
before execution resumes after the function or script.
.TP
@@ -8891,8 +8905,9 @@ If either
.B \-s
or
.B \-u
is used with no \fIoptname\fP arguments, the display is limited to
those options which are set or unset, respectively.
is used with no \fIoptname\fP arguments,
.B shopt
shows only those options which are set or unset, respectively.
Unless otherwise noted, the \fBshopt\fP options are disabled (unset)
by default.
.PP
@@ -8924,7 +8939,7 @@ If set, minor errors in the spelling of a directory component in a
command will be corrected.
The errors checked for are transposed characters,
a missing character, and one character too many.
If a correction is found, the corrected file name is printed,
If a correction is found, the corrected filename is printed,
and the command proceeds.
This option is only used by interactive shells.
.TP 8
@@ -9299,7 +9314,7 @@ is not supplied, or if job control is not enabled.
.PD 0
.TP
\fB[\fP \fIexpr\fP \fB]\fP
Return a status of 0 or 1 depending on
Return a status of 0 (true) or 1 (false) depending on
the evaluation of the conditional expression
.IR expr .
Each operator and operand must be a separate argument.
@@ -9570,7 +9585,7 @@ If a command is hashed,
.B \-p
and
.B \-P
print the hashed value, not necessarily the file that appears
print the hashed value, which is not necessarily the file that appears
first in
.SM
.BR PATH .
@@ -9685,16 +9700,17 @@ The maximum number of threads
.PP
If
.I limit
is given, it is the new value of the specified resource (the
is given, and the
.B \-a
option is display only).
option is not used,
\fIlimit\fP is the new value of the specified resource.
If no option is given, then
.B \-f
is assumed. Values are in 1024-byte increments, except for
.BR \-t ,
which is in seconds,
which is in seconds;
.BR \-p ,
which is in units of 512-byte blocks,
which is in units of 512-byte blocks;
and
.BR \-T ,
.BR \-b ,
@@ -9833,7 +9849,7 @@ or
specifying command names containing
.B /
.IP \(bu
specifying a file name containing a
specifying a filename containing a
.B /
as an argument to the
.B .
+128 -90
View File
@@ -5,12 +5,12 @@
.\" Case Western Reserve University
.\" chet@po.cwru.edu
.\"
.\" Last Change: Tue Aug 16 20:43:02 EDT 2011
.\" Last Change: Sun Sep 25 22:01:16 EDT 2011
.\"
.\" bash_builtins, strip all but Built-Ins section
.if \n(zZ=1 .ig zZ
.if \n(zY=1 .ig zY
.TH BASH 1 "2011 August 16" "GNU Bash 4.2"
.TH BASH 1 "2011 September 25" "GNU Bash 4.2"
.\"
.\" There's some problem with having a `@'
.\" in a tagged paragraph with the BSD man macros.
@@ -294,7 +294,7 @@ executes its startup files.
If any of the files exist but cannot be read,
.B bash
reports an error.
Tildes are expanded in file names as described below under
Tildes are expanded in filenames as described below under
.B "Tilde Expansion"
in the
.SM
@@ -348,7 +348,7 @@ behaves as if the following command were executed:
but the value of the
.SM
.B PATH
variable is not used to search for the file name.
variable is not used to search for the filename.
.PP
If
.B bash
@@ -530,11 +530,12 @@ command (see
.SM
.B REDIRECTION
below).
If \fB|&\fP is used, the standard error of \fIcommand\fP is connected to
\fIcommand2\fP's standard input through the pipe; it is shorthand for
\fB2>&1 |\fP.
This implicit redirection of the standard error is performed after any
redirections specified by the command.
If \fB|&\fP is used, \fIcommand\fP's standard output and standard error
are connected to
\fIcommand2\fP's standard input through the pipe;
it is shorthand for \fB2>&1 |\fP.
This implicit redirection of the standard error is
performed after any redirections specified by the command.
.PP
The return status of a pipeline is the exit status of the last
command, unless the \fBpipefail\fP option is enabled.
@@ -919,7 +920,7 @@ If \fINAME\fP is not supplied, the default name is \fBCOPROC\fP.
\fINAME\fP must not be supplied if \fIcommand\fP is a \fIsimple
command\fP (see above); otherwise, it is interpreted as the first word
of the simple command.
When the coproc is executed, the shell creates an array variable (see
When the coprocess is executed, the shell creates an array variable (see
.B Arrays
below) named \fINAME\fP in the context of the executing shell.
The standard output of
@@ -1328,7 +1329,7 @@ option, then
.B $0
is set to the first argument after the string to be
executed, if one is present. Otherwise, it is set
to the file name used to invoke
to the filename used to invoke
.BR bash ,
as given by argument zero.
.TP
@@ -1350,7 +1351,7 @@ The following variables are set by the shell:
.PD 0
.TP
.B BASH
Expands to the full file name used to invoke this instance of
Expands to the full filename used to invoke this instance of
.BR bash .
.TP
.B BASHOPTS
@@ -1829,10 +1830,10 @@ The value of
.SM
.B BASH_ENV
is subjected to parameter expansion, command substitution, and arithmetic
expansion before being interpreted as a file name.
expansion before being interpreted as a filename.
.SM
.B PATH
is not used to search for the resultant file name.
is not used to search for the resultant filename.
.TP
.B BASH_XTRACEFD
If set to an integer corresponding to a valid file descriptor, \fBbash\fP
@@ -2127,9 +2128,9 @@ If this variable is unset, or set to a value that is not a number
greater than or equal to zero, the shell disables mail checking.
.TP
.B MAILPATH
A colon-separated list of file names to be checked for mail.
A colon-separated list of filenames to be checked for mail.
The message to be printed when mail arrives in a particular file
may be specified by separating the file name from the message with a `?'.
may be specified by separating the filename from the message with a `?'.
When used in the text of the message, \fB$_\fP expands to the name of
the current mailfile.
Example:
@@ -2392,7 +2393,7 @@ builtins. Each attribute applies to all members of an array.
Arrays are assigned to using compound assignments of the form
\fIname\fP=\fB(\fPvalue\fI1\fP ... value\fIn\fP\fB)\fP, where each
\fIvalue\fP is of the form [\fIsubscript\fP]=\fIstring\fP.
Indexed array assignments do not require the bracket and subscript.
Indexed array assignments do not require anything but \fIstring\fP.
When assigning to indexed arrays, if the optional brackets and subscript
are supplied, that index is assigned to;
otherwise the index of the element assigned is the last index assigned
@@ -2645,7 +2646,7 @@ following a
or the first
.BR = .
In these cases, tilde expansion is also performed.
Consequently, one may use file names with tildes in assignments to
Consequently, one may use filenames with tildes in assignments to
.SM
.BR PATH ,
.SM
@@ -3133,12 +3134,12 @@ If one of these characters appears, then the word is
regarded as a
.IR pattern ,
and replaced with an alphabetically sorted list of
file names matching the pattern
filenames matching the pattern
(see
.SM
.B "Pattern Matching"
below).
If no matching file names are found,
If no matching filenames are found,
and the shell option
.B nullglob
is not enabled, the word is left unchanged.
@@ -3182,16 +3183,16 @@ shell options.
The
.SM
.B GLOBIGNORE
shell variable may be used to restrict the set of file names matching a
shell variable may be used to restrict the set of filenames matching a
.IR pattern .
If
.SM
.B GLOBIGNORE
is set, each matching file name that also matches one of the patterns in
is set, each matching filename that also matches one of the patterns in
.SM
.B GLOBIGNORE
is removed from the list of matches.
The file names
The filenames
.B ``.''
and
.B ``..''
@@ -3203,10 +3204,10 @@ is set and not null. However, setting
.B GLOBIGNORE
to a non-null value has the effect of enabling the
.B dotglob
shell option, so all other file names beginning with a
shell option, so all other filenames beginning with a
.B ``.''
will match.
To get the old behavior of ignoring file names beginning with a
To get the old behavior of ignoring filenames beginning with a
.BR ``.'' ,
make
.B ``.*''
@@ -3395,9 +3396,10 @@ the redirection refers to the standard output (file descriptor
1).
.PP
The word following the redirection operator in the following
descriptions, unless otherwise noted, is subjected to brace expansion,
tilde expansion, parameter expansion, command substitution, arithmetic
expansion, quote removal, pathname expansion, and word splitting.
descriptions, unless otherwise noted, is subjected to
brace expansion, tilde expansion, parameter and variable expansion,
command substitution, arithmetic expansion, quote removal,
pathname expansion, and word splitting.
If it expands to more than one word,
.B bash
reports an error.
@@ -3599,8 +3601,8 @@ The format of here-documents is:
.fi
.RE
.PP
No parameter expansion, command substitution, arithmetic expansion,
or pathname expansion is performed on
No parameter and variable expansion, command substitution,
arithmetic expansion, or pathname expansion is performed on
.IR word .
If any characters in
.I word
@@ -3639,10 +3641,12 @@ A variant of here documents, the format is:
.fi
.RE
.PP
The \fIword\fP
is expanded as described above, with the exception that
pathname expansion is not applied, and supplied as a single string
to the command on its standard input.
The \fIword\fP undergoes
brace expansion, tilde expansion, parameter and variable expansion,
command substitution, arithmetic expansion, and quote removal.
Pathname expansion word splitting are not performed.
The result is supplied as a single string to the command on its
standard input.
.SS "Duplicating File Descriptors"
.PP
The redirection operator
@@ -4401,7 +4405,7 @@ When
.B bash
invokes an external command, the variable
.B _
is set to the full file name of the command and passed to that
is set to the full filename of the command and passed to that
command in its environment.
.SH "EXIT STATUS"
.PP
@@ -5961,11 +5965,11 @@ will be executed by the shell.
.B glob\-complete\-word (M\-g)
The word before point is treated as a pattern for pathname expansion,
with an asterisk implicitly appended. This pattern is used to
generate a list of matching file names for possible completions.
generate a list of matching filenames for possible completions.
.TP
.B glob\-expand\-word (C\-x *)
The word before point is treated as a pattern for pathname expansion,
and the list of matching file names is inserted, replacing the word.
and the list of matching filenames is inserted, replacing the word.
If a numeric argument is supplied, an asterisk is appended before
pathname expansion.
.TP
@@ -6509,10 +6513,10 @@ one or more of the following modifiers, each preceded by a `:'.
.PP
.TP
.B h
Remove a trailing file name component, leaving only the head.
Remove a trailing filename component, leaving only the head.
.TP
.B t
Remove all leading file name components, leaving the tail.
Remove all leading filename components, leaving the tail.
.TP
.B r
Remove a trailing suffix of the form \fI.xxx\fP, leaving the
@@ -6616,7 +6620,7 @@ executed from
.IR filename .
If
.I filename
does not contain a slash, file names in
does not contain a slash, filenames in
.SM
.B PATH
are used to find the directory containing
@@ -6896,7 +6900,7 @@ option is supplied, a description of
.I command
is printed. The
.B \-v
option causes a single word indicating the command or file name
option causes a single word indicating the command or filename
used to invoke
.I command
to be displayed; the
@@ -7259,11 +7263,15 @@ turns off the attribute instead,
with the exceptions that \fB+a\fP
may not be used to destroy an array variable and \fB+r\fP will not
remove the readonly attribute.
When used in a function, makes each
When used in a function,
.B declare
and
.B typeset
make each
\fIname\fP local, as with the
.B local
command,
unless the \fB\-g\fP option is supplied,
unless the \fB\-g\fP option is supplied.
If a variable name is followed by =\fIvalue\fP, the value of
the variable is set to \fIvalue\fP.
The return value is 0 unless an invalid option is encountered,
@@ -7280,7 +7288,7 @@ an attempt is made to turn off array status for an array variable,
or an attempt is made to display a non-existent function with \fB\-f\fP.
.RE
.TP
.B dirs [+\fIn\fP] [\-\fIn\fP] [\fB\-clpv\fP]
.B dirs [\fB\-clpv\fP] [+\fIn\fP] [\-\fIn\fP]
Without options, displays the list of currently remembered directories.
The default display is on a single line with directory names separated
by spaces.
@@ -7292,6 +7300,20 @@ command removes entries from the list.
.RS
.PD 0
.TP
.B \-c
Clears the directory stack by deleting all of the entries.
.TP
.B \-l
Produces a listing using full pathnames;
the default listing format uses a tilde to denote the home directory.
.TP
.B \-p
Print the directory stack with one entry per line.
.TP
.B \-v
Print the directory stack with one entry per line,
prefixing each entry with its index in the stack.
.TP
\fB+\fP\fIn\fP
Displays the \fIn\fPth entry counting from the left of the list
shown by
@@ -7303,20 +7325,6 @@ Displays the \fIn\fPth entry counting from the right of the list
shown by
.B dirs
when invoked without options, starting with zero.
.TP
.B \-c
Clears the directory stack by deleting all of the entries.
.TP
.B \-l
Produces a longer listing; the default listing format uses a
tilde to denote the home directory.
.TP
.B \-p
Print the directory stack with one entry per line.
.TP
.B \-v
Print the directory stack with one entry per line,
prefixing each entry with its index in the stack.
.PD
.PP
The return value is 0 unless an
@@ -7325,9 +7333,9 @@ of the directory stack.
.RE
.TP
\fBdisown\fP [\fB\-ar\fP] [\fB\-h\fP] [\fIjobspec\fP ...]
Without options, each
Without options, remove each
.I jobspec
is removed from the table of active jobs.
from the table of active jobs.
If
.I jobspec
is not present, and neither \fB\-a\fP nor \fB\-r\fP is supplied,
@@ -7502,12 +7510,14 @@ to be executed with an empty environment. If
.B \-a
is supplied, the shell passes
.I name
as the zeroth argument to the executed command. If
as the zeroth argument to the executed command.
If
.I command
cannot be executed for some reason, a non-interactive shell exits,
unless the shell option
unless the
.B execfail
is enabled, in which case it returns failure.
shell option
is enabled. In that case, it returns failure.
An interactive shell returns failure if the file cannot be executed.
If
.I command
@@ -7545,7 +7555,7 @@ If no
are given, or if the
.B \-p
option is supplied, a list
of all names that are exported in this shell is printed.
of names of all exported variables is printed.
The
.B \-n
option causes the export property to be removed from each
@@ -7566,11 +7576,11 @@ that is not a function.
.TP
\fBfc\fP \fB\-s\fP [\fIpat\fP=\fIrep\fP] [\fIcmd\fP]
.PD
Fix Command. In the first form, a range of commands from
The first form selects a range of commands from
.I first
to
.I last
is selected from the history list.
from the history list and displays or edits and re-executes them.
.I First
and
.I last
@@ -7624,6 +7634,7 @@ echoed and executed.
.sp 1
In the second form, \fIcommand\fP is re-executed after each instance
of \fIpat\fP is replaced by \fIrep\fP.
\fICommand\fP is intepreted the same as \fIfirst\fP above.
A useful alias to use with this is
.if n ``r="fc -s"'',
.if t \f(CWr='fc \-s'\fP,
@@ -7726,7 +7737,7 @@ can report errors in two ways. If the first character of
.I optstring
is a colon,
.I silent
error reporting is used. In normal operation diagnostic messages
error reporting is used. In normal operation, diagnostic messages
are printed when invalid options or missing option arguments are
encountered.
If the variable
@@ -7787,7 +7798,7 @@ If the
.B \-p
option is supplied, no path search is performed, and
.I filename
is used as the full file name of the command.
is used as the full filename of the command.
The
.B \-r
option causes the shell to forget all
@@ -7891,10 +7902,10 @@ current \fBbash\fP session.
.TP
.B \-r
Read the contents of the history file
and use them as the current history.
and append them to the current history list.
.TP
.B \-w
Write the current history to the history file, overwriting the
Write the current history list to the history file, overwriting the
history file's contents.
.TP
.B \-p
@@ -7950,10 +7961,10 @@ List only the process ID of the job's process group
leader.
.TP
.B \-r
Restrict output to running jobs.
Display only running jobs.
.TP
.B \-s
Restrict output to stopped jobs.
Display only stopped jobs.
.PD
.PP
If
@@ -8390,8 +8401,9 @@ the decimal point.
This option is only effective if \fBread\fP is reading input from a
terminal, pipe, or other special file; it has no effect when reading
from regular files.
If \fItimeout\fP is 0, \fBread\fP returns success if input is available on
the specified file descriptor, failure otherwise.
If \fItimeout\fP is 0, \fBread\fP returns immediately, without trying to
read any data. The exit statis is 0 if input is available on
the specified file descriptor, non-zero otherwise.
The exit status is greater than 128 if the timeout is exceeded.
.TP
.B \-u \fIfd\fP
@@ -8450,21 +8462,26 @@ is supplied with a
that is not a function.
.TP
\fBreturn\fP [\fIn\fP]
Causes a function to exit with the return value specified by
.IR n .
Causes a function to stop executing and return the value specified by
.I n
to its caller.
If
.I n
is omitted, the return status is that of the last command
executed in the function body. If used outside a function,
executed in the function body. If
.B return
is used outside a function,
but during execution of a script by the
.B .
(\fBsource\fP) command, it causes the shell to stop executing
that script and return either
.I n
or the exit status of the last command executed within the
script as the exit status of the script. If used outside a
function and not during execution of a script by \fB.\fP\^,
the return status is false.
script as the exit status of the script.
The return status is non-zero if
.B return
is used outside a
function and not during execution of a script by \fB.\fP\^ or \fBsource\fP.
Any command associated with the \fBRETURN\fP trap is executed
before execution resumes after the function or script.
.TP
@@ -8886,8 +8903,9 @@ If either
.B \-s
or
.B \-u
is used with no \fIoptname\fP arguments, the display is limited to
those options which are set or unset, respectively.
is used with no \fIoptname\fP arguments,
.B shopt
shows only those options which are set or unset, respectively.
Unless otherwise noted, the \fBshopt\fP options are disabled (unset)
by default.
.PP
@@ -8919,7 +8937,7 @@ If set, minor errors in the spelling of a directory component in a
command will be corrected.
The errors checked for are transposed characters,
a missing character, and one character too many.
If a correction is found, the corrected file name is printed,
If a correction is found, the corrected filename is printed,
and the command proceeds.
This option is only used by interactive shells.
.TP 8
@@ -8989,6 +9007,25 @@ parameter expansion as a special character. The single quotes must match
quoted. This is the behavior of posix mode through version 4.1.
The default bash behavior remains as in previous versions.
.TP 8
.B complete_fullquote
If set,
.B bash
quotes all shell metacharacters in filenames and directory names when
performing completion.
If not set,
.B bash
removes metacharacters such as the dollar sign from the set of
characters that will be quoted in completed filenames
when these metacharacters appear in shell variable references in words to be
completed.
This means that dollar signs in variable names that expand to directories
will not be quoted;
however, any dollar signs appearing in filenames will not be quoted, either.
This is active only when bash is using backslashes to quote completed
filenames.
This variable is set by default, which is the default bash behavior in
versions through 4.2.
.TP 8
.B direxpand
If set,
.B bash
@@ -9275,7 +9312,7 @@ is not supplied, or if job control is not enabled.
.PD 0
.TP
\fB[\fP \fIexpr\fP \fB]\fP
Return a status of 0 or 1 depending on
Return a status of 0 (true) or 1 (false) depending on
the evaluation of the conditional expression
.IR expr .
Each operator and operand must be a separate argument.
@@ -9546,7 +9583,7 @@ If a command is hashed,
.B \-p
and
.B \-P
print the hashed value, not necessarily the file that appears
print the hashed value, which is not necessarily the file that appears
first in
.SM
.BR PATH .
@@ -9661,16 +9698,17 @@ The maximum number of threads
.PP
If
.I limit
is given, it is the new value of the specified resource (the
is given, and the
.B \-a
option is display only).
option is not used,
\fIlimit\fP is the new value of the specified resource.
If no option is given, then
.B \-f
is assumed. Values are in 1024-byte increments, except for
.BR \-t ,
which is in seconds,
which is in seconds;
.BR \-p ,
which is in units of 512-byte blocks,
which is in units of 512-byte blocks;
and
.BR \-T ,
.BR \-b ,
@@ -9809,7 +9847,7 @@ or
specifying command names containing
.B /
.IP \(bu
specifying a file name containing a
specifying a filename containing a
.B /
as an argument to the
.B .
+200 -133
View File
File diff suppressed because it is too large Load Diff
+230 -144
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -2,9 +2,9 @@
Copyright (C) 1988-2011 Free Software Foundation, Inc.
@end ignore
@set LASTCHANGE Fri Sep 16 08:44:02 EDT 2011
@set LASTCHANGE Sun Sep 25 22:01:31 EDT 2011
@set EDITION 4.2
@set VERSION 4.2
@set UPDATED 16 September 2011
@set UPDATED 25 September 2011
@set UPDATED-MONTH September 2011
+3 -3
View File
@@ -2,9 +2,9 @@
Copyright (C) 1988-2011 Free Software Foundation, Inc.
@end ignore
@set LASTCHANGE Sun Jul 24 16:17:58 EDT 2011
@set LASTCHANGE Mon Sep 19 21:46:24 EDT 2011
@set EDITION 4.2
@set VERSION 4.2
@set UPDATED 24 July 2011
@set UPDATED-MONTH July 2011
@set UPDATED 19 September 2011
@set UPDATED-MONTH September 2011
+8
View File
@@ -5184,6 +5184,14 @@ execute_intern_function (name, function)
return (EXECUTION_FAILURE);
}
/* Posix interpretation 383 */
if (posixly_correct && find_special_builtin (name->word))
{
internal_error (_("`%s': is a special builtin"), name->word);
last_command_exit_value = EX_BADUSAGE;
jump_to_top_level (ERREXIT);
}
var = find_function (name->word);
if (var && (readonly_p (var) || noassign_p (var)))
{
+18 -3
View File
@@ -829,6 +829,23 @@ exp2 ()
return (val1);
}
static intmax_t
ipow (base, exp)
intmax_t base, exp;
{
intmax_t result;
result = 1;
while (exp)
{
if (exp & 1)
result *= base;
exp >>= 1;
base *= base;
}
return result;
}
static intmax_t
exppower ()
{
@@ -843,9 +860,7 @@ exppower ()
return (1);
if (val2 < 0)
evalerror (_("exponent less than 0"));
for (c = 1; val2--; c *= val1)
;
val1 = c;
val1 = ipow (val1, val2);
}
return (val1);
}
+4 -1
View File
@@ -305,7 +305,10 @@ read_alias_file (fname, fname_len)
if (nmap >= maxmap)
if (__builtin_expect (extend_alias_table (), 0))
return added;
{
fclose (fp);
return added;
}
alias_len = strlen (alias) + 1;
value_len = strlen (value) + 1;
+3 -2
View File
@@ -2241,8 +2241,9 @@ rl_filename_completion_function (text, state)
}
directory = opendir (dirname);
/* Now dequote a non-null filename. */
if (filename && *filename && rl_completion_found_quote && rl_filename_dequoting_function)
/* Now dequote a non-null filename. FILENAME will not be NULL, but may
be empty. */
if (*filename && rl_completion_found_quote && rl_filename_dequoting_function)
{
/* delete single and double quotes */
temp = (*rl_filename_dequoting_function) (filename, rl_completion_quote_character);
+7 -4
View File
@@ -141,8 +141,10 @@ history list and history file.
@code{fc -s [@var{pat}=@var{rep}] [@var{command}]}
@end example
Fix Command. In the first form, a range of commands from @var{first} to
@var{last} is selected from the history list. Both @var{first} and
The first form selects a range of commands from @var{first} to
@var{last} from the history list and displays or edits and re-executes
them.
Both @var{first} and
@var{last} may be specified as a string (to locate the most recent
command beginning with that string) or as a number (an index into the
history list, where a negative number is used as an offset from the
@@ -161,6 +163,7 @@ When editing is complete, the edited commands are echoed and executed.
In the second form, @var{command} is re-executed after each instance
of @var{pat} in the selected command is replaced by @var{rep}.
@var{command} is intepreted the same as @var{first} above.
A useful alias to use with the @code{fc} command is @code{r='fc -s'}, so
that typing @samp{r cc} runs the last command beginning with @code{cc}
@@ -208,11 +211,11 @@ to the current history list. These are lines appended to the history
file since the beginning of the current Bash session.
@item -r
Read the current history file and append its contents to
Read the history file and append its contents to
the history list.
@item -w
Write out the current history to the history file.
Write out the current history list to the history file.
@item -p
Perform history substitution on the @var{arg}s and display the result
+50 -48
View File
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the bash package.
# Primož PETERLIN <primozz.peterlin@gmail.com>, 2011.
#
# $Id: bash-4.2.sl.po,v 1.9 2011/08/06 20:04:00 peterlin Exp $
# $Id: bash-4.2.sl.po,v 1.10 2011/09/20 19:33:18 peterlin Exp $
msgid ""
msgstr ""
"Project-Id-Version: bash 4.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-28 22:09-0500\n"
"PO-Revision-Date: 2011-08-06 22:03+0200\n"
"PO-Revision-Date: 2011-09-20 21:31+0200\n"
"Last-Translator: Primož PETERLIN <primozz.peterlin@gmail.com>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
"Language: sl\n"
@@ -440,8 +440,10 @@ msgstr "zadetki\tukaz\n"
#, c-format
msgid "Shell commands matching keyword `"
msgid_plural "Shell commands matching keywords `"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Ukazev lupine, ujemajočih se s ključno besedo »"
msgstr[1] "Ukaz lupine, ujemajoč se s ključno besedo »"
msgstr[2] "Ukaza lupine, ujemajoča se s ključno besedo »"
msgstr[3] "Ukazi lupine, ujemajoči se s ključno besedo »"
#: builtins/help.def:168
#, c-format
@@ -478,21 +480,21 @@ msgstr "uporabite lahko le eno od izbir -anrw"
#: builtins/history.def:186
msgid "history position"
msgstr ""
msgstr "položaj v zgodovini"
#: builtins/history.def:365
#, c-format
msgid "%s: history expansion failed"
msgstr ""
msgstr "%s: neuspešna razrešitev zgodovine"
#: builtins/inlib.def:71
#, c-format
msgid "%s: inlib failed"
msgstr ""
msgstr "%s: neuspel klic inlib"
#: builtins/jobs.def:109
msgid "no other options allowed with `-x'"
msgstr ""
msgstr "nobena druga izbira ni dovoljena skupaj z »-x«"
#: builtins/kill.def:198
#, c-format
@@ -814,7 +816,7 @@ msgstr ""
#: builtins/ulimit.def:402
#, c-format
msgid "`%c': bad command"
msgstr ""
msgstr "»%c«: slab ukaz"
#: builtins/ulimit.def:431
#, c-format
@@ -860,19 +862,19 @@ msgstr "Prekinjanje.."
#: error.c:406
msgid "unknown command error"
msgstr ""
msgstr "neznana ukazna napaka"
#: error.c:407
msgid "bad command type"
msgstr ""
msgstr "slaba zvrst ukaza"
#: error.c:408
msgid "bad connector"
msgstr ""
msgstr "slab konektor"
#: error.c:409
msgid "bad jump"
msgstr ""
msgstr "slab skok"
#: error.c:447
#, c-format
@@ -882,7 +884,7 @@ msgstr ""
#: eval.c:181
#, c-format
msgid "\atimed out waiting for input: auto-logout\n"
msgstr ""
msgstr "\ačasovna prekoračitev pri čakanju na vhod: samodejna odjava\n"
#: execute_cmd.c:504
#, c-format
@@ -892,11 +894,11 @@ msgstr "standardnega vhoda ni mogoče preusmeriti iz /dev/null: %s"
#: execute_cmd.c:1168
#, c-format
msgid "TIMEFORMAT: `%c': invalid format character"
msgstr ""
msgstr "TIMEFORMAT: »%c«: neveljavni formatni znak"
#: execute_cmd.c:2121
msgid "pipe error"
msgstr ""
msgstr "napaka cevovoda"
#: execute_cmd.c:4640
#, c-format
@@ -916,7 +918,7 @@ msgstr "%s: %s"
#: execute_cmd.c:4995
#, c-format
msgid "%s: %s: bad interpreter"
msgstr ""
msgstr "%s: %s: slab tolmač"
#: execute_cmd.c:5144
#, c-format
@@ -1010,17 +1012,17 @@ msgstr ""
#: jobs.c:468
msgid "start_pipeline: pgrp pipe"
msgstr ""
msgstr "start_pipeline: cevovod pgrp"
#: jobs.c:889
#, c-format
msgid "forked pid %d appears in running job %d"
msgstr ""
msgstr "vejeni PID %d se pojavlja v tekočem poslu %d"
#: jobs.c:1007
#, c-format
msgid "deleting stopped job %d with process group %ld"
msgstr ""
msgstr "brisanje ustavljenega posla %d s skupino procesa %ld"
#: jobs.c:1112
#, c-format
@@ -1091,17 +1093,17 @@ msgstr ""
#: jobs.c:2133 nojobs.c:585
#, c-format
msgid "wait: pid %ld is not a child of this shell"
msgstr ""
msgstr "wait: PID %ld ni naslednik te lupine"
#: jobs.c:2360
#, c-format
msgid "wait_for: No record of process %ld"
msgstr ""
msgstr "wait_for: Ni zapisa za proces %ld"
#: jobs.c:2637
#, c-format
msgid "wait_for_job: job %d is stopped"
msgstr ""
msgstr "wait_for_job: posel %d je ustavljen"
#: jobs.c:2859
#, c-format
@@ -1125,7 +1127,7 @@ msgstr "%s: vrstica %d: "
#: jobs.c:3552 nojobs.c:814
#, c-format
msgid " (core dumped)"
msgstr ""
msgstr " (izmet pomnilnika)"
#: jobs.c:3564 jobs.c:3577
#, c-format
@@ -1151,7 +1153,7 @@ msgstr ""
#: jobs.c:3712
msgid "no job control in this shell"
msgstr ""
msgstr "ta lupina nima nadzora poslov"
#: lib/malloc/malloc.c:296
#, c-format
@@ -1303,76 +1305,76 @@ msgstr ""
#: parse.y:3173 parse.y:3444
#, c-format
msgid "unexpected EOF while looking for matching `%c'"
msgstr ""
msgstr "nepričakovani EOF pri iskanju ujemajočega »%c«"
#: parse.y:4025
msgid "unexpected EOF while looking for `]]'"
msgstr ""
msgstr "nepričakovani EOF pri iskanju »]]«"
#: parse.y:4030
#, c-format
msgid "syntax error in conditional expression: unexpected token `%s'"
msgstr ""
msgstr "napaka v skladnji pogojnega izraza: nepričakovani žeton »%s«"
#: parse.y:4034
msgid "syntax error in conditional expression"
msgstr ""
msgstr "napaka v skladnji pogojnega izraza"
#: parse.y:4112
#, c-format
msgid "unexpected token `%s', expected `)'"
msgstr ""
msgstr "nepričakovani žeton »%s«, pričakovan »)«"
#: parse.y:4116
msgid "expected `)'"
msgstr ""
msgstr "pričakovan »)«"
#: parse.y:4144
#, c-format
msgid "unexpected argument `%s' to conditional unary operator"
msgstr ""
msgstr "nepričakovani argument »%s« pogojnega unarnega operatorja"
#: parse.y:4148
msgid "unexpected argument to conditional unary operator"
msgstr ""
msgstr "nepričakovani argument pogojnega unarnega operatorja"
#: parse.y:4194
#, c-format
msgid "unexpected token `%s', conditional binary operator expected"
msgstr ""
msgstr "nepričakovani žeton »%s«, pričakovan pogojni binarni operator"
#: parse.y:4198
msgid "conditional binary operator expected"
msgstr ""
msgstr "pričakovan pogojni binarni operator"
#: parse.y:4220
#, c-format
msgid "unexpected argument `%s' to conditional binary operator"
msgstr ""
msgstr "nepričakovani argument »%s« pogojnega binarnega operatorja"
#: parse.y:4224
msgid "unexpected argument to conditional binary operator"
msgstr ""
msgstr "nepričakovani argument pogojnega binarnega operatorja"
#: parse.y:4235
#, c-format
msgid "unexpected token `%c' in conditional command"
msgstr ""
msgstr "nepričakovani žeton »%c« v pogojnem ukazu"
#: parse.y:4238
#, c-format
msgid "unexpected token `%s' in conditional command"
msgstr ""
msgstr "nepričakovani žeton »%s« v pogojnem ukazu"
#: parse.y:4242
#, c-format
msgid "unexpected token %d in conditional command"
msgstr ""
msgstr "nepričakovani žeton %d v pogojnem ukazu"
#: parse.y:5566
#, c-format
msgid "syntax error near unexpected token `%s'"
msgstr ""
msgstr "napaka v skladnji blizu nepričakovanega žetona »%s«"
#: parse.y:5584
#, c-format
@@ -1432,32 +1434,32 @@ msgstr ""
#: redir.c:122
msgid "file descriptor out of range"
msgstr ""
msgstr "deskriptor datoteke izven obsega"
#: redir.c:178
#, c-format
msgid "%s: ambiguous redirect"
msgstr ""
msgstr "%s: preusmeritev ni enopomenska"
#: redir.c:182
#, c-format
msgid "%s: cannot overwrite existing file"
msgstr ""
msgstr "%s: prek obstoječe datoteke ni mogoče pisati"
#: redir.c:187
#, c-format
msgid "%s: restricted: cannot redirect output"
msgstr ""
msgstr "%s: omejitev: izhoda ni mogoče preusmeriti"
#: redir.c:192
#, c-format
msgid "cannot create temp file for here-document: %s"
msgstr ""
msgstr "ni mogoče ustvariti začasne datoteke za dokument: %s"
#: redir.c:196
#, c-format
msgid "%s: cannot assign fd to variable"
msgstr ""
msgstr "%s: fd ni mogoče pripisati spremenljivki"
#: redir.c:548
msgid "/dev/(tcp|udp)/host/port not supported without networking"
@@ -1465,7 +1467,7 @@ msgstr ""
#: redir.c:818 redir.c:930 redir.c:993 redir.c:1136
msgid "redirection error: cannot duplicate fd"
msgstr ""
msgstr "napaka pri preusmeritvi: fd ni mogoče podvojiti"
#: shell.c:333
msgid "could not find /tmp, please create!"
+2
View File
@@ -12,6 +12,7 @@ shopt -u compat31
shopt -u compat32
shopt -u compat40
shopt -u compat41
shopt -s complete_fullquote
shopt -u direxpand
shopt -u dirspell
shopt -u dotglob
@@ -52,6 +53,7 @@ shopt -s sourcepath
--
shopt -s cdspell
shopt -s cmdhist
shopt -s complete_fullquote
shopt -s expand_aliases
shopt -s extquote
shopt -s force_fignore