mirror of git://sourceware.org/git/glibc.git
2008-11-26 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/alpha/wordexp.c: Contents moved to main repository's ia64 file; #include that. * sysdeps/unix/sysv/linux/alpha/ipc_priv.h: Contents moved to main repository's powerpc file; #include that.
This commit is contained in:
parent
5823b5780d
commit
751759ebd2
|
|
@ -1,47 +1 @@
|
||||||
/* Copyright (C) 1995-1999, 2000, 2003 Free Software Foundation, Inc.
|
#include <sysdeps/unix/sysv/linux/powerpc/ipc_priv.h>
|
||||||
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. */
|
|
||||||
|
|
||||||
#include <sys/ipc.h>
|
|
||||||
|
|
||||||
#define __IPC_64 0x100
|
|
||||||
|
|
||||||
struct __old_ipc_perm
|
|
||||||
{
|
|
||||||
__key_t __key; /* Key. */
|
|
||||||
unsigned int uid; /* Owner's user ID. */
|
|
||||||
unsigned int gid; /* Owner's group ID. */
|
|
||||||
unsigned int cuid; /* Creator's user ID. */
|
|
||||||
unsigned int cgid; /* Creator's group ID. */
|
|
||||||
unsigned int mode; /* Read/write permission. */
|
|
||||||
unsigned short int __seq; /* Sequence number. */
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/* The codes for the functions to use the ipc syscall multiplexer. */
|
|
||||||
#define IPCOP_semop 1
|
|
||||||
#define IPCOP_semget 2
|
|
||||||
#define IPCOP_semctl 3
|
|
||||||
#define IPCOP_semtimedop 4
|
|
||||||
#define IPCOP_msgsnd 11
|
|
||||||
#define IPCOP_msgrcv 12
|
|
||||||
#define IPCOP_msgget 13
|
|
||||||
#define IPCOP_msgctl 14
|
|
||||||
#define IPCOP_shmat 21
|
|
||||||
#define IPCOP_shmdt 22
|
|
||||||
#define IPCOP_shmget 23
|
|
||||||
#define IPCOP_shmctl 24
|
|
||||||
|
|
|
||||||
|
|
@ -1,60 +1 @@
|
||||||
/* Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
|
#include <sysdeps/unix/sysv/linux/ia64/wordexp.c>
|
||||||
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. */
|
|
||||||
|
|
||||||
#include <shlib-compat.h>
|
|
||||||
|
|
||||||
/* For Linux/Alpha we have to make the wordexp symbols versioned. */
|
|
||||||
#define wordexp(words, pwordexp, flags) \
|
|
||||||
__new_wordexp (words, pwordexp, flags)
|
|
||||||
|
|
||||||
#include <posix/wordexp.c>
|
|
||||||
|
|
||||||
versioned_symbol (libc, __new_wordexp, wordexp, GLIBC_2_2_2);
|
|
||||||
|
|
||||||
|
|
||||||
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2_2)
|
|
||||||
/* The old, incorrect wordexp_t definition. */
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int we_wordc; /* Count of words matched. */
|
|
||||||
char **we_wordv; /* List of expanded words. */
|
|
||||||
int we_offs; /* Slots to reserve in `we_wordv'. */
|
|
||||||
} old_wordexp_t;
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
attribute_compat_text_section
|
|
||||||
__old_wordexp (const char *words, old_wordexp_t *pwordexp, int flags)
|
|
||||||
{
|
|
||||||
wordexp_t we;
|
|
||||||
int result;
|
|
||||||
|
|
||||||
we.we_wordc = pwordexp->we_wordc;
|
|
||||||
we.we_wordv = pwordexp->we_wordv;
|
|
||||||
we.we_offs = pwordexp->we_offs;
|
|
||||||
|
|
||||||
result = __new_wordexp (words, &we, flags);
|
|
||||||
|
|
||||||
pwordexp->we_wordc = we.we_wordc;
|
|
||||||
pwordexp->we_wordv = we.we_wordv;
|
|
||||||
pwordexp->we_offs = we.we_offs;
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
compat_symbol (libc, __old_wordexp, wordexp, GLIBC_2_1);
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue