aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--bits/syslog-path.h29
-rw-r--r--misc/Makefile3
-rw-r--r--misc/sys/syslog.h4
-rw-r--r--sysdeps/unix/sysv/linux/i386/fchownat.c10
5 files changed, 48 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b54a2d9..d718010 100644
--- a/ChangeLog
+++ b/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>.
diff --git a/bits/syslog-path.h b/bits/syslog-path.h
new file mode 100644
index 0000000..a1bbd6b
--- /dev/null
+++ b/bits/syslog-path.h
@@ -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 */
diff --git a/misc/Makefile b/misc/Makefile
index 7d60baa..63b6d41 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -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 \
diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h
index 0bc5b8d..4ed57c2 100644
--- a/misc/sys/syslog.h
+++ b/misc/sys/syslog.h
@@ -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
diff --git a/sysdeps/unix/sysv/linux/i386/fchownat.c b/sysdeps/unix/sysv/linux/i386/fchownat.c
index b2bac19..e5306db 100644
--- a/sysdeps/unix/sysv/linux/i386/fchownat.c
+++ b/sysdeps/unix/sysv/linux/i386/fchownat.c
@@ -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;
}