===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/checkout.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- src/usr.bin/cvs/checkout.c	2007/09/07 19:36:05	1.100
+++ src/usr.bin/cvs/checkout.c	2007/09/07 23:05:04	1.101
@@ -1,4 +1,4 @@
-/*	$OpenBSD: checkout.c,v 1.100 2007/09/07 19:36:05 tobias Exp $	*/
+/*	$OpenBSD: checkout.c,v 1.101 2007/09/07 23:05:04 joris Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -32,6 +32,7 @@
 static void checkout_check_repository(int, char **);
 static void checkout_repository(const char *, const char *);
 
+extern int print_stdout;
 extern int prune_dirs;
 extern int build_dirs;
 
@@ -74,6 +75,10 @@
 		case 'P':
 			prune_dirs = 1;
 			break;
+		case 'p':
+			print_stdout = 1;
+			cvs_noexec = 1;
+			break;
 		case 'R':
 			break;
 		case 'r':
@@ -151,6 +156,9 @@
 		if (cvs_cmdop == CVS_OP_CHECKOUT && prune_dirs == 1)
 			cvs_client_send_request("Argument -P");
 
+		if (print_stdout == 1)
+			cvs_client_send_request("Argument -p");
+
 		cr.enterdir = NULL;
 		cr.leavedir = NULL;
 		cr.fileproc = cvs_client_sendfile;
@@ -248,13 +256,7 @@
 	    (cvs_server_active) ? "to client" : "to disk");
 
 	if (co_flags & CO_DUMP) {
-		if (cvs_server_active) {
-			cvs_printf("dump file %s to client\n", cf->file_path);
-		} else {
-			rcs_rev_write_fd(cf->file_rcs, rnum,
-			    STDOUT_FILENO, 1);
-		}
-
+		rcs_rev_write_fd(cf->file_rcs, rnum, STDOUT_FILENO, 1);
 		return;
 	}