picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2003-04-22 Roland McGrath <roland@redhat.com>

Browse source 
* sysdeps/unix/sysv/linux/not-cancel.h: Put parens around macro args.
	(open_not_cancel): Make last argument non-optional.
	* sysdeps/generic/check_fds.c (check_one_fd): Update caller.
	* sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise.
	* iconv/gconv_cache.c (__gconv_load_cache): Likewise.
This commit is contained in:
Roland McGrath 2003-04-23 01:54:03 +00:00
parent 4c5dd2a207
commit f478103ff0
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iconv/gconv_cache.c
View file

@ -60,7 +60,7 @@ __gconv_load_cache (void)
return -1;
/* See whether the cache file exists. */
fd = open_not_cancel (GCONV_MODULES_CACHE, O_RDONLY);
fd = open_not_cancel (GCONV_MODULES_CACHE, O_RDONLY, 0);
if (__builtin_expect (fd, 0) == -1)
/* Not available. */
return -1;

2
sysdeps/generic/check_fds.c
View file

@ -49,7 +49,7 @@ check_one_fd (int fd, int mode)
/* Something is wrong with this descriptor, it's probably not
opened. Open /dev/null so that the SUID program we are
about to start does not accidently use this descriptor. */
int nullfd = open_not_cancel (_PATH_DEVNULL, mode);
int nullfd = open_not_cancel (_PATH_DEVNULL, mode, 0);
/* We are very paranoid here. With all means we try to ensure
that we are actually opening the /dev/null device and nothing
else.

4
sysdeps/unix/sysv/linux/gethostid.c
View file

@ -72,9 +72,9 @@ gethostid ()
int fd;
/* First try to get the ID from a former invocation of sethostid. */
fd = open_not_cancel (HOSTIDFILE, O_RDONLY|O_LARGEFILE);
fd = open_not_cancel (HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0);
if (fd < 0)
fd = open_not_cancel (OLD_HOSTIDFILE, O_RDONLY|O_LARGEFILE);
fd = open_not_cancel (OLD_HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0);
if (fd >= 0)
{
ssize_t n = read_not_cancel (fd, &id, sizeof (id));

13
sysdeps/unix/sysv/linux/not-cancel.h
View file

@ -22,33 +22,32 @@
/* Uncancelable open. */
#ifdef INLINE_SYSCALL
# define open_not_cancel(name, flags, mode...) \
({ int _mode = (0, ##mode); \
INLINE_SYSCALL (open, 3, (const char *) name, flags, _mode); })
# define open_not_cancel(name, flags, mode) \
INLINE_SYSCALL (open, 3, (const char *) (name), (flags), (mode))
#endif
/* Uncancelable close. */
#ifdef INLINE_SYSCALL
# define close_not_cancel_no_status(fd) \
(void) ({ INTERNAL_SYSCALL_DECL (err); \
INTERNAL_SYSCALL (close, err, 1, fd); })
INTERNAL_SYSCALL (close, err, 1, (fd)); })
#endif
/* Uncancelable read. */
#ifdef INLINE_SYSCALL
# define read_not_cancel(fd, buf, n) \
INLINE_SYSCALL (read, 3, fd, buf, n)
INLINE_SYSCALL (read, 3, (fd), (buf), (n))
#endif
/* Uncancelable write. */
#ifdef INLINE_SYSCALL
# define write_not_cancel(fd, buf, n) \
INLINE_SYSCALL (write, 3, fd, buf, n)
INLINE_SYSCALL (write, 3, (fd), (buf), (n))
#endif
/* Uncancelable writev. */
#ifdef INLINE_SYSCALL
# define writev_not_cancel_no_status(fd, iov, n) \
(void) ({ INTERNAL_SYSCALL_DECL (err); \
INTERNAL_SYSCALL (writev, err, 3, fd, iov, n); })
INTERNAL_SYSCALL (writev, err, 3, (fd), (iov), (n)); })
#endif