summaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
Diffstat (limited to 'posix')
-rw-r--r--posix/confstr.c10
-rw-r--r--posix/unistd.h17
-rw-r--r--posix/wordexp.c243
3 files changed, 198 insertions, 72 deletions
diff --git a/posix/confstr.c b/posix/confstr.c
index 98bdc65d0b..c8d4d73143 100644
--- a/posix/confstr.c
+++ b/posix/confstr.c
@@ -45,6 +45,14 @@ confstr (name, buf, len)
break;
case _CS_LFS_CFLAGS:
+ /* Signal that we want the new ABI. */
+ {
+ static const char file_offset[] = "-D_FILE_OFFSET_SIZE=64";
+ string = file_offset;
+ string_len = sizeof (file_offset);
+ }
+ break;
+
case _CS_LFS_LINTFLAGS:
case _CS_LFS_LDFLAGS:
case _CS_LFS_LIBS:
@@ -52,7 +60,7 @@ confstr (name, buf, len)
case _CS_LFS64_LINTFLAGS:
case _CS_LFS64_LDFLAGS:
case _CS_LFS64_LIBS:
- /* GNU libc does not require special actions to use LFS. */
+ /* GNU libc does not require special actions to use LFS functions. */
string = "";
string_len = 1;
break;
diff --git a/posix/unistd.h b/posix/unistd.h
index e44dcff84f..04fb89bc4b 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -101,6 +101,15 @@ __BEGIN_DECLS
_POSIX_MESSAGE_PASSING POSIX.4 message queues are supported.
_POSIX_SEMAPHORES POSIX.4 counting semaphores are supported.
_POSIX_SHARED_MEMORY_OBJECTS POSIX.4 shared memory objects are supported.
+ _POSIX_THREADS POSIX.1c pthreads are supported.
+ _POSIX_THREAD_ATTR_STACKADDR Thread stack address attribute option supported.
+ _POSIX_THREAD_ATTR_STACKSIZE Thread stack size attribute option supported.
+ _POSIX_THREAD_SAFE_FUNCTIONS Thread-safe functions are supported.
+ _POSIX_THREAD_PRIORITY_SCHEDULING
+ POSIX.1c thread execution scheduling supported.
+ _POSIX_THREAD_PRIO_INHERIT Thread priority inheritance option supported.
+ _POSIX_THREAD_PRIO_PROTECT Thread priority protection option supported.
+ _POSIX_THREAD_PROCESS_SHARED Process-shared synchronization supported.
_POSIX_PII Protocol-independent interfaces are supported.
_POSIX_PII_XTI XTI protocol-indep. interfaces are supported.
_POSIX_PII_SOCKET Socket protocol-indep. interfaces are supported.
@@ -261,6 +270,8 @@ extern ssize_t write __P ((int __fd, __const __ptr_t __buf, size_t __n));
/* Read NBYTES into BUF from FD at the given position OFFSET without
changing the file pointer. Return the number read, -1 for errors
or 0 for EOF. */
+extern ssize_t __pread __P ((int __fd, __ptr_t __buf, size_t __nbytes,
+ __off_t __offset));
# ifndef __USE_FILE_OFFSET64
extern ssize_t pread __P ((int __fd, __ptr_t __buf, size_t __nbytes,
__off_t __offset));
@@ -268,6 +279,8 @@ extern ssize_t pread __P ((int __fd, __ptr_t __buf, size_t __nbytes,
extern ssize_t pread __P ((int __fd, __ptr_t __buf, size_t __nbytes,
__off_t __offset)) __asm__ ("pread64");
# endif
+extern ssize_t __pread64 __P ((int __fd, __ptr_t __buf, size_t __nbytes,
+ __off64_t __offset));
# ifdef __USE_LARGEFILE64
extern ssize_t pread64 __P ((int __fd, __ptr_t __buf, size_t __nbytes,
__off64_t __offset));
@@ -275,6 +288,8 @@ extern ssize_t pread64 __P ((int __fd, __ptr_t __buf, size_t __nbytes,
/* Write N bytes of BUF to FD at the given position OFFSET without
changing the file pointer. Return the number written, or -1. */
+extern ssize_t __pwrite __P ((int __fd, __const __ptr_t __buf, size_t __n,
+ __off_t __offset));
# ifndef __USE_FILE_OFFSET64
extern ssize_t pwrite __P ((int __fd, __const __ptr_t __buf, size_t __n,
__off_t __offset));
@@ -282,6 +297,8 @@ extern ssize_t pwrite __P ((int __fd, __const __ptr_t __buf, size_t __n,
extern ssize_t pwrite __P ((int __fd, __const __ptr_t __buf, size_t __n,
__off_t __offset)) __asm__ ("pwrite64");
# endif
+extern ssize_t __pwrite64 __P ((int __fd, __const __ptr_t __buf, size_t __n,
+ __off64_t __offset));
# ifdef __USE_LARGEFILE64
extern ssize_t pwrite64 __P ((int __fd, __const __ptr_t __buf, size_t __n,
__off64_t __offset));
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 651c67d552..54a550bf91 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -36,7 +36,10 @@
#include <errno.h>
#include <sys/param.h>
#include <stdio.h>
+#include <fnmatch.h>
+/* Undefine the following line for the production version. */
+/* #define NDEBUG 1 */
#include <assert.h>
/*
@@ -874,6 +877,14 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags, wordexp_t *pwordexp)
{
/* We are poised just after "$" */
+ enum remove_pattern_enum
+ {
+ RP_NONE = 0,
+ RP_SHORT_LEFT,
+ RP_LONG_LEFT,
+ RP_SHORT_RIGHT,
+ RP_LONG_RIGHT
+ };
size_t start = *offset;
size_t env_length = 0;
size_t env_maxlen = 0;
@@ -882,9 +893,8 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
char *env = NULL;
char *pattern = NULL;
char *value;
- char action = 0;
- int prefix = 0;
- int suffix = 0;
+ char action = '\0';
+ enum remove_pattern_enum remove = RP_NONE;
int colon_seen = 0;
int depth = 0;
int error;
@@ -894,9 +904,10 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
switch (words[*offset])
{
case '{':
- if (action || prefix || suffix)
+ ++depth;
+
+ if (action != '\0' || remove != RP_NONE)
{
- ++depth;
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
if (pattern == NULL)
@@ -907,6 +918,7 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
if (*offset == start)
break;
+
/* Otherwise evaluate */
/* (and re-parse this character) */
--(*offset);
@@ -914,11 +926,9 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
case '}':
if (words[start] != '{')
- {
--(*offset);
- }
- if (action || prefix || suffix)
+ if (action != '\0' || remove != RP_NONE)
{
if (--depth)
{
@@ -935,53 +945,69 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
goto envsubst;
case '#':
- case '%':
- if (words[start] == '{')
- {
- /* At the start? (ie. 'string length') */
- if (*offset == start + 1)
- break;
+ /* At the start? (ie. 'string length') */
+ if (*offset == start + 1)
+ /* FIXME: This isn't written yet! */
+ break;
- /* Separating variable name from prefix pattern? */
- if (words[*offset] == '#')
- {
- if (prefix < 2 && !suffix)
- {
- ++prefix;
- break;
- }
- }
- else
- {
- if (suffix < 2 && !prefix)
- {
- ++suffix;
- break;
- }
- }
+ if (words[start] != '{')
+ {
+ /* Evaluate */
+ /* (and re-parse this character) */
+ --(*offset);
+ goto envsubst;
+ }
- /* Must be part of prefix/suffix pattern. */
- pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
- words[*offset]);
- if (pattern == NULL)
- goto no_space;
+ /* Separating variable name from prefix pattern? */
+ if (remove == RP_NONE)
+ {
+ remove = RP_SHORT_LEFT;
+ break;
+ }
+ else if (remove == RP_SHORT_LEFT)
+ {
+ remove = RP_LONG_LEFT;
break;
}
- /* Otherwise evaluate */
- /* (and re-parse this character) */
- --(*offset);
- goto envsubst;
- case ':':
+ /* Must be part of prefix/suffix pattern. */
+ pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
+ words[*offset]);
+ if (pattern == NULL)
+ goto no_space;
+
+ break;
+
+ case '%':
if (!*env)
+ goto syntax;
+
+ /* Separating variable name from suffix pattern? */
+ if (remove == RP_NONE)
{
- free (env);
- free (pattern);
- return WRDE_SYNTAX;
+ remove = RP_SHORT_RIGHT;
+ break;
}
+ else if (remove == RP_SHORT_RIGHT)
+ {
+ remove = RP_LONG_RIGHT;
+ break;
+ }
+
+ /* Must be part of prefix/suffix pattern. */
+ pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
+ words[*offset]);
+ if (pattern == NULL)
+ goto no_space;
- if (action || prefix || suffix)
+ break;
+
+ case ':':
+ if (!*env)
+ goto syntax;
+
+ if (action != '\0' || remove != RP_NONE)
{
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
@@ -998,30 +1024,21 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
break;
}
- free (env);
- free (pattern);
- return WRDE_SYNTAX;
+ goto syntax;
case '-':
case '=':
case '?':
case '+':
if (!*env)
- {
- free (env);
- free (pattern);
- return WRDE_SYNTAX;
- }
+ goto syntax;
- if (action || prefix || suffix)
+ if (action != '\0' || remove != RP_NONE)
{
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
if (pattern == NULL)
- {
- free (env);
- return WRDE_NOSPACE;
- }
+ goto no_space;
break;
}
@@ -1030,8 +1047,9 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
break;
case '\\':
- if (action || prefix || suffix)
+ if (action != '\0' || remove != RP_NONE)
{
+ /* Um. Is this right? */
error = parse_qtd_backslash (word, word_length, max_length,
words, offset);
if (error == 0)
@@ -1042,12 +1060,16 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
error = WRDE_SYNTAX;
}
- free (env);
- free (pattern);
+ if (env)
+ free (env);
+
+ if (pattern != NULL)
+ free (pattern);
+
return error;
default:
- if (action || prefix || suffix)
+ if (action != '\0' || remove != RP_NONE)
{
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
@@ -1076,11 +1098,7 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
envsubst:
if (words[start] == '{' && words[*offset] != '}')
- {
- free (env);
- free (pattern);
- return WRDE_SYNTAX;
- }
+ goto syntax;
if (!env || !*env)
{
@@ -1093,14 +1111,88 @@ envsubst:
value = getenv (env);
- if (action || prefix || suffix)
+ if (action != '\0' || remove != RP_NONE)
{
switch (action)
{
case 0:
- /* For the time being, pattern is ignored */
- printf ("Pattern: %s\nPrefix: %d\nSuffix: %d\n", pattern, prefix, suffix);
- break;
+ {
+ char *p;
+ char c;
+ char *end;
+
+ if (!pattern || !*pattern)
+ break;
+
+ end = value + strlen (value);
+
+ if (value == NULL)
+ break;
+
+ switch (remove)
+ {
+ case RP_SHORT_LEFT:
+ for (p = value; p <= end; p++)
+ {
+ c = *p;
+ *p = '\0';
+ if (fnmatch (pattern, value, 0) != FNM_NOMATCH)
+ {
+ *p = c;
+ value = p;
+ break;
+ }
+ *p = c;
+ }
+
+ break;
+
+ case RP_LONG_LEFT:
+ for (p = end; p >= value; p--)
+ {
+ c = *p;
+ *p = '\0';
+ if (fnmatch (pattern, value, 0) != FNM_NOMATCH)
+ {
+ *p = c;
+ value = p;
+ break;
+ }
+ *p = c;
+ }
+
+ break;
+
+ case RP_SHORT_RIGHT:
+ for (p = end; p >= value; p--)
+ {
+ if (fnmatch (pattern, p, 0) != FNM_NOMATCH)
+ {
+ *p = '\0';
+ break;
+ }
+ }
+
+ break;
+
+ case RP_LONG_RIGHT:
+ for (p = value; p <= end; p++)
+ {
+ if (fnmatch (pattern, p, 0) != FNM_NOMATCH)
+ {
+ *p = '\0';
+ break;
+ }
+ }
+
+ break;
+
+ default:
+ assert (! "Unexpected `remove' value\n");
+ }
+
+ break;
+ }
case '?':
if (value && *value)
@@ -1182,6 +1274,15 @@ no_space:
free (pattern);
return WRDE_NOSPACE;
+
+syntax:
+ if (env)
+ free (env);
+
+ if (pattern)
+ free (pattern);
+
+ return WRDE_SYNTAX;
}
static int
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 07:02:20 +0000