pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-07 02:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bash-5.2-rc3 release

Browse Source
This commit is contained in:
Chet Ramey
2022-08-26 11:08:51 -04:00
parent f36c8c8ecd
commit b3afafd86d
104 changed files with 26000 additions and 22555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/functions/autoload.v4
+2 -2
View File
@@ -427,7 +427,7 @@ NOTES
bypass the shim creation and just source in the function's file
directly. For a few calls, the overhead of repeatedly running the
shim is not expensive, but in a tight loop, it might be. Caveat
Programer.
Programmer.
o Although the number of functions in the environment does not change
by using 'autoload', the amount of memory they take up can be greatly
@@ -453,7 +453,7 @@ NOTES
the simplest to implement for -p and -s operations that are not
heavily used.
As a consquence of this (and other reasons), the AUTOLOAD* namespace
As a consequence of this (and other reasons), the AUTOLOAD* namespace
is reserved for autoloading. Make sure you check any functions that
you bring under autoload for use of variables or functions that start
with AUTOLOAD and change them.
examples/functions/csh-compat
+1 -1
View File
@@ -1,4 +1,4 @@
# C-shell compatibilty package.
# C-shell compatibility package.
# setenv VAR VALUE
function setenv ()
{
examples/loadables/Makefile.in
+6 -2
View File
@@ -1,7 +1,7 @@
#
# Simple makefile for the sample loadable builtins
#
# Copyright (C) 1996-2019 Free Software Foundation, Inc.
# Copyright (C) 1996-2022 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -104,7 +104,7 @@ INC = -I. -I.. -I$(topdir) -I$(topdir)/lib -I$(topdir)/builtins -I${srcdir} \
ALLPROG = print truefalse sleep finfo logname basename dirname fdflags \
tty pathchk tee head mkdir rmdir mkfifo mktemp printenv id whoami \
uname sync push ln unlink realpath strftime mypid setpgid seq rm \
accept csv cut stat getconf
accept csv dsv cut stat getconf
OTHERPROG = necho hello cat pushd asort
all: $(SHOBJ_STATUS)
@@ -222,6 +222,9 @@ realpath: realpath.o
csv: csv.o
$(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ csv.o $(SHOBJ_LIBS)
dsv: dsv.o
$(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ dsv.o $(SHOBJ_LIBS)
cut: cut.o
$(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ cut.o $(SHOBJ_LIBS)
@@ -313,6 +316,7 @@ necho.o: necho.c
hello.o: hello.c
cat.o: cat.c
csv.o: csv.c
dsv.o: dsv.c
cut.o: cut.c
printenv.o: printenv.c
id.o: id.c
examples/loadables/cut.c
+3 -1
View File
@@ -417,7 +417,9 @@ cutfile (v, list, ops)
while ((n = zgetline (fd, &line, &llen, '\n', unbuffered_read)) != -1)
{
QUIT;
cutline (v, line, ops); /* can modify line */
if (line[n] == '\n')
line[n] = '\0'; /* cutline expects no newline terminator */
cutline (v, line, ops); /* can modify line */
}
if (fd > 0)
close (fd);
examples/loadables/dsv.c
+300
View File
@@ -0,0 +1,300 @@
/* dsv - process a line of delimiter-separated data and populate an indexed
array with the fields */
/*
Copyright (C) 2022 Free Software Foundation, Inc.
Bash is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Bash is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Bash. If not, see <http://www.gnu.org/licenses/>.
*/
/* See Makefile for compilation details. */
#include <config.h>
#if defined (HAVE_UNISTD_H)
# include <unistd.h>
#endif
#include "bashansi.h"
#include <stdio.h>
#include "loadables.h"
#define DSV_ARRAY_DEFAULT "DSV"
#define NQUOTE 0
#define DQUOTE 1
#define SQUOTE 2
#define F_SHELLQUOTE 0x01
#define F_GREEDY 0x02
#define F_PRESERVE 0x04
/* Split LINE into delimiter-separated fields, storing each field into a
separate element of array variable DSV, starting at index 0. The format
of LINE is delimiter-separated values. By default, this splits lines of
CSV data as described in RFC 4180. If *DSTRING is any other value than
',', this uses that character as a field delimiter. Pass F_SHELLQUOTE in
FLAGS to understand shell-like double-quoting and backslash-escaping in
double quotes instead of the "" CSV behavior, and shell-like single quotes.
Pass F_GREEDY in FLAGS to consume multiple leading and trailing instances
of *DSTRING and consecutive instances of *DSTRING in LINE without creating
null fields. If you want to preserve the quote characters in the generated
fields, pass F_PRESERVE; by default, this removes them. */
static int
dsvsplit (dsv, line, dstring, flags)
SHELL_VAR *dsv;
char *line, *dstring;
int flags;
{
arrayind_t ind;
char *field, *prev, *buf, *xbuf;
int delim, qstate;
int b, rval;
xbuf = 0;
ind = 0;
field = prev = line;
/* If we want a greedy split, consume leading instances of *DSTRING */
if (flags & F_GREEDY)
{
while (*prev == *dstring)
prev++;
field = prev;
}
do
{
if (*prev == '"')
{
if (xbuf == 0)
xbuf = xmalloc (strlen (prev) + 1);
buf = xbuf;
b = 0;
if (flags & F_PRESERVE)
buf[b++] = *prev;
qstate = DQUOTE;
for (field = ++prev; *field; field++)
{
if (qstate == DQUOTE && *field == '"' && field[1] == '"' && (flags & F_SHELLQUOTE) == 0)
buf[b++] = *field++; /* skip double quote */
else if (qstate == DQUOTE && (flags & F_SHELLQUOTE) && *field == '\\' && strchr (slashify_in_quotes, field[1]) != 0)
buf[b++] = *++field; /* backslash quoted double quote */
else if (qstate == DQUOTE && *field == '"')
{
qstate = NQUOTE;
if (flags & F_PRESERVE)
buf[b++] = *field;
}
else if (qstate == NQUOTE && *field == *dstring)
break;
else
/* This copies any text between a closing double quote and the
delimiter. If you want to change that, make sure to do the
copy only if qstate == DQUOTE. */
buf[b++] = *field;
}
buf[b] = '\0';
}
else if ((flags & F_SHELLQUOTE) && *prev == '\'')
{
if (xbuf == 0)
xbuf = xmalloc (strlen (prev) + 1);
buf = xbuf;
b = 0;
if (flags & F_PRESERVE)
buf[b++] = *prev;
qstate = SQUOTE;
for (field = ++prev; *field; field++)
{
if (qstate == SQUOTE && *field == '\'')
{
qstate = NQUOTE;
if (flags & F_PRESERVE)
buf[b++] = *field;
}
else if (qstate == NQUOTE && *field == *dstring)
break;
else
/* This copies any text between a closing single quote and the
delimiter. If you want to change that, make sure to do the
copy only if qstate == SQUOTE. */
buf[b++] = *field;
}
buf[b] = '\0';
}
else
{
buf = prev;
field = prev + strcspn (prev, dstring);
}
delim = *field;
*field = '\0';
if ((flags & F_GREEDY) == 0 || buf[0])
{
bind_array_element (dsv, ind, buf, 0);
ind++;
}
*field = delim;
if (delim == *dstring)
prev = field + 1;
}
while (delim == *dstring);
if (xbuf)
free (xbuf);
return (rval = ind); /* number of fields */
}
int
dsv_builtin (list)
WORD_LIST *list;
{
int opt, rval, flags;
char *array_name, *dsvstring, *delims;
SHELL_VAR *v;
array_name = 0;
rval = EXECUTION_SUCCESS;
delims = ",";
flags = 0;
reset_internal_getopt ();
while ((opt = internal_getopt (list, "a:d:Sgp")) != -1)
{
switch (opt)
{
case 'a':
array_name = list_optarg;
break;
case 'd':
delims = list_optarg;
break;
case 'S':
flags |= F_SHELLQUOTE;
break;
case 'g':
flags |= F_GREEDY;
break;
case 'p':
flags |= F_PRESERVE;
break;
CASE_HELPOPT;
default:
builtin_usage ();
return (EX_USAGE);
}
}
list = loptend;
if (array_name == 0)
array_name = DSV_ARRAY_DEFAULT;
if (legal_identifier (array_name) == 0)
{
sh_invalidid (array_name);
return (EXECUTION_FAILURE);
}
if (list == 0)
{
builtin_error ("dsv string argument required");
return (EX_USAGE);
}
v = find_or_make_array_variable (array_name, 1);
if (v == 0 || readonly_p (v) || noassign_p (v))
{
if (v && readonly_p (v))
err_readonly (array_name);
return (EXECUTION_FAILURE);
}
else if (array_p (v) == 0)
{
builtin_error ("%s: not an indexed array", array_name);
return (EXECUTION_FAILURE);
}
if (invisible_p (v))
VUNSETATTR (v, att_invisible);
array_flush (array_cell (v));
dsvstring = list->word->word;
if (dsvstring == 0 || *dsvstring == 0)
return (EXECUTION_SUCCESS);
opt = dsvsplit (v, dsvstring, delims, flags);
/* Maybe do something with OPT here, it's the number of fields */
return (rval);
}
/* Called when builtin is enabled and loaded from the shared object. If this
function returns 0, the load fails. */
int
dsv_builtin_load (name)
char *name;
{
return (1);
}
/* Called when builtin is disabled. */
void
dsv_builtin_unload (name)
char *name;
{
}
char *dsv_doc[] = {
"Read delimiter-separated fields from STRING.",
"",
"Parse STRING, a line of delimiter-separated values, into individual",
"fields, and store them into the indexed array ARRAYNAME starting at",
"index 0. The parsing understands and skips over double-quoted strings. ",
"If ARRAYNAME is not supplied, \"DSV\" is the default array name.",
"If the delimiter is a comma, the default, this parses comma-",
"separated values as specified in RFC 4180.",
"",
"The -d option specifies the delimiter. The delimiter is the first",
"character of the DELIMS argument. Specifying a DELIMS argument that",
"contains more than one character is not supported and will produce",
"unexpected results. The -S option enables shell-like quoting: double-",
"quoted strings can contain backslashes preceding special characters,",
"and the backslash will be removed; and single-quoted strings are",
"processed as the shell would process them. The -g option enables a",
"greedy split: sequences of the delimiter are skipped at the beginning",
"and end of STRING, and consecutive instances of the delimiter in STRING",
"do not generate empty fields. If the -p option is supplied, dsv leaves",
"quote characters as part of the generated field; otherwise they are",
"removed.",
"",
"The return value is 0 unless an invalid option is supplied or the ARRAYNAME",
"argument is invalid or readonly.",
(char *)NULL
};
struct builtin dsv_struct = {
"dsv", /* builtin name */
dsv_builtin, /* function implementing the builtin */
BUILTIN_ENABLED, /* initial flags for builtin */
dsv_doc, /* array of long documentation strings. */
"dsv [-a ARRAYNAME] [-d DELIMS] [-Sgp] string", /* usage synopsis; becomes short_doc */
0 /* reserved for internal use */
};
examples/loadables/fdflags.c
+2 -2
View File
@@ -3,7 +3,7 @@
/* See Makefile for compilation details. */
/*
Copyright (C) 2017,2018,2019 Free Software Foundation, Inc.
Copyright (C) 2017-2022 Free Software Foundation, Inc.
This file is part of GNU Bash.
Bash is free software: you can redistribute it and/or modify
@@ -102,7 +102,7 @@ static const struct
# define ALLFLAGS (O_APPEND|O_ASYNC|O_SYNC|O_NONBLOCK|O_FSYNC|O_DSYNC|\
O_RSYNC|O_ALT_IO|O_DIRECT|O_NOATIME|O_NOSIGPIPE)
/* An unsed bit in the file status flags word we can use to pass around the
/* An unused bit in the file status flags word we can use to pass around the
state of close-on-exec. */
# define O_CLOEXEC ((~ALLFLAGS) ^ ((~ALLFLAGS) & ((~ALLFLAGS) - 1)))
#endif
examples/loadables/mkdir.c
+1 -1
View File
@@ -228,7 +228,7 @@ char *mkdir_doc[] = {
"a symbolic mode is used, the operations are interpreted relative to",
"an initial mode of \"a=rwx\". The -p option causes any required",
"intermediate directories in PATH to be created. The directories",
"are created with permssion bits of rwxrwxrwx as modified by the current",
"are created with permission bits of rwxrwxrwx as modified by the current",
"umask, plus write and search permissions for the owner. mkdir",
"returns 0 if the directories are created successfully, and non-zero",
"if an error occurs.",