OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

1998-10-22  H.J. Lu  <hjl@gnu.org>

	* sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Add
	sanity check for n.
	* sysdeps/unix/sysv/linux/i386/setgroups.c (setgroups): Likewise.

	* sysdeps/posix/fpathconf.c (__fpathconf): Set errno to
	EINVAL if errno == ENODEV.  Tested by VSX-PCT.

	* sysdeps/posix/isatty.c (__isatty): Don't reset errno.  Tested
	by VSX-PCT.

	* posix/execvp.c (execvp): Check "".  Tested by VSX-PCT.
This commit is contained in:
Ulrich Drepper 1998-10-22 11:49:29 +00:00
parent e595c802ca
commit 9271a050b5
6 changed files with 67 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
1998-10-22 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Add
sanity check for n.
* sysdeps/unix/sysv/linux/i386/setgroups.c (setgroups): Likewise.
* sysdeps/posix/fpathconf.c (__fpathconf): Set errno to
EINVAL if errno == ENODEV. Tested by VSX-PCT.
* sysdeps/posix/isatty.c (__isatty): Don't reset errno. Tested
by VSX-PCT.
* posix/execvp.c (execvp): Check "". Tested by VSX-PCT.
1998-10-22 Philip Blundell <pb@nexus.co.uk>
* sysdeps/unix/arm/sysdep.h: Wrap assembler macros in #ifdef

9
posix/execvp.c
View File

@ -54,7 +54,7 @@ execute (const char *file, char *const argv[])
/* Execute the shell. */
execv (new_argv[0], new_argv);
}
}
}
}
@ -67,6 +67,13 @@ execvp (file, argv)
{
int got_eacces = 0;
if (*file == '\0')
{
/* We check the simple case first. */
__set_errno (ENOENT);
return -1;
}
if (strchr (file, '/') != NULL)
/* Don't search when it contains a slash. */
execute (file, argv);

5
sysdeps/posix/fpathconf.c
View File

@ -72,9 +72,12 @@ __fpathconf (fd, name)
{
if (errno == ENOSYS)
{
errno = save_errno;
__set_errno (save_errno);
return NAME_MAX;
}
else if (errno == ENODEV)
__set_errno (EINVAL);
return -1;
}
else

11
sysdeps/posix/isatty.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
/* Copyright (C) 1991, 1995, 1996, 1997, 1998 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
@ -16,7 +16,6 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <errno.h>
#include <unistd.h>
#include <termios.h>
@ -25,15 +24,9 @@ int
__isatty (fd)
int fd;
{
int save;
int is_tty;
struct termios term;
save = errno;
is_tty = __tcgetattr (fd, &term) == 0;
__set_errno (save);
return is_tty;
return __tcgetattr (fd, &term) == 0;
}
weak_alias (__isatty, isatty)

28
sysdeps/unix/sysv/linux/i386/getgroups.c
View File

@ -17,10 +17,13 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sysdep.h>
#include <sys/syscall.h>
#include <linux/posix_types.h>
extern int __syscall_getgroups __P ((int, __kernel_gid_t *));
@ -32,14 +35,23 @@ __getgroups (n, groups)
int n;
gid_t *groups;
{
int i, ngids;
__kernel_gid_t kernel_groups[n];
if (n < 0)
{
__set_errno (EINVAL);
return -1;
}
else
{
int i, ngids;
__kernel_gid_t kernel_groups[n = MIN (n, __sysconf (_SC_NGROUPS_MAX))];
ngids = INLINE_SYSCALL (getgroups, 2, n, kernel_groups);
if (n != 0 && ngids > 0)
for (i = 0; i < ngids; i++)
groups[i] = kernel_groups[i];
return ngids;
ngids = INLINE_SYSCALL (getgroups, 2, n, kernel_groups);
if (n != 0 && ngids > 0)
for (i = 0; i < ngids; i++)
groups[i] = kernel_groups[i];
return ngids;
}
}
weak_alias (__getgroups, getgroups)

30
sysdeps/unix/sysv/linux/i386/setgroups.c
View File

@ -36,18 +36,26 @@ setgroups (n, groups)
size_t n;
const gid_t *groups;
{
size_t i;
__kernel_gid_t kernel_groups[n];
for (i = 0; i < n; i++)
if (n < 0 || n > __sysconf (_SC_NGROUPS_MAX))
{
kernel_groups[i] = groups[i];
if (groups[i] != (gid_t) ((__kernel_gid_t) groups[i]))
{
__set_errno (EINVAL);
return -1;
}
__set_errno (EINVAL);
return -1;
}
else if
{
size_t i;
__kernel_gid_t kernel_groups[n];
return INLINE_SYSCALL (setgroups, 2, n, kernel_groups);
for (i = 0; i < n; i++)
{
kernel_groups[i] = groups[i];
if (groups[i] != (gid_t) ((__kernel_gid_t) groups[i]))
{
__set_errno (EINVAL);
return -1;
}
}
return INLINE_SYSCALL (setgroups, 2, n, kernel_groups);
}
}