* libc/include/string.h[__linux__]: Add strsignal prototype.
* libc/include/sys/lock.h: New file with default locking support.
* libc/include/sys/reent.h: Add signal buffer support for strsignal
and psignal.
* libc/posix/Makefile.am: Add support for readdir_r.c.
* libc/posix/Makefile.in: Regenerated.
* libc/posix/closedir.c: Add locking support and hash table cleanup.
* libc/posix/opendir.c: Add lock support.
* libc/posix/readdir.c: Ditto.
* libc/posix/rewinddir.c: Ditto.
* libc/posix/scandir.c: Ditto.
* libc/posix/seekdir.c: Ditto.
* libc/posix/telldir.c: Ditto plus add _cleanupdir routine to
clean up leftover hash table entries.
* libc/posix/readdir_r.c: New file.
* libc/sys/linux/Makefile.am: Add psignal.c and strsignal.c support.
* libc/sys/linux/Makefile.in: Regenerated.
* libc/sys/linux/sys/dirent.h: Add dd_lock to DIR structure.
* libc/sys/linux/sys/signal.h: Add psignal prototype.
* libc/sys/linux/psignal.c: New file.
* libc/sys/linux/strsignal.c: Ditto.
+2002-06-05 Jeff Johnston <jjohnstn@redhat.com>
+
+ * libc/include/string.h[__linux__]: Add strsignal prototype.
+ * libc/include/sys/lock.h: New file with default locking support.
+ * libc/include/sys/reent.h: Add signal buffer support for strsignal
+ and psignal.
+ * libc/posix/Makefile.am: Add support for readdir_r.c.
+ * libc/posix/Makefile.in: Regenerated.
+ * libc/posix/closedir.c: Add locking support and hash table cleanup.
+ * libc/posix/opendir.c: Add lock support.
+ * libc/posix/readdir.c: Ditto.
+ * libc/posix/rewinddir.c: Ditto.
+ * libc/posix/scandir.c: Ditto.
+ * libc/posix/seekdir.c: Ditto.
+ * libc/posix/telldir.c: Ditto plus add _cleanupdir routine to
+ clean up leftover hash table entries.
+ * libc/posix/readdir_r.c: New file.
+ * libc/sys/linux/Makefile.am: Add psignal.c and strsignal.c support.
+ * libc/sys/linux/Makefile.in: Regenerated.
+ * libc/sys/linux/sys/dirent.h: Add dd_lock to DIR structure.
+ * libc/sys/linux/sys/signal.h: Add psignal prototype.
+ * libc/sys/linux/psignal.c: New file.
+ * libc/sys/linux/strsignal.c: Ditto.
+
2002-06-03 Corinna Vinschen <corinna@vinschen.de>
* libc/include/sys/types.h: Don't define dev_t when compiling for
const char *_EXFUN(strsignal, (int __signo));
#endif
int _EXFUN(strtosigno, (const char *__name));
+#elif defined(__linux__)
+char *_EXFUN(strsignal, (int __signo));
#endif
/* These function names are used on Windows and perhaps other systems. */
--- /dev/null
+#ifndef __SYS_LOCK_H__
+#define __SYS_LOCK_H__
+
+/* dummy lock routines for single-threaded aps */
+
+typedef int _LOCK_T;
+typedef int _LOCK_RECURSIVE_T;
+
+#define __LOCK_INIT(class,lock) static int lock = 0;
+#define __LOCK_INIT_RECURSIVE(class,lock) static int lock = 0;
+#define __lock_init(lock) {}
+#define __lock_init_recursive(lock) {}
+#define __lock_close(lock) {}
+#define __lock_close_recursive(lock) {}
+#define __lock_acquire(lock) {}
+#define __lock_acquire_recursive(lock) {}
+#define __lock_release(lock) {}
+#define __lock_release_recursive(lock) {}
+
+#endif /* __SYS_LOCK_H__ */
/* How big the some arrays are. */
#define _REENT_EMERGENCY_SIZE 25
#define _REENT_ASCTIME_SIZE 26
+#define _REENT_SIGNAL_SIZE 24
/*
* struct _reent
struct __sFILE *__sf; /* file descriptors */
struct __sFILE_fake __sf_fake; /* fake initial stdin/out/err */
struct _misc_reent *_misc; /* strtok, multibyte states */
+ char *_signal_buf; /* strsignal */
};
#define _REENT_INIT(var) \
{ (struct __sFILE *)&var.__sf_fake, (struct __sFILE *)&var.__sf_fake, \
(struct __sFILE *)&var.__sf_fake, 0, 0, _NULL, 0, 0, \
"C", _NULL, _NULL, 0, 0, _NULL, _NULL, _NULL, _NULL, _NULL, \
- { 0, _NULL, _NULL, 0 }, { _NULL, 0, _NULL }, _NULL, 0, _NULL }
+ { 0, _NULL, _NULL, 0 }, { _NULL, 0, _NULL }, _NULL, 0, _NULL, _NULL }
#define _REENT_INIT_PTR(var) \
{ var->_stdin = (struct __sFILE *)&var->__sf_fake; \
var->__sglue._iobs = _NULL; \
var->__sf = 0; \
var->_misc = _NULL; \
+ var->_signal_buf = _NULL; \
var->__sf_fake._p = _NULL; \
var->__sf_fake._r = 0; \
var->__sf_fake._w = 0; \
#define _REENT_CHECK_MISC(var) \
_REENT_CHECK(var, _misc, struct _misc_reent *, sizeof *((var)->_misc), _REENT_INIT_MISC(var))
+#define _REENT_CHECK_SIGNAL_BUF(var) \
+ _REENT_CHECK(var, _signal_buf, char *, _REENT_SIGNAL_SIZE, /* nothing */)
+
#define _REENT_SIGNGAM(ptr) ((ptr)->_gamma_signgam)
#define _REENT_RAND_NEXT(ptr) ((ptr)->_r48->_rand_next)
#define _REENT_RAND48_SEED(ptr) ((ptr)->_r48->_seed)
#define _REENT_MBTOWC_STATE(ptr)((ptr)->_misc->_mbtowc_state)
#define _REENT_WCTOMB_STATE(ptr)((ptr)->_misc->_wctomb_state)
#define _REENT_L64A_BUF(ptr) ((ptr)->_misc->_l64a_buf)
+#define _REENT_SIGNAL_BUF(ptr) ((ptr)->_signal_buf)
#else /* !_REENT_SMALL */
{
unsigned int _unused_rand;
char * _strtok_last;
- char _asctime_buf[26];
+ char _asctime_buf[_REENT_ASCTIME_SIZE];
struct __tm _localtime_buf;
int _gamma_signgam;
__extension__ unsigned long long _rand_next;
int _mbtowc_state;
int _wctomb_state;
char _l64a_buf[8];
+ char _signal_buf[_REENT_SIGNAL_SIZE];
} _reent;
/* Two next two fields were once used by malloc. They are no longer
used. They are used to preserve the space used before so as to
var->_new._reent._mbtowc_state = 0; \
var->_new._reent._wctomb_state = 0; \
var->_new._reent._l64a_buf[0] = '\0'; \
+ var->_new._reent._signal_buf[0] = '\0'; \
var->_atexit = _NULL; \
var->_atexit0._ind = 0; \
var->_atexit0._fns[0] = _NULL; \
#define _REENT_CHECK_ASCTIME_BUF(ptr) /* nothing */
#define _REENT_CHECK_EMERGENCY(ptr) /* nothing */
#define _REENT_CHECK_MISC(ptr) /* nothing */
+#define _REENT_CHECK_SIGNAL_BUF(ptr) /* nothing */
#define _REENT_SIGNGAM(ptr) ((ptr)->_new._reent._gamma_signgam)
#define _REENT_RAND_NEXT(ptr) ((ptr)->_new._reent._rand_next)
#define _REENT_MBTOWC_STATE(ptr)((ptr)->_new._reent._mbtowc_state)
#define _REENT_WCTOMB_STATE(ptr)((ptr)->_new._reent._wctomb_state)
#define _REENT_L64A_BUF(ptr) ((ptr)->_new._reent._l64a_buf)
+#define _REENT_SIGNAL_BUF(ptr) ((ptr)->_new._reent._signal_buf)
#endif /* !_REENT_SMALL */
LIB_SOURCES = \
closedir.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c \
telldir.c execl.c execle.c execlp.c execv.c execve.c execvp.c \
- popen.c creat.c isatty.c
+ popen.c creat.c isatty.c readdir_r.c
libposix_la_LDFLAGS = -Xcompiler -nostdlib
LIB_SOURCES = \
closedir.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c \
telldir.c execl.c execle.c execlp.c execv.c execve.c execvp.c \
- popen.c creat.c isatty.c
+ popen.c creat.c isatty.c readdir_r.c
libposix_la_LDFLAGS = -Xcompiler -nostdlib
@USE_LIBTOOL_FALSE@lib_a_OBJECTS = closedir.o opendir.o readdir.o \
@USE_LIBTOOL_FALSE@rewinddir.o scandir.o seekdir.o telldir.o execl.o \
@USE_LIBTOOL_FALSE@execle.o execlp.o execv.o execve.o execvp.o popen.o \
-@USE_LIBTOOL_FALSE@creat.o isatty.o
+@USE_LIBTOOL_FALSE@creat.o isatty.o readdir_r.o
LTLIBRARIES = $(noinst_LTLIBRARIES)
libposix_la_LIBADD =
@USE_LIBTOOL_TRUE@libposix_la_OBJECTS = closedir.lo opendir.lo \
@USE_LIBTOOL_TRUE@readdir.lo rewinddir.lo scandir.lo seekdir.lo \
@USE_LIBTOOL_TRUE@telldir.lo execl.lo execle.lo execlp.lo execv.lo \
-@USE_LIBTOOL_TRUE@execve.lo execvp.lo popen.lo creat.lo isatty.lo
+@USE_LIBTOOL_TRUE@execve.lo execvp.lo popen.lo creat.lo isatty.lo \
+@USE_LIBTOOL_TRUE@readdir_r.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
#include <dirent.h>
#include <stdlib.h>
#include <unistd.h>
+#include <sys/lock.h>
+
+extern void _cleanupdir (DIR *dirp);
/*
* close a directory.
closedir(dirp)
register DIR *dirp;
{
- int fd;
+ int fd, rc;
+#ifdef HAVE_DD_LOCK
+ __lock_acquire_recursive(dirp->dd_lock);
+#endif
+ rc = 0;
fd = dirp->dd_fd;
- dirp->dd_fd = -1;
- dirp->dd_loc = 0;
- (void)free((void *)dirp->dd_buf);
- (void)free((void *)dirp);
- return(close(fd));
+ if (fd != -1) {
+ dirp->dd_fd = -1;
+ dirp->dd_loc = 0;
+ (void)free((void *)dirp->dd_buf);
+ (void)free((void *)dirp);
+ rc = close(fd);
+ _cleanupdir(dirp);
+ }
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+ __lock_close_recursive(dirp->dd_lock);
+#endif
+ return rc;
}
#endif /* ! HAVE_OPENDIR */
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
+#include <sys/lock.h>
/*
* open a directory.
/*
* Set up seek point for rewinddir.
*/
+
+#ifdef HAVE_DD_LOCK
+ /* if we have a locking mechanism, initialize it */
+ __lock_init_recursive(dirp->dd_lock);
+#endif
+
return dirp;
}
#include <dirent.h>
+extern int getdents (int fd, void *dp, int count);
+
/*
* get next entry in a directory.
*/
readdir(dirp)
register DIR *dirp; {
register struct dirent *dp;
-
+
+#ifdef HAVE_DD_LOCK
+ __lock_acquire_recursive(dirp->dd_lock);
+#endif
+
+ if (dirp->dd_fd == -1)
+ return NULL;
+
for (;;) {
if (dirp->dd_loc == 0) {
dirp->dd_size = getdents (dirp->dd_fd,
dirp->dd_buf,
dirp->dd_len);
- if (dirp->dd_size <= 0)
+ if (dirp->dd_size <= 0) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return NULL;
+ }
}
if (dirp->dd_loc >= dirp->dd_size) {
dirp->dd_loc = 0;
continue;
}
dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
- if ((int)dp & 03) /* bogus pointer check */
+ if ((int)dp & 03) { /* bogus pointer check */
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return NULL;
+ }
if (dp->d_reclen <= 0 ||
- dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
+ dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return NULL;
+ }
dirp->dd_loc += dp->d_reclen;
if (dp->d_ino == 0)
continue;
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return (dp);
}
}
--- /dev/null
+#ifndef HAVE_OPENDIR
+
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* this code is modified from readdir.c by Jeff Johnston, June 5, 2002 */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)readdir.c 5.7 (Berkeley) 6/1/90";
+#endif /* LIBC_SCCS and not lint */
+
+#include <dirent.h>
+#include <errno.h>
+#include <string.h>
+
+extern int getdents (int fd, void *dp, int count);
+
+/*
+ * get next entry in a directory using supplied dirent structure.
+ */
+int
+readdir_r(dirp, dp, dpp)
+ register DIR *dirp;
+ struct dirent *dp;
+ struct dirent **dpp; {
+
+struct dirent *tmpdp;
+
+#ifdef HAVE_DD_LOCK
+ __lock_acquire_recursive(dirp->dd_lock);
+#endif
+
+ if (dirp->dd_fd == -1) {
+ *dpp = NULL;
+ return errno = EBADF;
+ }
+
+ for (;;) {
+ if (dirp->dd_loc == 0) {
+ dirp->dd_size = getdents (dirp->dd_fd,
+ dirp->dd_buf,
+ dirp->dd_len);
+
+ if (dirp->dd_size <= 0) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
+ *dpp = NULL;
+ return errno;
+ }
+ }
+ if (dirp->dd_loc >= dirp->dd_size) {
+ dirp->dd_loc = 0;
+ continue;
+ }
+ tmpdp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
+ memcpy (dp, tmpdp, sizeof(struct dirent));
+
+ if (dp->d_reclen <= 0 ||
+ dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
+ *dpp = NULL;
+ return -1;
+ }
+ dirp->dd_loc += dp->d_reclen;
+ if (dp->d_ino == 0)
+ continue;
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
+ *dpp = dp;
+ return 0;
+ }
+}
+
+#endif /* ! HAVE_OPENDIR */
#include <sys/types.h>
#include <dirent.h>
+#include <sys/lock.h>
void
rewinddir(dirp)
DIR *dirp;
{
+#ifdef HAVE_DD_LOCK
+ __lock_acquire_recursive(dirp->dd_lock);
+#endif
_seekdir((dirp), (off_t)0);
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
}
#endif /* ! HAVE_OPENDIR */
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/lock.h>
/*
* The DIRSIZ macro gives the minimum record length which will hold
if ((dirp = opendir(dirname)) == NULL)
return(-1);
- if (fstat(dirp->dd_fd, &stb) < 0)
+#ifdef HAVE_DD_LOCK
+ __lock_acquire_recursive(dirp->dd_lock);
+#endif
+ if (fstat(dirp->dd_fd, &stb) < 0) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return(-1);
+ }
/*
* estimate the array size by taking the size of the directory file
*/
arraysz = (stb.st_size / 24);
names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *));
- if (names == NULL)
+ if (names == NULL) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return(-1);
+ }
nitems = 0;
while ((d = readdir(dirp)) != NULL) {
* Make a minimum size copy of the data
*/
p = (struct dirent *)malloc(DIRSIZ(d));
- if (p == NULL)
+ if (p == NULL) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return(-1);
+ }
p->d_ino = d->d_ino;
p->d_reclen = d->d_reclen;
#ifdef _DIRENT_HAVE_D_NAMLEN
* realloc the maximum size.
*/
if (++nitems >= arraysz) {
- if (fstat(dirp->dd_fd, &stb) < 0)
+ if (fstat(dirp->dd_fd, &stb) < 0) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return(-1); /* just might have grown */
+ }
arraysz = stb.st_size / 12;
names = (struct dirent **)realloc((char *)names,
arraysz * sizeof(struct dirent *));
- if (names == NULL)
+ if (names == NULL) {
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return(-1);
+ }
}
names[nitems-1] = p;
}
if (nitems && dcomp != NULL)
qsort(names, nitems, sizeof(struct dirent *), dcomp);
*namelist = names;
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return(nitems);
}
#include <sys/param.h>
#include <dirent.h>
+#include <sys/lock.h>
/*
* Seek to an entry in a directory.
DIR *dirp;
long loc;
{
-
+#ifdef HAVE_DD_LOCK
+ __lock_acquire_recursive(dirp->dd_lock);
+#endif
_seekdir(dirp, loc);
+#ifdef HAVE_DD_LOCK
+ __lock_release_recursive(dirp->dd_lock);
+#endif
}
#endif /* ! HAVE_OPENDIR */
#include <dirent.h>
#include <stdlib.h>
#include <unistd.h>
+#include <sys/lock.h>
/*
* The option SINGLEUSE may be defined to say that a telldir
long loc_index; /* key associated with structure */
long loc_seek; /* magic cookie returned by getdirentries */
long loc_loc; /* offset of entry in buffer */
+ DIR *loc_dirp; /* DIR pointer */
};
#define NDIRHASH 32 /* Num of hash lists, must be a power of 2 */
static long dd_loccnt; /* Index of entry for sequential readdir's */
static struct ddloc *dd_hash[NDIRHASH]; /* Hash list heads for ddlocs */
+__LOCK_INIT(static, dd_hash_lock);
/*
* return a pointer into a directory
if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL)
return (-1);
+
+#ifdef HAVE_DD_LOCK
+ __lock_acquire_recursive(dirp->dd_lock);
+ __lock_acquire(dd_hash_lock);
+#endif
index = dd_loccnt++;
lp->loc_index = index;
lp->loc_seek = dirp->dd_seek;
lp->loc_loc = dirp->dd_loc;
+ lp->loc_dirp = dirp;
lp->loc_next = dd_hash[LOCHASH(index)];
dd_hash[LOCHASH(index)] = lp;
+#ifdef HAVE_DD_LOCK
+ __lock_release(dd_hash_lock);
+ __lock_release_recursive(dirp->dd_lock);
+#endif
return (index);
}
struct dirent *dp;
extern long lseek();
+#ifdef HAVE_DD_LOCK
+ __lock_acquire(dd_hash_lock);
+#endif
prevlp = &dd_hash[LOCHASH(loc)];
lp = *prevlp;
while (lp != NULL) {
prevlp = &lp->loc_next;
lp = lp->loc_next;
}
- if (lp == NULL)
+ if (lp == NULL) {
+#ifdef HAVE_DD_LOCK
+ __lock_release(dd_hash_lock);
+#endif
return;
+ }
if (lp->loc_loc == dirp->dd_loc && lp->loc_seek == dirp->dd_seek)
goto found;
(void) lseek(dirp->dd_fd, lp->loc_seek, 0);
*prevlp = lp->loc_next;
free((caddr_t)lp);
#endif
+#ifdef HAVE_DD_LOCK
+ __lock_release(dd_hash_lock);
+#endif
}
+/* clean out any hash entries from a closed directory */
+void
+_cleanupdir (dirp)
+ register DIR *dirp;
+{
+ int i;
+
+#ifdef HAVE_DD_LOCK
+ __lock_acquire(dd_hash_lock);
+#endif
+ for (i = 0; i < NDIRHASH; ++i) {
+ register struct ddloc *lp;
+ register struct ddloc *prevlp;
+ lp = dd_hash[i];
+ while (lp != NULL && lp->loc_dirp == dirp) {
+ dd_hash[i] = lp->loc_next;
+ prevlp = lp;
+ free((caddr_t)lp);
+ lp = prevlp->loc_next;
+ }
+ prevlp = lp;
+ while (lp != NULL) {
+ lp = lp->loc_next;
+ if (lp != NULL && lp->loc_dirp == dirp) {
+ prevlp->loc_next = lp->loc_next;
+ free((caddr_t)lp);
+ lp = prevlp;
+ }
+ else
+ prevlp = lp;
+ }
+ }
+#ifdef HAVE_DD_LOCK
+ __lock_release(dd_hash_lock);
+#endif
+
+}
#endif /* ! HAVE_OPENDIR */
$(LINUX_MACH_LIB)
LIB_SOURCES = \
- brk.c cfspeed.c flockfile.c funlockfile.c gethostname.c getoptlong.c \
- getreent.c ids.c inode.c io.c io64.c linux.c mmap.c \
- pread.c pread64.c process.c pwrite.c pwrite64.c raise.c realpath.c \
- rename.c resource.c sched.c select.c seteuid.c shm_open.c shm_unlink.c \
- sig.c sigaction.c sigqueue.c signal.c siglongjmp.c sigset.c sigwait.c \
- socket.c sleep.c stack.c sysconf.c sysctl.c systat.c system.c \
- tcdrain.c tcsendbrk.c termios.c time.c usleep.c wait.c
+ brk.c \
+ cfspeed.c \
+ flockfile.c \
+ funlockfile.c \
+ gethostname.c \
+ getoptlong.c \
+ getreent.c \
+ ids.c \
+ inode.c \
+ io.c \
+ io64.c \
+ linux.c \
+ mmap.c \
+ pread.c \
+ pread64.c \
+ process.c \
+ psignal.c \
+ pwrite.c \
+ pwrite64.c \
+ raise.c \
+ realpath.c \
+ rename.c \
+ resource.c \
+ sched.c \
+ select.c \
+ seteuid.c \
+ shm_open.c \
+ shm_unlink.c \
+ sig.c \
+ sigaction.c \
+ sigqueue.c \
+ signal.c \
+ siglongjmp.c \
+ sigset.c \
+ sigwait.c \
+ socket.c \
+ sleep.c \
+ stack.c \
+ strsignal.c \
+ sysconf.c \
+ sysctl.c \
+ systat.c \
+ system.c \
+ tcdrain.c \
+ tcsendbrk.c \
+ termios.c \
+ time.c \
+ usleep.c \
+ wait.c
# This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1)
# and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux
LIB_SOURCES = \
- brk.c cfspeed.c flockfile.c funlockfile.c gethostname.c getoptlong.c \
- getreent.c ids.c inode.c io.c io64.c linux.c mmap.c \
- pread.c pread64.c process.c pwrite.c pwrite64.c raise.c realpath.c \
- rename.c resource.c sched.c select.c seteuid.c shm_open.c shm_unlink.c \
- sig.c sigaction.c sigqueue.c signal.c siglongjmp.c sigset.c sigwait.c \
- socket.c sleep.c stack.c sysconf.c sysctl.c systat.c system.c \
- tcdrain.c tcsendbrk.c termios.c time.c usleep.c wait.c
+ brk.c \
+ cfspeed.c \
+ flockfile.c \
+ funlockfile.c \
+ gethostname.c \
+ getoptlong.c \
+ getreent.c \
+ ids.c \
+ inode.c \
+ io.c \
+ io64.c \
+ linux.c \
+ mmap.c \
+ pread.c \
+ pread64.c \
+ process.c \
+ psignal.c \
+ pwrite.c \
+ pwrite64.c \
+ raise.c \
+ realpath.c \
+ rename.c \
+ resource.c \
+ sched.c \
+ select.c \
+ seteuid.c \
+ shm_open.c \
+ shm_unlink.c \
+ sig.c \
+ sigaction.c \
+ sigqueue.c \
+ signal.c \
+ siglongjmp.c \
+ sigset.c \
+ sigwait.c \
+ socket.c \
+ sleep.c \
+ stack.c \
+ strsignal.c \
+ sysconf.c \
+ sysctl.c \
+ systat.c \
+ system.c \
+ tcdrain.c \
+ tcsendbrk.c \
+ termios.c \
+ time.c \
+ usleep.c \
+ wait.c
# This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1)
@USE_LIBTOOL_FALSE@lib_a_OBJECTS = brk.o cfspeed.o flockfile.o \
@USE_LIBTOOL_FALSE@funlockfile.o gethostname.o getoptlong.o getreent.o \
@USE_LIBTOOL_FALSE@ids.o inode.o io.o io64.o linux.o mmap.o pread.o \
-@USE_LIBTOOL_FALSE@pread64.o process.o pwrite.o pwrite64.o raise.o \
-@USE_LIBTOOL_FALSE@realpath.o rename.o resource.o sched.o select.o \
-@USE_LIBTOOL_FALSE@seteuid.o shm_open.o shm_unlink.o sig.o sigaction.o \
-@USE_LIBTOOL_FALSE@sigqueue.o signal.o siglongjmp.o sigset.o sigwait.o \
-@USE_LIBTOOL_FALSE@socket.o sleep.o stack.o sysconf.o sysctl.o systat.o \
-@USE_LIBTOOL_FALSE@system.o tcdrain.o tcsendbrk.o termios.o time.o \
-@USE_LIBTOOL_FALSE@usleep.o wait.o
+@USE_LIBTOOL_FALSE@pread64.o process.o psignal.o pwrite.o pwrite64.o \
+@USE_LIBTOOL_FALSE@raise.o realpath.o rename.o resource.o sched.o \
+@USE_LIBTOOL_FALSE@select.o seteuid.o shm_open.o shm_unlink.o sig.o \
+@USE_LIBTOOL_FALSE@sigaction.o sigqueue.o signal.o siglongjmp.o \
+@USE_LIBTOOL_FALSE@sigset.o sigwait.o socket.o sleep.o stack.o \
+@USE_LIBTOOL_FALSE@strsignal.o sysconf.o sysctl.o systat.o system.o \
+@USE_LIBTOOL_FALSE@tcdrain.o tcsendbrk.o termios.o time.o usleep.o \
+@USE_LIBTOOL_FALSE@wait.o
LTLIBRARIES = $(noinst_LTLIBRARIES)
@USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES =
@USE_LIBTOOL_TRUE@liblinux_la_OBJECTS = brk.lo cfspeed.lo flockfile.lo \
@USE_LIBTOOL_TRUE@funlockfile.lo gethostname.lo getoptlong.lo \
@USE_LIBTOOL_TRUE@getreent.lo ids.lo inode.lo io.lo io64.lo linux.lo \
-@USE_LIBTOOL_TRUE@mmap.lo pread.lo pread64.lo process.lo pwrite.lo \
-@USE_LIBTOOL_TRUE@pwrite64.lo raise.lo realpath.lo rename.lo \
+@USE_LIBTOOL_TRUE@mmap.lo pread.lo pread64.lo process.lo psignal.lo \
+@USE_LIBTOOL_TRUE@pwrite.lo pwrite64.lo raise.lo realpath.lo rename.lo \
@USE_LIBTOOL_TRUE@resource.lo sched.lo select.lo seteuid.lo shm_open.lo \
@USE_LIBTOOL_TRUE@shm_unlink.lo sig.lo sigaction.lo sigqueue.lo \
@USE_LIBTOOL_TRUE@signal.lo siglongjmp.lo sigset.lo sigwait.lo \
-@USE_LIBTOOL_TRUE@socket.lo sleep.lo stack.lo sysconf.lo sysctl.lo \
-@USE_LIBTOOL_TRUE@systat.lo system.lo tcdrain.lo tcsendbrk.lo \
+@USE_LIBTOOL_TRUE@socket.lo sleep.lo stack.lo strsignal.lo sysconf.lo \
+@USE_LIBTOOL_TRUE@sysctl.lo systat.lo system.lo tcdrain.lo tcsendbrk.lo \
@USE_LIBTOOL_TRUE@termios.lo time.lo usleep.lo wait.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- /dev/null
+/* libc/sys/linux/psignal.c - print signal message to stderr */
+
+/* Copyright 2002, Red Hat Inc. */
+
+#include <stdio.h>
+#include <string.h>
+
+void
+psignal (int sig, const char *s)
+{
+ if (s != NULL)
+ fprintf (stderr, "%s: %s\n", s, strsignal (sig));
+ else
+ fprintf (stderr, "%s\n", strsignal (sig));
+}
--- /dev/null
+#include <string.h>
+#include <signal.h>
+#include <stdio.h>
+#include <reent.h>
+
+static const char *sigstring[] =
+ {
+ "Signal 0",
+ "Hangup",
+ "Interrupt",
+ "Quit",
+ "Illegal instruction",
+ "Trace/breakpoint trap",
+ "IOT trap",
+ "EMT trap",
+ "Floating point exception",
+ "Killed",
+ "Bus error",
+ "Segmentation fault",
+ "Bad system call",
+ "Broken pipe",
+ "Alarm clock",
+ "Terminated",
+ "Urgent I/O condition",
+ "Stopped (signal)",
+ "Stopped",
+ "Continued",
+ "Child exited",
+ "Stopped (tty input)",
+ "Stopped (tty output)",
+ "I/O possible",
+ "CPU time limit exceeded",
+ "File size limit exceeded",
+ "Virtual timer expired",
+ "Profiling timer expired",
+ "Window changed",
+ "Resource lost",
+ "User defined signal 1",
+ "User defined signal 2"
+ };
+
+char *
+strsignal (int sig)
+{
+ if (sig < 0 || sig >= __SIGRTMIN)
+ {
+ char *buffer;
+ struct _reent *ptr;
+
+ ptr = _REENT;
+
+ _REENT_CHECK_SIGNAL_BUF(ptr);
+ buffer = _REENT_SIGNAL_BUF(ptr);
+
+ if (sig < 0 || sig > __SIGRTMAX)
+ siprintf (buffer, "Unknown signal %d", sig);
+ else
+ siprintf (buffer, "Real-time signal %d", sig - __SIGRTMIN);
+ return buffer;
+ }
+ else
+ return sigstring[sig];
+}
#include <sys/types.h>
#include <linux/dirent.h>
+#define _LIBC
+#include <sys/lock.h>
+#undef _LIBC
#define HAVE_NO_D_NAMLEN /* no struct dirent->d_namlen */
+#define HAVE_DD_LOCK /* have locking mechanism */
#define MAXNAMLEN 255 /* sizeof(struct dirent.d_name)-1 */
char *dd_buf; /* buffer */
int dd_len; /* buffer length */
int dd_size; /* amount of data in buffer */
+ _LOCK_RECURSIVE_T dd_lock;
} DIR;
#include <_ansi.h>
-int _EXFUN(kill, (int, int));
-int _EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
-int _EXFUN(sigaddset, (sigset_t *, const int));
-int _EXFUN(sigdelset, (sigset_t *, const int));
-int _EXFUN(sigismember, (const sigset_t *, int));
-int _EXFUN(sigfillset, (sigset_t *));
-int _EXFUN(sigemptyset, (sigset_t *));
-int _EXFUN(sigpending, (sigset_t *));
-int _EXFUN(sigsuspend, (const sigset_t *));
-int _EXFUN(sigpause, (int));
+int _EXFUN(kill, (int, int));
+_VOID _EXFUN(psignal, (int, const char *));
+int _EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
+int _EXFUN(sigaddset, (sigset_t *, const int));
+int _EXFUN(sigdelset, (sigset_t *, const int));
+int _EXFUN(sigismember, (const sigset_t *, int));
+int _EXFUN(sigfillset, (sigset_t *));
+int _EXFUN(sigemptyset, (sigset_t *));
+int _EXFUN(sigpending, (sigset_t *));
+int _EXFUN(sigsuspend, (const sigset_t *));
+int _EXFUN(sigpause, (int));
#ifndef _POSIX_SOURCE
extern const char *const sys_siglist[];
OSDN Git Service
