mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 14:00:30 +00:00
[BZ #2172]
* sysdeps/unix/sysv/linux/i386/fchownat.c: Diddle code so that "fail" label is always used. [BZ #2172] * bits/syslog-path.h: New file. * misc/Makefile (headers): Add it. * misc/sys/syslog.h: Include it. (_PATH_LOG): Macro removed. From Robert Millan <robertmh@gnu.org>.
This commit is contained in:
parent
10814720ad
commit
0f289b2a11
10
ChangeLog
10
ChangeLog
@ -1,5 +1,15 @@
|
||||
2006-02-23 Roland McGrath <roland@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/i386/fchownat.c: Diddle code so that "fail"
|
||||
label is always used.
|
||||
|
||||
[BZ #2172]
|
||||
* bits/syslog-path.h: New file.
|
||||
* misc/Makefile (headers): Add it.
|
||||
* misc/sys/syslog.h: Include it.
|
||||
(_PATH_LOG): Macro removed.
|
||||
From Robert Millan <robertmh@gnu.org>.
|
||||
|
||||
* sysdeps/unix/sysv/linux/ftruncate64.c: Find generic implementation
|
||||
in misc/, not posix/.
|
||||
Reported by David S. Miller <davem@davemloft.net>.
|
||||
|
29
bits/syslog-path.h
Normal file
29
bits/syslog-path.h
Normal file
@ -0,0 +1,29 @@
|
||||
/* <bits/syslog-path.h> -- _PATH_LOG definition
|
||||
Copyright (C) 2006 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
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#ifndef _SYS_SYSLOG_H
|
||||
# error "Never include this file directly. Use <sys/syslog.h> instead"
|
||||
#endif
|
||||
|
||||
#ifndef _BITS_SYSLOG_PATH_H
|
||||
#define _BITS_SYSLOG_PATH_H 1
|
||||
|
||||
#define _PATH_LOG "/dev/log"
|
||||
|
||||
#endif /* bits/syslog-path.h */
|
@ -30,7 +30,8 @@ headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
|
||||
sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
|
||||
sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \
|
||||
regexp.h bits/select.h bits/mman.h sys/xattr.h \
|
||||
syslog.h sys/syslog.h bits/syslog.h bits/syslog-ldbl.h
|
||||
syslog.h sys/syslog.h \
|
||||
bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h
|
||||
|
||||
routines := brk sbrk sstk ioctl \
|
||||
readv writev \
|
||||
|
@ -36,8 +36,8 @@
|
||||
#define __need___va_list
|
||||
#include <stdarg.h>
|
||||
|
||||
|
||||
#define _PATH_LOG "/dev/log"
|
||||
/* This file defines _PATH_LOG. */
|
||||
#include <bits/syslog-path.h>
|
||||
|
||||
/*
|
||||
* priorities/facilities are encoded into a single 32-bit quantity, where the
|
||||
|
@ -168,11 +168,11 @@ fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag)
|
||||
#endif
|
||||
|
||||
if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
|
||||
{
|
||||
fail:
|
||||
__atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf);
|
||||
result = -1;
|
||||
}
|
||||
goto fail;
|
||||
|
||||
return result;
|
||||
|
||||
fail:
|
||||
__atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf);
|
||||
return -1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user