about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--hurd/alloc-fd.c12
-rw-r--r--hurd/hurdsig.c1
-rw-r--r--stdio/fgets.c2
-rw-r--r--stdio/freopen.c2
-rw-r--r--stdio/getdelim.c3
-rw-r--r--sysdeps/generic/gnu/types.h5
-rw-r--r--sysdeps/mach/hurd/pipestream.c2
-rw-r--r--sysdeps/mach/hurd/readdir_r.c112
-rw-r--r--sysdeps/mach/hurd/wait4.c6
-rw-r--r--sysdeps/posix/pipestream.c16
-rw-r--r--sysdeps/unix/bsd/tcflow.c4
-rw-r--r--sysdeps/unix/bsd/tcflush.c2
13 files changed, 151 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ea8840bf7..fe5251e781 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  8 13:58:31 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* hurd/ports-get.c (_hurd_ports_get): If the requested port is
+	null, don't attempt mach_port_mod_refs.
+
 Mon Oct  7 14:51:52 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
 	* sysdeps/mach/hurd/pipestream.c: New file to avoid use of
diff --git a/hurd/alloc-fd.c b/hurd/alloc-fd.c
index f21d5bb8e1..dc6e64f3b7 100644
--- a/hurd/alloc-fd.c
+++ b/hurd/alloc-fd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1996 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
@@ -97,6 +97,13 @@ _hurd_alloc_fd (int *fd, int first_fd)
 	  else if (size <= first_fd)
 	    size = first_fd + 1;
 
+	  if (size * sizeof (*_hurd_dtable) < size)
+	    {
+	      /* Integer overflow! */
+	      errno = ENOMEM;
+	      goto out;
+	    }
+
 	  /* If we fail to allocate that, decrement the desired size
 	     until we succeed in allocating it.  */
 	  do
@@ -117,6 +124,8 @@ _hurd_alloc_fd (int *fd, int first_fd)
 	      /* Go back to the loop to initialize the first new slot.  */
 	      goto search;
 	    }
+	  else
+	    errno = ENOMEM;
 	}
       else
 	errno = EMFILE;
@@ -124,6 +133,7 @@ _hurd_alloc_fd (int *fd, int first_fd)
   else
     errno = EINVAL;		/* Bogus FIRST_FD value.  */
 
+ out:
   __mutex_unlock (&_hurd_dtable_lock);
   _hurd_critical_section_unlock (crit);
 
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 1da3fa580d..1f58d13436 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -1024,6 +1024,7 @@ signal_allowed (int signo, mach_port_t refport)
     case SIGINFO:
     case SIGTTIN:
     case SIGTTOU:
+    case SIGWINCH:
       /* Job control signals can be sent by the controlling terminal.  */
       if (__USEPORT (CTTYID, port == refport))
 	goto win;
diff --git a/stdio/fgets.c b/stdio/fgets.c
index 01d4d9d095..4526c704c3 100644
--- a/stdio/fgets.c
+++ b/stdio/fgets.c
@@ -101,7 +101,7 @@ fgets (s, n, stream)
       if (i > n)
 	i = n;
 
-      found = (char *) __memccpy ((PTR) p, stream->__bufp, '\n', i);
+      found = (char *) __memccpy ((void *) p, stream->__bufp, '\n', i);
 
       if (found != NULL)
 	{
diff --git a/stdio/freopen.c b/stdio/freopen.c
index a21d725c17..cfb72bb745 100644
--- a/stdio/freopen.c
+++ b/stdio/freopen.c
@@ -25,7 +25,7 @@ extern int __getmode __P ((const char *, __io_mode *));
 
 /* Defined in sysd-stdio.c.  */
 extern int __stdio_reopen __P ((const char *filename, __io_mode mode,
-				PTR *cookieptr, __io_close_fn closefn));
+				void *cookieptr, __io_close_fn closefn));
 
 /* Replace STREAM, opening it on FILENAME.  */
 FILE *
diff --git a/stdio/getdelim.c b/stdio/getdelim.c
index 761c7980c1..0a6e561ae6 100644
--- a/stdio/getdelim.c
+++ b/stdio/getdelim.c
@@ -135,7 +135,8 @@ __getdelim (lineptr, n, terminator, stream)
 	  if (i > copy)
 	    i = copy;
 
