summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/bits/confname.h42
-rw-r--r--sysdeps/generic/putenv.c8
-rw-r--r--sysdeps/generic/setenv.c12
-rw-r--r--sysdeps/posix/getcwd.c192
-rw-r--r--sysdeps/posix/ttyname.c7
-rw-r--r--sysdeps/posix/writev.c5
-rw-r--r--sysdeps/unix/readdir_r.c5
-rw-r--r--sysdeps/unix/sysv/linux/gethostname.c6
8 files changed, 170 insertions, 107 deletions
diff --git a/sysdeps/generic/bits/confname.h b/sysdeps/generic/bits/confname.h
index 6926cad0ad..40228e11ed 100644
--- a/sysdeps/generic/bits/confname.h
+++ b/sysdeps/generic/bits/confname.h
@@ -316,8 +316,9 @@ enum
#define _SC_NL_TEXTMAX _SC_NL_TEXTMAX
};
-#if (defined __USE_POSIX2 || defined __USE_FILE_OFFSET64 \
- || defined __USE_LARGEFILE64 || defined __USE_LARGEFILE)
+#if (defined __USE_POSIX2 || defined __USE_UNIX98 \
+ || defined __USE_FILE_OFFSET64 || defined __USE_LARGEFILE64 \
+ || defined __USE_LARGEFILE)
/* Values for the NAME argument to `confstr'. */
enum
{
@@ -340,8 +341,43 @@ enum
# define _CS_LFS64_LDFLAGS _CS_LFS64_LDFLAGS
_CS_LFS64_LIBS,
# define _CS_LFS64_LIBS _CS_LFS64_LIBS
- _CS_LFS64_LINTFLAGS
+ _CS_LFS64_LINTFLAGS,
# define _CS_LFS64_LINTFLAGS _CS_LFS64_LINTFLAGS
#endif
+
+#ifdef __USE_UNIX98
+ _CS_XBS5_ILP32_OFF32_CFLAGS = 1100,
+# define _CS_XBS5_ILP32_OFF32_CFLAGS _CS_XBS5_ILP32_OFF32_CFLAGS
+ _CS_XBS5_ILP32_OFF32_LDFLAGS,
+# define _CS_XBS5_ILP32_OFF32_LDFLAGS _CS_XBS5_ILP32_OFF32_LDFLAGS
+ _CS_XBS5_ILP32_OFF32_LIBS,
+# define _CS_XBS5_ILP32_OFF32_LIBS _CS_XBS5_ILP32_OFF32_LIBS
+ _CS_XBS5_ILP32_OFF32_LINTFLAGS,
+# define _CS_XBS5_ILP32_OFF32_LINTFLAGS _CS_XBS5_ILP32_OFF32_LINTFLAGS
+ _CS_XBS5_ILP32_OFFBIG_CFLAGS,
+# define _CS_XBS5_ILP32_OFFBIG_CFLAGS _CS_XBS5_ILP32_OFFBIG_CFLAGS
+ _CS_XBS5_ILP32_OFFBIG_LDFLAGS,
+# define _CS_XBS5_ILP32_OFFBIG_LDFLAGS _CS_XBS5_ILP32_OFFBIG_LDFLAGS
+ _CS_XBS5_ILP32_OFFBIG_LIBS,
+# define _CS_XBS5_ILP32_OFFBIG_LIBS _CS_XBS5_ILP32_OFFBIG_LIBS
+ _CS_XBS5_ILP32_OFFBIG_LINTFLAGS,
+# define _CS_XBS5_ILP32_OFFBIG_LINTFLAGS _CS_XBS5_ILP32_OFFBIG_LINTFLAGS
+ _CS_XBS5_LP64_OFF64_CFLAGS,
+# define _CS_XBS5_LP64_OFF64_CFLAGS _CS_XBS5_LP64_OFF64_CFLAGS
+ _CS_XBS5_LP64_OFF64_LDFLAGS,
+# define _CS_XBS5_LP64_OFF64_LDFLAGS _CS_XBS5_LP64_OFF64_LDFLAGS
+ _CS_XBS5_LP64_OFF64_LIBS,
+# define _CS_XBS5_LP64_OFF64_LIBS _CS_XBS5_LP64_OFF64_LIBS
+ _CS_XBS5_LP64_OFF64_LINTFLAGS,
+# define _CS_XBS5_LP64_OFF64_LINTFLAGS _CS_XBS5_LP64_OFF64_LINTFLAGS
+ _CS_XBS5_LPBIG_OFFBIG_CFLAGS,
+# define _CS_XBS5_LPBIG_OFFBIG_CFLAGS _CS_XBS5_LPBIG_OFFBIG_CFLAGS
+ _CS_XBS5_LPBIG_OFFBIG_LDFLAGS,
+# define _CS_XBS5_LPBIG_OFFBIG_LDFLAGS _CS_XBS5_LPBIG_OFFBIG_LDFLAGS
+ _CS_XBS5_LPBIG_OFFBIG_LIBS,
+# define _CS_XBS5_LPBIG_OFFBIG_LIBS _CS_XBS5_LPBIG_OFFBIG_LIBS
+ _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS,
+# define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS
+#endif
};
#endif
diff --git a/sysdeps/generic/putenv.c b/sysdeps/generic/putenv.c
index e5031c4285..296f2847cf 100644
--- a/sysdeps/generic/putenv.c
+++ b/sysdeps/generic/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -55,11 +55,15 @@ putenv (string)
{
const char *const name_end = strchr (string, '=');
- if (name_end)
+ if (name_end != NULL)
{
char *name = alloca (name_end - string + 1);
+#ifdef _LIBC
+ *((char *) __mempcpy (name, string, name_end - string)) = '\0';
+#else
memcpy (name, string, name_end - string);
name[name_end - string] = '\0';
+#endif
return setenv (name, name_end + 1, 1);
}
diff --git a/sysdeps/generic/setenv.c b/sysdeps/generic/setenv.c
index e740fa9eef..f58c65b7f6 100644
--- a/sysdeps/generic/setenv.c
+++ b/sysdeps/generic/setenv.c
@@ -91,6 +91,8 @@ setenv (name, value, replace)
if (__environ == NULL || *ep == NULL)
{
char **new_environ;
+ char *tmp;
+
if (__environ == last_environ && __environ != NULL)
/* We allocated this space; we can extend it. */
new_environ = (char **) realloc (last_environ,
@@ -117,9 +119,15 @@ setenv (name, value, replace)
memcpy ((char *) new_environ, (char *) __environ,
size * sizeof (char *));
+#ifdef _LIBC
+ tmp = __mempcpy (new_environ[size], name, namelen);
+ *tmp++ = '=';
+ __mempcpy (tmp, value, vallen);
+#else
memcpy (new_environ[size], name, namelen);
new_environ[size][namelen] = '=';
memcpy (&new_environ[size][namelen + 1], value, vallen);
+#endif
new_environ[size + 1] = NULL;
@@ -138,8 +146,12 @@ setenv (name, value, replace)
return -1;
}
*ep = new;
+#ifdef _LIBC
+ *((char *) __mempcpy (*ep, name, namelen)) = '=';
+#else
memcpy (*ep, name, namelen);
(*ep)[namelen] = '=';
+#endif
}
memcpy (&(*ep)[namelen + 1], value, vallen);
}
diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c
index 865bd3fa6a..01f86ef47f 100644
--- a/sysdeps/posix/getcwd.c
+++ b/sysdeps/posix/getcwd.c
@@ -26,12 +26,12 @@
*/
/* AIX requires this to be the first thing in the file. */
-#if defined (_AIX) && !defined (__GNUC__)
+#if defined _AIX && !defined __GNUC__
#pragma alloca
#endif
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif
#include <errno.h>
@@ -39,92 +39,91 @@
#include <sys/stat.h>
#ifdef STDC_HEADERS
-#include <stddef.h>
+# include <stddef.h>
#endif
-#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
+#if !defined __GNU_LIBRARY__ && !defined STDC_HEADERS
extern int errno;
#endif
#ifndef __set_errno
-#define __set_errno(val) errno = (val)
+# define __set_errno(val) errno = (val)
#endif
#ifndef NULL
-#define NULL 0
+# define NULL 0
#endif
-#if defined (USGr3) && !defined (DIRENT)
-#define DIRENT
+#if defined USGr3 && !defined DIRENT
+# define DIRENT
#endif /* USGr3 */
-#if defined (Xenix) && !defined (SYSNDIR)
-#define SYSNDIR
+#if defined Xenix && !defined SYSNDIR
+# define SYSNDIR
#endif /* Xenix */
-#if defined (POSIX) || defined (DIRENT) || defined (__GNU_LIBRARY__)
-#include <dirent.h>
-#ifndef __GNU_LIBRARY__
-#define D_NAMLEN(d) strlen((d)->d_name)
-#else
-#define HAVE_D_NAMLEN
-#define D_NAMLEN(d) ((d)->d_namlen)
-#endif
+#if defined POSIX || defined DIRENT || defined __GNU_LIBRARY__
+# include <dirent.h>
+# ifndef __GNU_LIBRARY__
+# define D_NAMLEN(d) strlen((d)->d_name)
+# else
+# define HAVE_D_NAMLEN
+# define D_NAMLEN(d) ((d)->d_namlen)
+# endif
#else /* not POSIX or DIRENT */
-#define dirent direct
-#define D_NAMLEN(d) ((d)->d_namlen)
-#define HAVE_D_NAMLEN
-#if defined (USG) && !defined (sgi)
-#if defined (SYSNDIR)
-#include <sys/ndir.h>
-#else /* Not SYSNDIR */
-#include "ndir.h"
-#endif /* SYSNDIR */
-#else /* not USG */
-#include <sys/dir.h>
-#endif /* USG */
+# define dirent direct
+# define D_NAMLEN(d) ((d)->d_namlen)
+# define HAVE_D_NAMLEN
+# if defined USG && !defined sgi
+# if defined SYSNDIR
+# include <sys/ndir.h>
+# else /* Not SYSNDIR */
+# include "ndir.h"
+# endif /* SYSNDIR */
+# else /* not USG */
+# include <sys/dir.h>
+# endif /* USG */
#endif /* POSIX or DIRENT or __GNU_LIBRARY__ */
-#if defined (HAVE_UNISTD_H) || defined (__GNU_LIBRARY__)
-#include <unistd.h>
+#if defined HAVE_UNISTD_H || defined __GNU_LIBRARY__
+# include <unistd.h>
#endif
-#if (defined (STDC_HEADERS) || defined (__GNU_LIBRARY__) \
- || defined (POSIX))
-#include <stdlib.h>
-#include <string.h>
-#define ANSI_STRING
+#if defined STDC_HEADERS || defined __GNU_LIBRARY__ || defined POSIX
+# include <stdlib.h>
+# include <string.h>
+# define ANSI_STRING
#else /* No standard headers. */
-#ifdef USG
+# ifdef USG
-#include <string.h>
-#ifdef NEED_MEMORY_H
-#include <memory.h>
-#endif
-#define ANSI_STRING
+# include <string.h>
+# ifdef NEED_MEMORY_H
+# include <memory.h>
+# endif
+# define ANSI_STRING
-#else /* Not USG. */
+# else /* Not USG. */
-#ifdef NeXT
+# ifdef NeXT
-#include <string.h>
+# include <string.h>
-#else /* Not NeXT. */
+# else /* Not NeXT. */
-#include <strings.h>
+# include <strings.h>
-#ifndef bcmp
+# ifndef bcmp
extern int bcmp ();
-#endif
-#ifndef bzero
+# endif
+# ifndef bzero
extern void bzero ();
-#endif
-#ifndef bcopy
+# endif
+# ifndef bcopy
extern void bcopy ();
-#endif
+# endif
-#endif /* NeXT. */
+# endif /* NeXT. */
-#endif /* USG. */
+# endif /* USG. */
extern char *malloc (), *realloc ();
extern void free ();
@@ -132,59 +131,58 @@ extern void free ();
#endif /* Standard headers. */
#ifndef ANSI_STRING
-#define memcpy(d, s, n) bcopy((s), (d), (n))
-#define memmove memcpy
+# define memcpy(d, s, n) bcopy((s), (d), (n))
+# define memmove memcpy
#endif /* Not ANSI_STRING. */
-#if !defined(__alloca) && !defined(__GNU_LIBRARY__)
+#if !defined __alloca && !defined __GNU_LIBRARY__
-#ifdef __GNUC__
-#undef alloca
-#define alloca(n) __builtin_alloca (n)
-#else /* Not GCC. */
-#if defined (sparc) || defined (HAVE_ALLOCA_H)
-#include <alloca.h>
-#else /* Not sparc or HAVE_ALLOCA_H. */
-#ifndef _AIX
+# ifdef __GNUC__
+# undef alloca
+# define alloca(n) __builtin_alloca (n)
+# else /* Not GCC. */
+# if defined sparc || defined HAVE_ALLOCA_H
+# include <alloca.h>
+# else /* Not sparc or HAVE_ALLOCA_H. */
+# ifndef _AIX
extern char *alloca ();
-#endif /* Not _AIX. */
-#endif /* sparc or HAVE_ALLOCA_H. */
-#endif /* GCC. */
+# endif /* Not _AIX. */
+# endif /* sparc or HAVE_ALLOCA_H. */
+# endif /* GCC. */
-#define __alloca alloca
+# define __alloca alloca
#endif
-#if (defined (HAVE_LIMITS_H) || defined (STDC_HEADERS) || \
- defined (__GNU_LIBRARY__))
-#include <limits.h>
+#if defined HAVE_LIMITS_H || defined STDC_HEADERS || defined __GNU_LIBRARY__
+# include <limits.h>
#else
-#include <sys/param.h>
+# include <sys/param.h>
#endif
#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
+# ifdef MAXPATHLEN
+# define PATH_MAX MAXPATHLEN
+# else
+# define PATH_MAX 1024
+# endif
#endif
-#if !defined (STDC_HEADERS) && !defined (__GNU_LIBRARY__)
-#undef size_t
-#define size_t unsigned int
+#if !defined STDC_HEADERS && !defined __GNU_LIBRARY__
+# undef size_t
+# define size_t unsigned int
#endif
-#if !__STDC__ && !defined (const)
-#define const
+#if !__STDC__ && !defined const
+# define const
#endif
#ifndef __GNU_LIBRARY__
-#define __lstat stat
+# define __lstat stat
#endif
#ifndef _LIBC
-#define __getcwd getcwd
+# define __getcwd getcwd
#endif
/* Get the pathname of the current working directory, and put it in SIZE
@@ -264,18 +262,28 @@ __getcwd (buf, size)
new = malloc (dotsize * 2 + 1);
if (new == NULL)
return NULL;
+#ifdef HAVE_MEMPCPY
+ dotp = mempcpy (new, dots, dotsize);
+#else
memcpy (new, dots, dotsize);
+ dotp = &new[dotsize];
+#endif
}
else
{
new = realloc ((__ptr_t) dotlist, dotsize * 2 + 1);
if (new == NULL)
goto lose;
+ dotp = &new[dotsize];
}
- memcpy (&new[dotsize], new, dotsize);
- dotp = &new[dotsize];
+#ifdef HAVE_MEMPCPY
+ *((char *) mempcpy (dotp, new, dotsize)) = '\0';
+ dotsize *= 2;
+#else
+ memcpy (dotp, new, dotsize);
dotsize *= 2;
new[dotsize] = '\0';
+#endif
dotlist = new;
}
@@ -301,9 +309,15 @@ __getcwd (buf, size)
if (mount_point || (ino_t) d->d_ino == thisino)
{
char name[dotlist + dotsize - dotp + 1 + _D_ALLOC_NAMLEN (d)];
+#ifdef HAVE_MEMPCPY
+ char *tmp = mempcpy (name, dotp, dotlist + dotsize - dotp);
+ *tmp++ = '/';
+ strcpy (tmp, d->d_name);
+#else
memcpy (name, dotp, dotlist + dotsize - dotp);
name[dotlist + dotsize - dotp] = '/';
strcpy (&name[dotlist + dotsize - dotp + 1], d->d_name);
+#endif
if (__lstat (name, &st) < 0)
{
int save = errno;
diff --git a/sysdeps/posix/ttyname.c b/sysdeps/posix/ttyname.c
index ce384ebc0e..a4e4f30526 100644
--- a/sysdeps/posix/ttyname.c
+++ b/sysdeps/posix/ttyname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -71,10 +71,9 @@ ttyname (fd)
(void) closedir (dirstream);
return NULL;
}
- (void) memcpy (name, dev, sizeof (dev) - 1);
- name[sizeof (dev) - 1] = '/';
+ *((char *) __mempcpy (name, dev, sizeof (dev) - 1)) = '/';
}
- (void) memcpy (&name[sizeof (dev)], d->d_name, dlen);
+ (void) __mempcpy (&name[sizeof (dev)], d->d_name, dlen);
if (stat (name, &st) == 0 && st.st_dev == mydev)
{
(void) closedir (dirstream);
diff --git a/sysdeps/posix/writev.c b/sysdeps/posix/writev.c
index f6f685ce7a..ae38fefef3 100644
--- a/sysdeps/posix/writev.c
+++ b/sysdeps/posix/writev.c
@@ -53,11 +53,10 @@ __writev (fd, vector, count)
#define min(a, b) ((a) > (b) ? (b) : (a))
size_t copy = min (vector[i].iov_len, to_copy);
- (void) memcpy ((void *) bp, (void *) vector[i].iov_base, copy);
+ bp = __mempcpy ((void *) bp, (void *) vector[i].iov_base, copy);
- bp += copy;
to_copy -= copy;
- if (bytes == 0)
+ if (to_copy == 0)
break;
}
diff --git a/sysdeps/unix/readdir_r.c b/sysdeps/unix/readdir_r.c
index a4462f73e7..6d70233e6e 100644
--- a/sysdeps/unix/readdir_r.c
+++ b/sysdeps/unix/readdir_r.c
@@ -96,10 +96,7 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
} while (dp->d_ino == 0);
if (dp != NULL)
- {
- memcpy (entry, dp, reclen);
- *result = entry;
- }
+ *result = memcpy (entry, dp, reclen);
__libc_lock_unlock (dirp->lock);
diff --git a/sysdeps/unix/sysv/linux/gethostname.c b/sysdeps/unix/sysv/linux/gethostname.c
index 5df8096bfd..0e3ca57aca 100644
--- a/sysdeps/unix/sysv/linux/gethostname.c
+++ b/sysdeps/unix/sysv/linux/gethostname.c
@@ -30,6 +30,7 @@ __gethostname (name, len)
size_t len;
{
struct utsname buf;
+ size_t node_len;
if (name == NULL)
{
@@ -40,13 +41,14 @@ __gethostname (name, len)
if (uname (&buf))
return -1;
- if (strlen (buf.nodename) + 1 > len)
+ node_len = strlen (buf.nodename) + 1;
+ if (node_len > len)
{
__set_errno (EINVAL);
return -1;
}
- strcpy (name, buf.nodename);
+ memcpy (name, buf.nodename, node_len);
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 15:41:15 +0000