Merge branch 'master' into xkb

Conflicts:
	console-client/Makefile

6 files changed, 70 insertions, 15 deletions

diff --git a/libpipe/Makefile b/libpipe/Makefile
index b64166a6..a7625d6c 100644
--- a/libpipe/Makefile
+++ b/libpipe/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libpipe
 # 
-#   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1995, 1996, 2012 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -23,7 +23,6 @@ libname = libpipe
 installhdrs = pipe.h pq.h
 
 SRCS = pq.c dgram.c pipe.c stream.c seqpack.c addr.c pq-funcs.c pipe-funcs.c
-LCLHDRS = pipe.h pq.h
 
 OBJS = $(SRCS:.c=.o)
 HURDLIBS=threads ports
diff --git a/libpipe/dgram.c b/libpipe/dgram.c
index 3f3b2ab6..30695f1e 100644
--- a/libpipe/dgram.c
+++ b/libpipe/dgram.c
@@ -40,8 +40,16 @@ static error_t
 dgram_read (struct packet *packet, int *dequeue, unsigned *flags,
 	    char **data, size_t *data_len, size_t amount)
 {
-  *dequeue = 1;
-  return packet_read (packet, data, data_len, amount);
+  if (flags && *flags & MSG_PEEK)
+    {
+      *dequeue = 0;
+      return packet_peek (packet, data, data_len, amount);
+    }
+  else
+    {
+      *dequeue = 1;
+      return packet_read (packet, data, data_len, amount);
+    }
 }
 
 struct pipe_class _dgram_pipe_class =
diff --git a/libpipe/pq.c b/libpipe/pq.c
index afdda051..102f3ee3 100644
--- a/libpipe/pq.c
+++ b/libpipe/pq.c
@@ -349,13 +349,13 @@ packet_write (struct packet *packet,
   return 0;
 }
 
-/* Removes up to AMOUNT bytes from the beginning of the data in PACKET, and
+/* Remove or peek up to AMOUNT bytes from the beginning of the data in PACKET, and
    puts it into *DATA, and the amount read into DATA_LEN.  If more than the
    original *DATA_LEN bytes are available, new memory is vm_allocated, and
    the address and length of this array put into DATA and DATA_LEN.  */
-error_t
-packet_read (struct packet *packet,
-	     char **data, size_t *data_len, size_t amount)
+static error_t
+packet_fetch (struct packet *packet,
+	     char **data, size_t *data_len, size_t amount, int remove)
 {
   char *start = packet->buf_start;
   char *end = packet->buf_end;
@@ -367,7 +367,7 @@ packet_read (struct packet *packet,
     {
       char *buf = packet->buf;
 
-      if (packet->buf_vm_alloced && amount >= vm_page_size)
+      if (remove && packet->buf_vm_alloced && amount >= vm_page_size)
 	/* We can return memory from BUF directly without copying.  */
 	{
 	  if (buf + vm_page_size <= start)
@@ -414,7 +414,7 @@ packet_read (struct packet *packet,
 	  bcopy (start, *data, amount);
 	  start += amount;
 
-	  if (start - buf > 2 * PACKET_SIZE_LARGE)
+	  if (remove && start - buf > 2 * PACKET_SIZE_LARGE)
 	    /* Get rid of unused space at the beginning of the buffer -- we
 	       know it's vm_alloced because of the size, and this will allow
 	       the buffer to just slide through memory.  Because we wait for
@@ -430,10 +430,33 @@ packet_read (struct packet *packet,
 	      packet->buf_len -= dealloc;
 	    }
 
-	  packet->buf_start = start;
+	  if (remove)
+	    packet->buf_start = start;
 	}
     }
   *data_len = amount;
 
   return 0;
 }
+
+/* Removes up to AMOUNT bytes from the beginning of the data in PACKET, and
+   puts it into *DATA, and the amount read into DATA_LEN.  If more than the
+   original *DATA_LEN bytes are available, new memory is vm_allocated, and
+   the address and length of this array put into DATA and DATA_LEN.  */
+error_t
+packet_read (struct packet *packet,
+	     char **data, size_t *data_len, size_t amount)
+{
+  return packet_fetch (packet, data, data_len, amount, 1);
+}
+
+/* Peek up to AMOUNT bytes from the beginning of the data in PACKET, and
+   puts it into *DATA, and the amount read into DATA_LEN.  If more than the
+   original *DATA_LEN bytes are available, new memory is vm_allocated, and
+   the address and length of this array put into DATA and DATA_LEN.  */
+error_t
+packet_peek (struct packet *packet,
+	     char **data, size_t *data_len, size_t amount)
+{
+  return packet_fetch (packet, data, data_len, amount, 0);
+}
diff --git a/libpipe/pq.h b/libpipe/pq.h
index 0fffe254..4e500b6c 100644
--- a/libpipe/pq.h
+++ b/libpipe/pq.h
@@ -98,6 +98,13 @@ error_t packet_write (struct packet *packet,
 error_t packet_read (struct packet *packet,
 		     char **data, size_t *data_len, size_t amount);
 
+/* Peek up to AMOUNT bytes from the beginning of the data in PACKET, and
+   puts it into *DATA, and the amount read into DATA_LEN.  If more than the
+   original *DATA_LEN bytes are available, new memory is vm_allocated, and
+   the address and length of this array put into DATA and DATA_LEN.  */
+error_t packet_peek (struct packet *packet,
+		     char **data, size_t *data_len, size_t amount);
+
 /* Returns any ports in PACKET in PORTS and NUM_PORTS, and removes them from
    PACKET.  */
 error_t packet_read_ports (struct packet *packet,
diff --git a/libpipe/seqpack.c b/libpipe/seqpack.c
index 44a15a03..041abb74 100644
--- a/libpipe/seqpack.c
+++ b/libpipe/seqpack.c
@@ -43,8 +43,17 @@ static error_t
 seqpack_read (struct packet *packet, int *dequeue, unsigned *flags,
 	      char **data, size_t *data_len, size_t amount)
 {
-  error_t err = packet_read (packet, data, data_len, amount);
-  *dequeue = (packet_readable (packet) == 0);
+  error_t err;
+  if (flags && *flags & MSG_PEEK)
+    {
+      err = packet_peek (packet, data, data_len, amount);
+      *dequeue = 0;
+    }
+  else
+    {
+      err = packet_read (packet, data, data_len, amount);
+      *dequeue = (packet_readable (packet) == 0);
+    }
   return err;
 }
 
diff --git a/libpipe/stream.c b/libpipe/stream.c
index 8eb90435..671907e7 100644
--- a/libpipe/stream.c
+++ b/libpipe/stream.c
@@ -56,8 +56,17 @@ static error_t
 stream_read (struct packet *packet, int *dequeue, unsigned *flags,
 	     char **data, size_t *data_len, size_t amount)
 {
-  error_t err = packet_read (packet, data, data_len, amount);
-  *dequeue = (packet_readable (packet) == 0);
+  error_t err;
+  if (flags && *flags & MSG_PEEK)
+    {
+      err = packet_peek (packet, data, data_len, amount);
+      *dequeue = 0;
+    }
+  else
+    {
+      err = packet_read (packet, data, data_len, amount);
+      *dequeue = (packet_readable (packet) == 0);
+    }
   return err;
 }