Date: Tue, 12 Nov 2002 17:58:19 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21021 for review Message-ID: <200211130158.gAD1wJI4050990@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21021 Change 21021 by peter@peter_daintree on 2002/11/12 17:57:46 IFC @21020 (mostly after kicking the importer re: bluetooth). Affected files ... .. //depot/projects/ia64/bin/echo/echo.c#4 integrate .. //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/sys/bluetooth/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/common/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/common/ng_bluetooth.c#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c.4#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4.4#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4.c#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4_prse.h#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt.4#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt.c#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci.4#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_cmds.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_cmds.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_evnt.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_evnt.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_main.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_misc.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_misc.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_prse.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_ulpi.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_ulpi.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_bluetooth.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_bt3c.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket_hci_raw.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket_l2cap.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_h4.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_hci.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_l2cap.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_ubt.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap.4#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_cmds.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_cmds.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_evnt.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_evnt.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_llpi.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_llpi.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_main.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_misc.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_misc.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_prse.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket.4#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket.c#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_hci_raw.c#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_l2cap.c#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 delete .. //depot/projects/ia64/sys/conf/majors#15 integrate .. //depot/projects/ia64/usr.bin/bluetooth/Makefile#2 delete .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/Makefile#2 delete .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.1#2 delete .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/info.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_control.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_policy.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/node.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/send_recv.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/status.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/util.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.8#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2cap.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.8#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.h#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.8#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.c#2 delete Differences ... ==== //depot/projects/ia64/bin/echo/echo.c#4 (text+ko) ==== @@ -43,10 +43,9 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.13 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); -#include <stdio.h> -#include <stdlib.h> +#include <unistd.h> #include <string.h> /* ARGSUSED */ @@ -64,6 +63,9 @@ nflag = 0; while (argv[0] != NULL) { + size_t len; + + len = strlen(argv[0]); /* * If the next argument is NULL then this is this @@ -71,23 +73,20 @@ * for a trailing \c. */ if (argv[1] == NULL) { - size_t len; - - len = strlen(argv[0]); /* is there room for a '\c' and is there one? */ if (len >= 2 && argv[0][len - 2] == '\\' && argv[0][len - 1] == 'c') { /* chop it and set the no-newline flag. */ - argv[0][len - 2] = '\0'; + len -= 2; nflag = 1; } } - (void)printf("%s", argv[0]); + write(STDOUT_FILENO, argv[0], len); if (*++argv) - putchar(' '); + write(STDOUT_FILENO, " ", 1); } if (!nflag) - putchar('\n'); + write(STDOUT_FILENO, "\n", 1); return 0; } ==== //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#3 (text+ko) ==== @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20020218 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20020101 ==== //depot/projects/ia64/sys/conf/majors#15 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.149 2002/11/13 00:25:01 peter Exp $ +$FreeBSD: src/sys/conf/majors,v 1.150 2002/11/13 01:42:59 peter Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -63,6 +63,7 @@ 43 vn vnode "disk" device (retired) 44 gp GPIB 45 scd Sony CDROM interface +46 - - 47 gsc Genius Scanner 48 cy Cyclades 49 ?? was ssc To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211130158.gAD1wJI4050990>