From owner-p4-projects@FreeBSD.ORG  Sun May  8 20:43:12 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2CA5016A4E8; Sun,  8 May 2005 20:43:12 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0708B16A4E6
	for <perforce@freebsd.org>; Sun,  8 May 2005 20:43:12 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CB67B43D76
	for <perforce@freebsd.org>; Sun,  8 May 2005 20:43:11 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j48KhBm9094648
	for <perforce@freebsd.org>; Sun, 8 May 2005 20:43:11 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j48KhBAS094645
	for perforce@freebsd.org; Sun, 8 May 2005 20:43:11 GMT
	(envelope-from marcel@freebsd.org)
Date: Sun, 8 May 2005 20:43:11 GMT
Message-Id: <200505082043.j48KhBAS094645@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 76710 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 May 2005 20:43:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=76710

Change 76710 by marcel@marcel_nfs on 2005/05/08 20:42:49

	IFC @76707

Affected files ...

.. //depot/projects/tty/lib/libarchive/archive_entry.c#5 integrate
.. //depot/projects/tty/sys/dev/uart/uart_tty.c#7 integrate

Differences ...

==== //depot/projects/tty/lib/libarchive/archive_entry.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.25 2005/03/13 02:53:42 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.26 2005/05/08 19:10:41 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -575,7 +575,8 @@
 	if (entry->ae_symlink.aes_mbs != NULL ||
 	    entry->ae_symlink.aes_wcs != NULL)
 		aes_set_mbs(&entry->ae_symlink, target);
-	aes_set_mbs(&entry->ae_hardlink, target);
+	else
+		aes_set_mbs(&entry->ae_hardlink, target);
 }
 
 void

==== //depot/projects/tty/sys/dev/uart/uart_tty.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.21 2005/01/06 01:43:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.22 2005/05/08 20:25:09 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -76,6 +76,7 @@
 	if (uart_probe(&uart_console))
 		return;
 
+	strlcpy(cp->cn_name, uart_driver_name, sizeof(cp->cn_name));
 	cp->cn_pri = (boothowto & RB_SERIAL) ? CN_REMOTE : CN_NORMAL;
 	cp->cn_arg = &uart_console;
 }