mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-16 01:50:11 +00:00
faaa6f6283
2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/testdata/EUC-JISX0213: New file. * iconvdata/testdata/EUC-JISX0213..UTF8: New file. * iconvdata/testdata/SHIFT_JISX0213: New file. * iconvdata/testdata/SHIFT_JISX0213..UTF8: New file. * iconvdata/testdata/ISO-2022-JP-3: New file. * iconvdata/testdata/ISO-2022-JP-3..UTF8: New file. * iconvdata/TESTS: Add EUC-JISX0213, SHIFT_JISX0213, ISO-2022-JP-3. * iconvdata/run-iconv-test.sh: Skip the charmap test if the charmap contains comments indicating precomposed characters. 2002-04-21 Bruno Haible <bruno@clisp.org> * iconvdata/iso-2022-jp-3.c: New file. * iconvdata/gconv-modules (ISO-2022-JP-3): New module. * iconvdata/Makefile (modules): Add ISO-2022-JP-3. (LDFLAGS-ISO-2022-JP-3.so): New variable. (ISO-2022-JP-3.so): Depend on libJIS.so and libJISX0213.so. (distribute): Add iso-2022-jp-3.c. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/tst-table-to.c (main): Restore handling of transliterations, broken by last patch. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/TESTS: Add IBM922, IBM1124, IBM1129. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Don't advance inptr when there is not enough room in the output buffer. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. 2002-04-20 Bruno Haible <bruno@clisp.org> * iconv/skeleton.c ({FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}): New macros. (RESET_INPUT_BUFFER): Use them instead of {MIN,MAX}_NEEDED_{FROM,TO}. Also make this macro work if FROM_DIRECTION evaluates to 0. (gconv_init): Use the new macros instead of {MIN,MAX}_NEEDED_{FROM,TO}. (FUNCTION_NAME): Likewise, in the handling of unaligned accesses and of consume_incomplete. * iconvdata/cp1255.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 4, not 8. * iconvdata/cp1258.c: Likewise. * iconvdata/ibm930.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 3, not 2. * iconvdata/ibm933.c: Likewise. * iconvdata/ibm935.c: Likewise. * iconvdata/ibm937.c: Likewise. * iconvdata/ibm939.c: Likewise. * iconvdata/iso-2022-cn.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 6, not 4. * iconvdata/iso-2022-cn-ext.c: Likewise. * iconvdata/iso-2022-jp.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. * iconvdata/tcvn5712-1.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_FROM to 1, not 2. * iconvdata/euc-jisx0213.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 8, not 4. * iconvdata/shift_jisx0213.c: Likewise. 2002-05-14 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * sysdeps/powerpc/Makefile (sysdeps_routines): Add divdi3, cmpdi2, shdi3, fixdfdi, fixsfdi in csu dir. (shared-only-routines): Likewise. * sysdeps/wordsize-32/cmpdi2.c: New file. * sysdeps/wordsize-32/shdi3.c: New file. * sysdeps/wordsize-32/fixdfdi.c: New file. * sysdeps/wordsize-32/fixsfdi.c: New file. * sysdeps/powerpc/Versions (__divdi3, __moddi3, __udivdi3, __umoddi3, __ashldi3, __ashrdi3, __lshrdi3, __cmpdi2, __ucmpdi2, __fixdfdi, __fixsfdi, __fixunsdfdi, __fixunssfdi): Export at GLIBC_2.0. * sysdeps/unix/sysv/linux/semctl.c (__old_semctl, __new_semctl): Only use va_arg if the argument will be used [PR libc/3259]. 2002-05-06 Michael A. Schmidt <mmaass@us.ibm.com> * catgets/catgets.c (catopen): Free buffer if internal catalog open fails. 2002-05-14 Ulrich Drepper <drepper@redhat.com> * debug/xtrace.sh: Make more robust. For realtime tracking use non-buffering methods. * debug/pcprofiledump.c: Implement -u option. Patch by Roger Luethi <rl@hellgate.ch>.
190 lines
5.4 KiB
C
190 lines
5.4 KiB
C
/* Copyright (C) 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
|
|
|
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. */
|
|
|
|
#include <errno.h>
|
|
#include <stdarg.h>
|
|
#include <sys/sem.h>
|
|
#include <ipc_priv.h>
|
|
|
|
#include <sysdep.h>
|
|
#include <string.h>
|
|
#include <sys/syscall.h>
|
|
#include <shlib-compat.h>
|
|
|
|
#include "kernel-features.h"
|
|
|
|
struct __old_semid_ds
|
|
{
|
|
struct __old_ipc_perm sem_perm; /* operation permission struct */
|
|
__time_t sem_otime; /* last semop() time */
|
|
__time_t sem_ctime; /* last time changed by semctl() */
|
|
struct sem *__unbounded __sembase; /* ptr to first semaphore in array */
|
|
struct sem_queue *__unbounded __sem_pending; /* pending operations */
|
|
struct sem_queue *__unbounded __sem_pending_last; /* last pending operation */
|
|
struct sem_undo *__unbounded __undo; /* ondo requests on this array */
|
|
unsigned short int sem_nsems; /* number of semaphores in set */
|
|
};
|
|
|
|
/* Define a `union semun' suitable for Linux here. */
|
|
union semun
|
|
{
|
|
int val; /* value for SETVAL */
|
|
struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */
|
|
unsigned short int *array; /* array for GETALL & SETALL */
|
|
struct seminfo *__buf; /* buffer for IPC_INFO */
|
|
};
|
|
|
|
#include <bp-checks.h>
|
|
#include <bp-semctl.h> /* definition of CHECK_SEMCTL needs union semum */
|
|
|
|
/* Return identifier for array of NSEMS semaphores associated with
|
|
KEY. */
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
|
|
int __old_semctl (int semid, int semnum, int cmd, ...);
|
|
#endif
|
|
int __new_semctl (int semid, int semnum, int cmd, ...);
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
|
|
int
|
|
__old_semctl (int semid, int semnum, int cmd, ...)
|
|
{
|
|
union semun arg;
|
|
va_list ap;
|
|
|
|
va_start (ap, cmd);
|
|
|
|
/* Get the argument only if required. */
|
|
arg.buf = NULL;
|
|
switch (cmd)
|
|
{
|
|
case SETVAL: /* arg.val */
|
|
case GETALL: /* arg.array */
|
|
case SETALL:
|
|
case IPC_STAT: /* arg.buf */
|
|
case IPC_SET:
|
|
case SEM_STAT:
|
|
case IPC_INFO: /* arg.__buf */
|
|
case SEM_INFO:
|
|
va_start (ap, cmd);
|
|
arg = va_arg (ap, union semun);
|
|
va_end (ap);
|
|
break;
|
|
}
|
|
|
|
va_end (ap);
|
|
|
|
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
|
|
CHECK_SEMCTL (&arg, semid, cmd));
|
|
}
|
|
compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0);
|
|
#endif
|
|
|
|
int
|
|
__new_semctl (int semid, int semnum, int cmd, ...)
|
|
{
|
|
union semun arg;
|
|
va_list ap;
|
|
|
|
va_start (ap, cmd);
|
|
|
|
/* Get the argument only if required. */
|
|
arg.buf = NULL;
|
|
switch (cmd)
|
|
{
|
|
case SETVAL: /* arg.val */
|
|
case GETALL: /* arg.array */
|
|
case SETALL:
|
|
case IPC_STAT: /* arg.buf */
|
|
case IPC_SET:
|
|
case SEM_STAT:
|
|
case IPC_INFO: /* arg.__buf */
|
|
case SEM_INFO:
|
|
va_start (ap, cmd);
|
|
arg = va_arg (ap, union semun);
|
|
va_end (ap);
|
|
break;
|
|
}
|
|
|
|
va_end (ap);
|
|
|
|
#if __ASSUME_IPC64 > 0
|
|
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
|
|
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64));
|
|
#else
|
|
switch (cmd)
|
|
{
|
|
case SEM_STAT:
|
|
case IPC_STAT:
|
|
case IPC_SET:
|
|
break;
|
|
default:
|
|
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
|
|
CHECK_SEMCTL (&arg, semid, cmd));
|
|
}
|
|
|
|
{
|
|
int save_errno = errno, result;
|
|
struct __old_semid_ds old;
|
|
struct semid_ds *buf;
|
|
|
|
/* Unfortunately there is no way how to find out for sure whether
|
|
we should use old or new semctl. */
|
|
result = INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
|
|
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64));
|
|
if (result != -1 || errno != EINVAL)
|
|
return result;
|
|
|
|
__set_errno(save_errno);
|
|
buf = arg.buf;
|
|
arg.buf = (struct semid_ds *)&old;
|
|
if (cmd == IPC_SET)
|
|
{
|
|
old.sem_perm.uid = buf->sem_perm.uid;
|
|
old.sem_perm.gid = buf->sem_perm.gid;
|
|
old.sem_perm.mode = buf->sem_perm.mode;
|
|
if (old.sem_perm.uid != buf->sem_perm.uid ||
|
|
old.sem_perm.gid != buf->sem_perm.gid)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
}
|
|
result = INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
|
|
CHECK_SEMCTL (&arg, semid, cmd));
|
|
if (result != -1 && cmd != IPC_SET)
|
|
{
|
|
memset(buf, 0, sizeof(*buf));
|
|
buf->sem_perm.__key = old.sem_perm.__key;
|
|
buf->sem_perm.uid = old.sem_perm.uid;
|
|
buf->sem_perm.gid = old.sem_perm.gid;
|
|
buf->sem_perm.cuid = old.sem_perm.cuid;
|
|
buf->sem_perm.cgid = old.sem_perm.cgid;
|
|
buf->sem_perm.mode = old.sem_perm.mode;
|
|
buf->sem_perm.__seq = old.sem_perm.__seq;
|
|
buf->sem_otime = old.sem_otime;
|
|
buf->sem_ctime = old.sem_ctime;
|
|
buf->sem_nsems = old.sem_nsems;
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
versioned_symbol (libc, __new_semctl, semctl, GLIBC_2_2);
|