[Midnightbsd-cvs] src [11435] trunk/usr.bin/ar: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jul 7 11:49:54 EDT 2018
Revision: 11435
http://svnweb.midnightbsd.org/src/?rev=11435
Author: laffer1
Date: 2018-07-07 11:49:54 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/usr.bin/ar/Makefile
trunk/usr.bin/ar/acplex.l
trunk/usr.bin/ar/acpyacc.y
trunk/usr.bin/ar/ar.1
trunk/usr.bin/ar/ar.c
trunk/usr.bin/ar/ar.h
trunk/usr.bin/ar/read.c
trunk/usr.bin/ar/util.c
trunk/usr.bin/ar/write.c
Property Changed:
----------------
trunk/usr.bin/ar/acplex.l
trunk/usr.bin/ar/acpyacc.y
trunk/usr.bin/ar/ar.1
Modified: trunk/usr.bin/ar/Makefile
===================================================================
--- trunk/usr.bin/ar/Makefile 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/Makefile 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/ar/Makefile 302001 2016-06-17 22:40:10Z mm $
.include <bsd.own.mk>
Modified: trunk/usr.bin/ar/acplex.l
===================================================================
--- trunk/usr.bin/ar/acplex.l 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/acplex.l 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
%{
/*-
* Copyright (c) 2008 Kai Wang
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ar/acplex.l 250926 2013-05-23 05:42:35Z jkim $");
#include <err.h>
#include <errno.h>
Property changes on: trunk/usr.bin/ar/acplex.l
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/ar/acpyacc.y
===================================================================
--- trunk/usr.bin/ar/acpyacc.y 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/acpyacc.y 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
%{
/*-
* Copyright (c) 2008 Kai Wang
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ar/acpyacc.y 248612 2013-03-22 10:17:42Z mm $");
#include <sys/mman.h>
#include <sys/param.h>
Property changes on: trunk/usr.bin/ar/acpyacc.y
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/ar/ar.1
===================================================================
--- trunk/usr.bin/ar/ar.1 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/ar.1 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -21,7 +22,7 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/ar/ar.1 303295 2016-07-25 14:35:14Z emaste $
.\"
.Dd July 25, 2016
.Dt AR 1
Property changes on: trunk/usr.bin/ar/ar.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/ar/ar.c
===================================================================
--- trunk/usr.bin/ar/ar.c 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/ar.c 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007 Kai Wang
* Copyright (c) 2007 Tim Kientzle
@@ -59,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ar/ar.c 303295 2016-07-25 14:35:14Z emaste $");
#include <sys/queue.h>
#include <sys/types.h>
Modified: trunk/usr.bin/ar/ar.h
===================================================================
--- trunk/usr.bin/ar/ar.h 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/ar.h 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007 Kai Wang
* All rights reserved.
@@ -23,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.bin/ar/ar.h 241827 2012-10-22 02:12:06Z eadler $
*/
#define BSDAR_VERSION "1.1.0"
Modified: trunk/usr.bin/ar/read.c
===================================================================
--- trunk/usr.bin/ar/read.c 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/read.c 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007 Kai Wang
* Copyright (c) 2007 Tim Kientzle
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ar/read.c 283234 2015-05-21 13:30:10Z emaste $");
#include <sys/queue.h>
#include <sys/stat.h>
Modified: trunk/usr.bin/ar/util.c
===================================================================
--- trunk/usr.bin/ar/util.c 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/util.c 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003-2007 Tim Kientzle
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ar/util.c 200462 2009-12-13 03:14:06Z delphij $");
#include <sys/queue.h>
#include <sys/types.h>
Modified: trunk/usr.bin/ar/write.c
===================================================================
--- trunk/usr.bin/ar/write.c 2018-07-07 15:49:09 UTC (rev 11434)
+++ trunk/usr.bin/ar/write.c 2018-07-07 15:49:54 UTC (rev 11435)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2007 Kai Wang
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ar/write.c 321775 2017-07-31 09:28:43Z emaste $");
#include <sys/endian.h>
#include <sys/mman.h>
@@ -581,10 +582,17 @@
static void
write_data(struct bsdar *bsdar, struct archive *a, const void *buf, size_t s)
{
+ ssize_t written;
+
prefault_buffer(buf, s);
- if (archive_write_data(a, buf, s) != (ssize_t)s)
- bsdar_errc(bsdar, EX_SOFTWARE, 0, "%s",
- archive_error_string(a));
+ while (s > 0) {
+ written = archive_write_data(a, buf, s);
+ if (written < 0)
+ bsdar_errc(bsdar, EX_SOFTWARE, 0, "%s",
+ archive_error_string(a));
+ buf = (const char *)buf + written;
+ s -= written;
+ }
}
/*
More information about the Midnightbsd-cvs
mailing list