xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / kern / subr_prf.c

diff --git a/bsd/kern/subr_prf.c b/bsd/kern/subr_prf.c
index 2001154413558fbb2a984958742c46ab11ff813f..8bcf0e3ce021e60ae67c14eca4930022cfc53d02 100644 (file)
--- a/bsd/kern/subr_prf.c
+++ b/bsd/kern/subr_prf.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -210,14 +207,13 @@ tprintf(tpr_t tpr, const char *fmt, ...)
                flags |= TOTTY;
                tp = sess->s_ttyp;
        }
                flags |= TOTTY;
                tp = sess->s_ttyp;
        }

-       if (tp != NULL) {
-               pca.flags = TOTTY;
-               pca.tty   = tp;
-               
-               va_start(ap, fmt);
-               __doprnt(fmt, &ap, putchar, &pca, 10);
-               va_end(ap);
-       }
+       
+       pca.flags = flags;
+       pca.tty   = tp;
+       va_start(ap, fmt);
+       __doprnt(fmt, &ap, putchar, &pca, 10);
+       va_end(ap);
+

        logwakeup();
 }
 
        logwakeup();
 }