-	  found = (char *) __memccpy ((PTR) p, stream->__bufp, terminator, i);
+	  found = (char *) __memccpy ((void *) p, stream->__bufp, 
+				      terminator, i);
 	  if (found != NULL)
 	    {
 	      stream->__bufp += found - p;
diff --git a/sysdeps/generic/gnu/types.h b/sysdeps/generic/gnu/types.h
index f42fb7f544..8b58d92afb 100644
--- a/sysdeps/generic/gnu/types.h
+++ b/sysdeps/generic/gnu/types.h
@@ -47,6 +47,7 @@ typedef unsigned int __ino_t;	/* Type of file serial numbers.  */
 typedef unsigned int __mode_t;	/* Type of file attribute bitmasks.  */
 typedef unsigned short int __nlink_t; /* Type of file link counts.  */
 typedef long int __off_t;	/* Type of file sizes and offsets.  */
+typedef __quad_t __loff_t;	/* Type of file sizes and offsets.  */
 typedef int __pid_t;		/* Type of process identifications.  */
 typedef int __ssize_t;		/* Type of a byte count, or error.  */
 typedef __u_quad_t __fsid_t;	/* Type of file system IDs.  */
@@ -84,8 +85,4 @@ typedef unsigned long __fd_mask;
 #define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
 #define	__FD_ISSET(d, set)	((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
 
-#ifdef __USE_SVID
-typedef long int key_t;
-#endif
-
 #endif /* gnu/types.h */
diff --git a/sysdeps/mach/hurd/pipestream.c b/sysdeps/mach/hurd/pipestream.c
new file mode 100644
index 0000000000..548e1e77eb
--- /dev/null
+++ b/sysdeps/mach/hurd/pipestream.c
@@ -0,0 +1,2 @@
+/* Make sure NO_WAITPID is not set; sysdeps/unix/pipestream.c defines it. */
+#include <sysdeps/posix/pipestream.c>
diff --git a/sysdeps/mach/hurd/readdir_r.c b/sysdeps/mach/hurd/readdir_r.c
new file mode 100644
index 0000000000..0a99da17d2
--- /dev/null
+++ b/sysdeps/mach/hurd/readdir_r.c
@@ -0,0 +1,112 @@
+/* Copyright (C) 1993, 1994, 1995, 1996 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., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#include <errno.h>
+#include <limits.h>
+#include <stddef.h>
+#include <string.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <hurd.h>
+#include <hurd/fd.h>
+#include "dirstream.h"
+
+
+/* Read a directory entry from DIRP.  */
+int
+__readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
+{
+  struct dirent *dp;
+
+  if (dirp == NULL)
+    {
+      errno = EINVAL;
+      return -1;
+    }
+
+  __libc_lock_lock (dirp->__lock);
+
+  do
+    {
+      if (dirp->__ptr - dirp->__data >= dirp->__size)
+	{
+	  /* We've emptied out our buffer.  Refill it.  */
+
+	  char *data = dirp->__data;
+	  int nentries;
+	  error_t err;
+
+	  if (err = HURD_FD_PORT_USE (dirp->__fd,
+				      __dir_readdir (port,
+						     &data, &dirp->__size,
+						     dirp->__entry_ptr,
+						     -1, 0, &nentries)))
+	    {
+	      __hurd_fail (err);
+	      dp = NULL;
+	      break;
+	    }
+
+	  /* DATA now corresponds to entry index DIRP->__entry_ptr.  */
+	  dirp->__entry_data = dirp->__entry_ptr;
+
+	  if (data != dirp->__data)
+	    {
+	      /* The data was passed out of line, so our old buffer is no
+		 longer useful.  Deallocate the old buffer and reset our
+		 information for the new buffer.  */
+	      __vm_deallocate (__mach_task_self (),
+			       (vm_address_t) dirp->__data,
+			       dirp->__allocation);
+	      dirp->__data = data;
+	      dirp->__allocation = round_page (dirp->__size);
+	    }
+
+	  /* Reset the pointer into the buffer.  */
+	  dirp->__ptr = dirp->__data;
+
+	  if (nentries == 0)
+	    {
+	      /* End of file.  */
+	      dp = NULL;
+	      break;
+	    }
+
+	  /* We trust the filesystem to return correct data and so we
+	     ignore NENTRIES.  */
+	}
+
+      dp = (struct dirent *) dirp->__ptr;
+      dirp->__ptr += dp->d_reclen;
+      ++dirp->__entry_ptr;
+
+      /* Loop to ignore deleted files.  */
+    } while (dp->d_fileno == 0);
+
+  if (dp)
+    {
+      *entry = *dp;
+      *result = entry;
+    }
+
+  __libc_lock_unlock (dirp->__lock);
+
+  return dp ? 0 : -1;
+}
+weak_alias (__readdir_r, readdir_r)
diff --git a/sysdeps/mach/hurd/wait4.c b/sysdeps/mach/hurd/wait4.c
index 83eba88e6d..9dfbc550bf 100644
--- a/sysdeps/mach/hurd/wait4.c
+++ b/sysdeps/mach/hurd/wait4.c
@@ -31,8 +31,10 @@ __wait4 (pid_t pid, __WAIT_STATUS_DEFN stat_loc,
   error_t err;
   struct rusage ignored;
   natural_t sigcode;
-
-  err = __USEPORT (PROC, __proc_wait (port, pid, options, stat_loc, &sigcode,
+  int dummy;
+  
+  err = __USEPORT (PROC, __proc_wait (port, pid, options, 
+				      stat_loc ?: &dummy, &sigcode,
 				      usage ?: &ignored, &dead));
 
   return err ? (pid_t) __hurd_fail (err) : dead;
diff --git a/sysdeps/posix/pipestream.c b/sysdeps/posix/pipestream.c
index 539bf43302..d954f1412c 100644
--- a/sysdeps/posix/pipestream.c
+++ b/sysdeps/posix/pipestream.c
@@ -42,7 +42,7 @@ struct child
    original function with the original cookie.  */
 
 #define FUNC(type, name, args)						      \
-  static type __CONCAT(child_,name) args __CONCAT(name,decl))		      \
+  static type __CONCAT(child_,name) args __CONCAT(name,decl)		      \
   {									      \
     struct child *c = (struct child *) cookie;				      \
     {									      \
@@ -51,15 +51,15 @@ struct child
     }									      \
   }
 
-#define readdecl void *cookie AND register char *buf AND register size_t n
+#define readdecl void *cookie; register char *buf; register size_t n;
 FUNC (int, read, (cookie, buf, n))
-#define writedecl void *cookie AND register const char *buf AND register size_t n
+#define writedecl void *cookie; register const char *buf; register size_t n;
 FUNC (int, write, (cookie, buf, n))
-#define seekdecl void *cookie AND fpos_t *pos AND int whence
+#define seekdecl void *cookie; fpos_t *pos; int whence;
 FUNC (int, seek, (cookie, pos, whence))
-#define closedecl void *cookie
+#define closedecl void *cookie;
 FUNC (int, close, (cookie))
-#define filenodecl void *cookie
+#define filenodecl void *cookie;
 FUNC (int, fileno, (cookie))
 
 static const __io_functions child_funcs
@@ -116,7 +116,7 @@ popen (command, mode)
       new_argv[1] = "-c";
       new_argv[2] = command;
       new_argv[3] = NULL;
-      (void) execve (SH_PATH, (char *CONST *) new_argv, environ);
+      (void) execve (SH_PATH, (char *const *) new_argv, environ);
       /* Die if it failed.  */
       _exit (127);
     }
@@ -156,7 +156,7 @@ popen (command, mode)
   child->pid = pid;
   child->cookie = stream->__cookie;
   child->funcs = stream->__io_funcs;
-  stream->__cookie = (PTR) child;
+  stream->__cookie = (void *) child;
   stream->__io_funcs = child_funcs;
   stream->__ispipe = 1;
   return stream;
diff --git a/sysdeps/unix/bsd/tcflow.c b/sysdeps/unix/bsd/tcflow.c
index 1919d6d9ea..04895a0648 100644
--- a/sysdeps/unix/bsd/tcflow.c
+++ b/sysdeps/unix/bsd/tcflow.c
@@ -32,9 +32,9 @@ tcflow (fd, action)
   switch (action)
     {
     case TCOOFF:
-      return __ioctl (fd, TIOCSTOP, (PTR) NULL);
+      return __ioctl (fd, TIOCSTOP, (void *) NULL);
     case TCOON:
-      return __ioctl (fd, TIOCSTART, (PTR) NULL);
+      return __ioctl (fd, TIOCSTART, (void *) NULL);
 
     case TCIOFF:
     case TCION:
diff --git a/sysdeps/unix/bsd/tcflush.c b/sysdeps/unix/bsd/tcflush.c
index 14f7db8dad..9806aaf435 100644
--- a/sysdeps/unix/bsd/tcflush.c
+++ b/sysdeps/unix/bsd/tcflush.c
@@ -47,5 +47,5 @@ tcflush (fd, queue_selector)
       return -1;
     }
 
-  return __ioctl (fd, TIOCFLUSH, (PTR) &arg);
+  return __ioctl (fd, TIOCFLUSH, (void *) &arg);
 }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-01 11:59:14 +0000