diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | locale/programs/ld-collate.c | 2 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 6 | ||||
| -rw-r--r-- | nscd/connections.c | 4 | ||||
| -rw-r--r-- | nscd/grpcache.c | 2 | ||||
| -rw-r--r-- | nscd/hstcache.c | 2 | ||||
| -rw-r--r-- | nscd/nscd_conf.c | 2 | ||||
| -rw-r--r-- | nscd/pwdcache.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/sigaction.c | 139 |
9 files changed, 170 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 7da4825bb5..46bf6e172c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2000-12-09 Andreas Jaeger <aj@suse.de> + + * sysdeps/unix/sysv/linux/mips/sigaction.c: New file. + + * sysdeps/unix/sysv/linux/mips/sys/acct.h: Removed, we can use the + generic version. + Patches by Hiroyuki Machida <machida@sm.sony.co.jp>. + + * locale/programs/ld-collate.c (handle_ellipsis): Fix format + string. + + * locale/programs/ld-ctype.c (charclass_symbolic_ellipsis): Fix + format string. + + * nscd/hstcache.c (addhstbyname): Add cast to avoid warning. + * nscd/connections.c (handle_request): Likewise. + * nscd/pwdcache.c (addpwbyname): Likewise. + * nscd/grpcache.c (addgrbyname): Likewise. + + * nscd/nscd_conf.c (nscd_parse_file): Remove extra argument. + 2000-12-09 Ulrich Drepper <drepper@redhat.com> * string/stratcliff.c: Add tests for stpncpy, memcpy, and mempcpy. diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index d417c6670b..9d53702984 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1302,7 +1302,7 @@ order for `%.*s' already defined at %s:%Zu"), int cnt; /* Generate the the name. */ - sprintf (buf + preflen, base == 10 ? "%d" : "%x", from); + sprintf (buf + preflen, base == 10 ? "%ld" : "%lx", from); /* Look whether this name is already defined. */ if (find_entry (&collate->seq_table, buf, symlen, diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index f624769b68..704ccfc9b8 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -107,7 +107,7 @@ struct translit_ignore_t /* Type to describe a transliteration include statement. */ -struct translit_include_t +struct translit_include_t { const char *copy_locale; const char *copy_repertoire; @@ -1482,8 +1482,8 @@ charclass_symbolic_ellipsis (struct linereader *ldfile, struct charseq *seq; uint32_t wch; - sprintf (tmp, (base == 10 ? "%.*s%0*d" : "%.*s%0*X"), cp - last_str, - last_str, now->val.str.lenmb - (cp - last_str), from); + sprintf (tmp, (base == 10 ? "%.*s%0*ld" : "%.*s%0*lX"), cp - last_str, + last_str, (int) (now->val.str.lenmb - (cp - last_str)), from); get_character (now, charmap, repertoire, &seq, &wch); diff --git a/nscd/connections.c b/nscd/connections.c index 121f15064b..7ba36bbed9 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -245,7 +245,7 @@ cannot handle old request version %d; current version is %d"), key, buf, sizeof (buf))); } else - dbg_log ("\t%s (%s)", serv2str[req->type], key); + dbg_log ("\t%s (%s)", serv2str[req->type], (char *)key); } /* Is this service enabled? */ @@ -293,7 +293,7 @@ cannot handle old request version %d; current version is %d"), else if (debug_level > 0) { if (req->type == INVALIDATE) - dbg_log ("\t%s (%s)", serv2str[req->type], key); + dbg_log ("\t%s (%s)", serv2str[req->type], (char *)key); else dbg_log ("\t%s", serv2str[req->type]); } diff --git a/nscd/grpcache.c b/nscd/grpcache.c index b1634a1009..d6b1395540 100644 --- a/nscd/grpcache.c +++ b/nscd/grpcache.c @@ -211,7 +211,7 @@ addgrbyname (struct database *db, int fd, request_header *req, uid_t oldeuid = 0; if (debug_level > 0) - dbg_log (_("Haven't found \"%s\" in group cache!"), key); + dbg_log (_("Haven't found \"%s\" in group cache!"), (char *)key); if (secure[grpdb]) { diff --git a/nscd/hstcache.c b/nscd/hstcache.c index e8444d825f..ee38c3d653 100644 --- a/nscd/hstcache.c +++ b/nscd/hstcache.c @@ -296,7 +296,7 @@ addhstbyname (struct database *db, int fd, request_header *req, uid_t oldeuid = 0; if (debug_level > 0) - dbg_log (_("Haven't found \"%s\" in hosts cache!"), key); + dbg_log (_("Haven't found \"%s\" in hosts cache!"), (char *)key); if (secure[hstdb]) { diff --git a/nscd/nscd_conf.c b/nscd/nscd_conf.c index 9b8d75ce23..742f2b760d 100644 --- a/nscd/nscd_conf.c +++ b/nscd/nscd_conf.c @@ -179,7 +179,7 @@ nscd_parse_file (const char *fname, struct database dbs[lastdb]) else if (strcmp (entry, "server-user") == 0) { if (!arg1) - dbg_log (_("Must specify user name for server-user option"), arg1); + dbg_log (_("Must specify user name for server-user option")); else server_user = strdup (arg1); } diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c index 7e35bef1cc..85a3fd529e 100644 --- a/nscd/pwdcache.c +++ b/nscd/pwdcache.c @@ -207,7 +207,7 @@ addpwbyname (struct database *db, int fd, request_header *req, uid_t oldeuid = 0; if (debug_level > 0) - dbg_log (_("Haven't found \"%s\" in password cache!"), key); + dbg_log (_("Haven't found \"%s\" in password cache!"), (char *)key); if (secure[pwddb]) { diff --git a/sysdeps/unix/sysv/linux/mips/sigaction.c b/sysdeps/unix/sysv/linux/mips/sigaction.c new file mode 100644 index 0000000000..36265d1891 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/sigaction.c @@ -0,0 +1,139 @@ +/* Copyright (C) 1997, 1998, 1999, 2000 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 Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <signal.h> +#include <string.h> + +#include <sysdep.h> +#include <sys/syscall.h> + +#include "kernel-features.h" + +/* The difference here is that the sigaction structure used in the + kernel is not the same as we use in the libc. Therefore we must + translate it here. */ +#include <kernel_sigaction.h> + +#if __ASSUME_REALTIME_SIGNALS == 0 +/* The variable is shared between all wrappers around signal handling + functions which have RT equivalents. This is the definition. */ +int __libc_missing_rt_sigs; + +extern int __syscall_sigaction (int, const struct old_kernel_sigaction *__unbounded, + struct old_kernel_sigaction *__unbounded); +#endif +extern int __syscall_rt_sigaction (int, const struct kernel_sigaction *__unbounded, + struct kernel_sigaction *__unbounded, size_t); + + +/* If ACT is not NULL, change the action for SIG to *ACT. + If OACT is not NULL, put the old action for SIG in *OACT. */ +int +__libc_sigaction (sig, act, oact) + int sig; + const struct sigaction *act; + struct sigaction *oact; +{ +#if __ASSUME_REALTIME_SIGNALS == 0 + struct old_kernel_sigaction k_sigact, k_osigact; +#endif + int result; + +#if defined __NR_rt_sigaction || __ASSUME_REALTIME_SIGNALS > 0 + /* First try the RT signals. */ +# if __ASSUME_REALTIME_SIGNALS == 0 + if (!__libc_missing_rt_sigs) +# endif + { + struct kernel_sigaction kact, koact; + /* Save the current error value for later. We need not do this + if we are guaranteed to have realtime signals. */ +# if __ASSUME_REALTIME_SIGNALS == 0 + int saved_errno = errno; +# endif + + if (act) + { + kact.k_sa_handler = act->sa_handler; + memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kernel_sigset_t)); + kact.sa_flags = act->sa_flags; +# ifdef HAVE_SA_RESTORER + kact.sa_restorer = act->sa_restorer; +# endif + } + + /* XXX The size argument hopefully will have to be changed to the + real size of the user-level sigset_t. */ + result = INLINE_SYSCALL (rt_sigaction, 4, sig, + act ? __ptrvalue (&kact) : NULL, + oact ? __ptrvalue (&koact) : NULL, + sizeof (kernel_sigset_t)); + +# if __ASSUME_REALTIME_SIGNALS == 0 + if (result >= 0 || errno != ENOSYS) +# endif + { + if (oact && result >= 0) + { + oact->sa_handler = koact.k_sa_handler; + memcpy (&oact->sa_mask, &koact.sa_mask, + sizeof (kernel_sigset_t)); + oact->sa_flags = koact.sa_flags; +# ifdef HAVE_SA_RESTORER + oact->sa_restorer = koact.sa_restorer; +# endif + } + return result; + } + +# if __ASSUME_REALTIME_SIGNALS == 0 + __set_errno (saved_errno); + __libc_missing_rt_sigs = 1; +# endif + } +#endif + +#if __ASSUME_REALTIME_SIGNALS == 0 + if (act) + { + k_sigact.k_sa_handler = act->sa_handler; + k_sigact.sa_mask = act->sa_mask.__val[0]; + k_sigact.sa_flags = act->sa_flags; +# ifdef HAVE_SA_RESTORER + k_sigact.sa_restorer = act->sa_restorer; +# endif + } + result = INLINE_SYSCALL (sigaction, 3, sig, + act ? __ptrvalue (&k_sigact) : NULL, + oact ? __ptrvalue (&k_osigact) : NULL); + if (oact && result >= 0) + { + oact->sa_handler = k_osigact.k_sa_handler; + oact->sa_mask.__val[0] = k_osigact.sa_mask; + oact->sa_flags = k_osigact.sa_flags; +# ifdef HAVE_SA_RESTORER + oact->sa_restorer = k_osigact.sa_restorer; +# endif + } + return result; +#endif +} + +weak_alias (__libc_sigaction, __sigaction) +weak_alias (__libc_sigaction, sigaction) |