Module Name: src
Committed By: yamt
Date: Thu May 22 15:45:47 UTC 2014
Modified Files:
src/external/bsd/libarchive/dist/libarchive [yamt-pagecache]:
archive_entry.3 archive_read.3 archive_read_disk.3 archive_util.3
archive_write.3 archive_write_disk.3
archive_write_set_format_shar.c libarchive.3 libarchive_internals.3
tar.5
src/external/bsd/libarchive/dist/libarchive_fe [yamt-pagecache]: err.c
err.h
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.6.1 \
src/external/bsd/libarchive/dist/libarchive/archive_entry.3 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3
cvs rdiff -u -r1.4 -r1.4.6.1 \
src/external/bsd/libarchive/dist/libarchive/archive_read.3
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
src/external/bsd/libarchive/dist/libarchive/archive_util.3 \
src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c
\
src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3 \
src/external/bsd/libarchive/dist/libarchive/tar.5
cvs rdiff -u -r1.3 -r1.3.6.1 \
src/external/bsd/libarchive/dist/libarchive/archive_write.3 \
src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
src/external/bsd/libarchive/dist/libarchive/libarchive.3
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
src/external/bsd/libarchive/dist/libarchive_fe/err.c \
src/external/bsd/libarchive/dist/libarchive_fe/err.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive_entry.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.2 src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.2.6.1
--- src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.2 Thu Dec 16 17:42:25 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_entry.3 Thu May 22 15:45:47 2014
@@ -429,5 +429,5 @@ library first appeared in
The
.Nm libarchive
library was written by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
.\" .Sh BUGS
Index: src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3:1.2 src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3:1.2.6.1
--- src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3:1.2 Sat Feb 20 02:51:33 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3 Thu May 22 15:45:47 2014
@@ -270,7 +270,7 @@ and first appeared in
The
.Nm libarchive
library was written by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
.Sh BUGS
The
.Dq standard
Index: src/external/bsd/libarchive/dist/libarchive/archive_read.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read.3:1.4 src/external/bsd/libarchive/dist/libarchive/archive_read.3:1.4.6.1
--- src/external/bsd/libarchive/dist/libarchive/archive_read.3:1.4 Wed Jul 14 22:13:58 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_read.3 Thu May 22 15:45:47 2014
@@ -694,7 +694,7 @@ library first appeared in
The
.Nm libarchive
library was written by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
.Sh BUGS
Many traditional archiver programs treat
empty files as valid empty archives.
Index: src/external/bsd/libarchive/dist/libarchive/archive_util.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_util.3:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/archive_util.3:1.1.1.2.6.1
--- src/external/bsd/libarchive/dist/libarchive/archive_util.3:1.1.1.2 Sat Feb 20 02:48:43 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_util.3 Thu May 22 15:45:47 2014
@@ -157,4 +157,4 @@ library first appeared in
The
.Nm libarchive
library was written by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
Index: src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c:1.1.1.2.6.1
--- src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c:1.1.1.2 Sat Feb 20 02:48:40 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c Thu May 22 15:45:47 2014
@@ -409,7 +409,7 @@ uuencode_group(const char _in[3], char o
static void
uuencode_line(struct shar *shar, const char *inbuf, size_t len)
{
- char tmp_buf[3], *buf;
+ char *buf;
size_t alloc_len;
/* len <= 45 -> expanded to 60 + len byte + new line */
@@ -426,13 +426,15 @@ uuencode_line(struct shar *shar, const c
buf += 4;
}
if (len != 0) {
+ char tmp_buf[3];
+
tmp_buf[0] = inbuf[0];
if (len == 1)
tmp_buf[1] = '\0';
else
tmp_buf[1] = inbuf[1];
tmp_buf[2] = '\0';
- uuencode_group(inbuf, buf);
+ uuencode_group(tmp_buf, buf);
buf += 4;
}
*buf++ = '\n';
Index: src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3
diff -u src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3:1.1.1.2.6.1
--- src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3:1.1.1.2 Wed Jul 14 22:11:07 2010
+++ src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3 Thu May 22 15:45:47 2014
@@ -362,4 +362,4 @@ library first appeared in
The
.Nm libarchive
library was written by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
Index: src/external/bsd/libarchive/dist/libarchive/tar.5
diff -u src/external/bsd/libarchive/dist/libarchive/tar.5:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/tar.5:1.1.1.2.6.1
--- src/external/bsd/libarchive/dist/libarchive/tar.5:1.1.1.2 Sat Feb 20 02:48:45 2010
+++ src/external/bsd/libarchive/dist/libarchive/tar.5 Thu May 22 15:45:47 2014
@@ -828,4 +828,4 @@ This documentation was written as part o
and
.Nm bsdtar
project by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
Index: src/external/bsd/libarchive/dist/libarchive/archive_write.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_write.3:1.3 src/external/bsd/libarchive/dist/libarchive/archive_write.3:1.3.6.1
--- src/external/bsd/libarchive/dist/libarchive/archive_write.3:1.3 Sat Feb 20 02:51:33 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_write.3 Thu May 22 15:45:47 2014
@@ -595,7 +595,7 @@ library first appeared in
The
.Nm libarchive
library was written by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
.Sh BUGS
There are many peculiar bugs in historic tar implementations that may cause
certain programs to reject archives written by this library.
Index: src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3:1.3 src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3:1.3.6.1
--- src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3:1.3 Sat Feb 20 02:51:33 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3 Thu May 22 15:45:47 2014
@@ -301,7 +301,7 @@ and first appeared in
The
.Nm libarchive
library was written by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
.Sh BUGS
Directories are actually extracted in two distinct phases.
Directories are created during
Index: src/external/bsd/libarchive/dist/libarchive/libarchive.3
diff -u src/external/bsd/libarchive/dist/libarchive/libarchive.3:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/libarchive.3:1.1.1.1.2.1
--- src/external/bsd/libarchive/dist/libarchive/libarchive.3:1.1.1.1 Fri Sep 19 21:56:14 2008
+++ src/external/bsd/libarchive/dist/libarchive/libarchive.3 Thu May 22 15:45:47 2014
@@ -314,7 +314,7 @@ library first appeared in
The
.Nm libarchive
library was written by
-.An Tim Kientzle Aq [email protected] .
+.An Tim Kientzle Aq Mt [email protected] .
.Sh BUGS
Some archive formats support information that is not supported by
.Tn struct archive_entry .
Index: src/external/bsd/libarchive/dist/libarchive_fe/err.c
diff -u src/external/bsd/libarchive/dist/libarchive_fe/err.c:1.1.1.1 src/external/bsd/libarchive/dist/libarchive_fe/err.c:1.1.1.1.6.1
--- src/external/bsd/libarchive/dist/libarchive_fe/err.c:1.1.1.1 Sat Feb 20 02:49:07 2010
+++ src/external/bsd/libarchive/dist/libarchive_fe/err.c Thu May 22 15:45:47 2014
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
const char *lafe_progname;
-static void
+static __printflike(2, 0) void
lafe_vwarnc(int code, const char *fmt, va_list ap)
{
fprintf(stderr, "%s: ", lafe_progname);
Index: src/external/bsd/libarchive/dist/libarchive_fe/err.h
diff -u src/external/bsd/libarchive/dist/libarchive_fe/err.h:1.1.1.1 src/external/bsd/libarchive/dist/libarchive_fe/err.h:1.1.1.1.6.1
--- src/external/bsd/libarchive/dist/libarchive_fe/err.h:1.1.1.1 Sat Feb 20 02:49:07 2010
+++ src/external/bsd/libarchive/dist/libarchive_fe/err.h Thu May 22 15:45:47 2014
@@ -35,7 +35,8 @@
extern const char *lafe_progname;
-void lafe_warnc(int code, const char *fmt, ...);
-void lafe_errc(int eval, int code, const char *fmt, ...) __LA_DEAD;
+void lafe_warnc(int code, const char *fmt, ...) __printflike(2, 3);
+void lafe_errc(int eval, int code, const char *fmt, ...)
+ __LA_DEAD __printflike(3, 4);
#endif
