Date: Sun, 8 May 2005 20:43:11 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76710 for review Message-ID: <200505082043.j48KhBAS094645@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505082043.j48KhBAS094645>