svn commit: r318606 - head/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Mon May 22 03:01:35 2017
New Revision: 318606
URL: https://svnweb.freebsd.org/changeset/base/318606

Log:
  Refactor & compact struct i6addr_t #ifdef: remove redundant structure
  definintion when USE_INET6 is false.
  
  MFC after:1 week

Modified:
  head/sys/contrib/ipfilter/netinet/ip_fil.h

Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h
==
--- head/sys/contrib/ipfilter/netinet/ip_fil.h  Mon May 22 02:30:15 2017
(r318605)
+++ head/sys/contrib/ipfilter/netinet/ip_fil.h  Mon May 22 03:01:35 2017
(r318606)
@@ -143,11 +143,12 @@ typedef   int (* lookupfunc_t) __P((struct
  * i6addr is used as a container for both IPv4 and IPv6 addresses, as well
  * as other types of objects, depending on its qualifier.
  */
-#ifdef USE_INET6
 typedefunion   i6addr  {
u_32_t  i6[4];
struct  in_addr in4;
+#ifdef USE_INET6
struct  in6_addr in6;
+#endif
void*vptr[2];
lookupfunc_tlptr[2];
struct {
@@ -156,19 +157,6 @@ typedefunion   i6addr  {
int name;
} i6un;
 } i6addr_t;
-#else
-typedefunion   i6addr  {
-   u_32_t  i6[4];
-   struct  in_addr in4;
-   void*vptr[2];
-   lookupfunc_tlptr[2];
-   struct {
-   u_short type;
-   u_short subtype;
-   int name;
-   } i6un;
-} i6addr_t;
-#endif
 
 #define in4_addr   in4.s_addr
 #defineiplookupnum i6[1]
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318603 - head/contrib/elftoolchain/nm

[Ed Maste]

Author: emaste
Date: Mon May 22 01:10:12 2017
New Revision: 318603
URL: https://svnweb.freebsd.org/changeset/base/318603

Log:
  nm: document 'r' symbol type
  
  PR:   219245
  MFC after:3 days
  Sponsored by: The FreeBSD Foundation

Modified:
  head/contrib/elftoolchain/nm/nm.1

Modified: head/contrib/elftoolchain/nm/nm.1
==
--- head/contrib/elftoolchain/nm/nm.1   Sun May 21 23:55:58 2017
(r318602)
+++ head/contrib/elftoolchain/nm/nm.1   Mon May 22 01:10:12 2017
(r318603)
@@ -24,7 +24,7 @@
 .\"
 .\" $Id: nm.1 3195 2015-05-12 17:22:19Z emaste $
 .\"
-.Dd February 15, 2015
+.Dd May 21, 2017
 .Os
 .Dt NM 1
 .Sh NAME
@@ -304,6 +304,8 @@ A local
 (uninitialized data) symbol.
 .It d
 A local data symbol.
+.It r
+A local read-only data symbol.
 .It t
 A local text symbol.
 .It v
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318602 - head/sys/mips/atheros

[Adrian Chadd]

Author: adrian
Date: Sun May 21 23:55:58 2017
New Revision: 318602
URL: https://svnweb.freebsd.org/changeset/base/318602

Log:
  [ar71xx] fix up dump space a la what jhb@ did elsewhere a while ago.

Modified:
  head/sys/mips/atheros/ar71xx_machdep.c

Modified: head/sys/mips/atheros/ar71xx_machdep.c
==
--- head/sys/mips/atheros/ar71xx_machdep.c  Sun May 21 23:15:32 2017
(r318601)
+++ head/sys/mips/atheros/ar71xx_machdep.c  Sun May 21 23:55:58 2017
(r318602)
@@ -383,8 +383,8 @@ platform_start(__register_t a0 __unused,
phys_avail[0] = MIPS_KSEG0_TO_PHYS(kernel_kseg0_end);
phys_avail[1] = ctob(realmem);
 
-   dump_avail[0] = phys_avail[0];
-   dump_avail[1] = phys_avail[1] - phys_avail[0];
+   dump_avail[0] = 0;
+   dump_avail[1] = phys_avail[1];
 
physmem = realmem;
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318601 - in head: contrib/compiler-rt/lib/builtins lib/libcompiler_rt

[Adrian Chadd]

Author: adrian
Date: Sun May 21 23:15:32 2017
New Revision: 318601
URL: https://svnweb.freebsd.org/changeset/base/318601

Log:
  [libcompiler-rt] add bswapdi2/bswapsi2
  
  This is required for mips gcc 6.3 userland to build/run.
  
  Reviewed by:  emaste, dim
  Approved by:  emaste
  Differential Revision:https://reviews.freebsd.org/D10838

Added:
  head/contrib/compiler-rt/lib/builtins/bswapdi2.c   (contents, props changed)
  head/contrib/compiler-rt/lib/builtins/bswapsi2.c   (contents, props changed)
Modified:
  head/contrib/compiler-rt/lib/builtins/README.txt
  head/lib/libcompiler_rt/Makefile.inc

Modified: head/contrib/compiler-rt/lib/builtins/README.txt
==
--- head/contrib/compiler-rt/lib/builtins/README.txtSun May 21 22:28:28 
2017(r318600)
+++ head/contrib/compiler-rt/lib/builtins/README.txtSun May 21 23:15:32 
2017(r318601)
@@ -57,8 +57,8 @@ si_int __popcountsi2(si_int a);  // bit 
 si_int __popcountdi2(di_int a);  // bit population
 si_int __popcountti2(ti_int a);  // bit population
 
-uint32_t __bswapsi2(uint32_t a);   // a byteswapped, arm only
-uint64_t __bswapdi2(uint64_t a);   // a byteswapped, arm only
+uint32_t __bswapsi2(uint32_t a);   // a byteswapped, arm/mips only
+uint64_t __bswapdi2(uint64_t a);   // a byteswapped, arm/mips only
 
 // Integral arithmetic
 

Added: head/contrib/compiler-rt/lib/builtins/bswapdi2.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/compiler-rt/lib/builtins/bswapdi2.cSun May 21 23:15:32 
2017(r318601)
@@ -0,0 +1,28 @@
+/* ===-- bswapdi2.c - Implement __bswapdi2 -===
+ *
+ *   The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===--===
+ *
+ * This file implements __bswapdi2 for the compiler_rt library.
+ *
+ * ===--===
+ */
+
+#include "int_lib.h"
+
+COMPILER_RT_ABI uint64_t
+__bswapdi2 (uint64_t u)
+{
+   return u) & 0xff00ULL) >> 56)
+   | (((u) & 0x00ffULL) >> 40)
+   | (((u) & 0xff00ULL) >> 24)
+   | (((u) & 0x00ffULL) >>  8)
+   | (((u) & 0xff00ULL) <<  8)
+   | (((u) & 0x00ffULL) << 24)
+   | (((u) & 0xff00ULL) << 40)
+   | (((u) & 0x00ffULL) << 56));
+}

Added: head/contrib/compiler-rt/lib/builtins/bswapsi2.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/compiler-rt/lib/builtins/bswapsi2.cSun May 21 23:15:32 
2017(r318601)
@@ -0,0 +1,25 @@
+/* ===-- bswapsi2.c - Implement __bswapsi2 -===
+ *
+ *   The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===--===
+ *
+ * This file implements __bswapsi2 for the compiler_rt library.
+ *
+ * ===--===
+ */
+
+#include "int_lib.h"
+
+COMPILER_RT_ABI uint32_t
+__bswapsi2 (uint32_t u)
+{
+
+   return u) & 0xff00) >> 24)
+   | (((u) & 0x00ff) >>  8)
+   | (((u) & 0xff00) <<  8)
+   | (((u) & 0x00ff) << 24));
+}

Modified: head/lib/libcompiler_rt/Makefile.inc
==
--- head/lib/libcompiler_rt/Makefile.incSun May 21 22:28:28 2017
(r318600)
+++ head/lib/libcompiler_rt/Makefile.incSun May 21 23:15:32 2017
(r318601)
@@ -224,3 +224,10 @@ SRCS+= switch8.S
 SRCS+= switchu8.S
 SRCS+= sync_synchronize.S
 .endif
+
+# GCC-6.3 on mips32 requires bswap32 built-in.
+.if ${MACHINE_CPUARCH} == "mips"
+SRCS+= bswapdi2.c
+SRCS+= bswapsi2.c
+.endif
+
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318600 - head/usr.bin/catman

[Baptiste Daroussin]

Author: bapt
Date: Sun May 21 22:28:28 2017
New Revision: 318600
URL: https://svnweb.freebsd.org/changeset/base/318600

Log:
  Make catman(1) use mandoc(1) by default
  
  catman(1) checks if mandoc(1) do support the manpage before trying to generate
  the catpage and falls back on nroff, using the same mechanism as man(1).

Modified:
  head/usr.bin/catman/catman.1
  head/usr.bin/catman/catman.c

Modified: head/usr.bin/catman/catman.1
==
--- head/usr.bin/catman/catman.1Sun May 21 22:10:08 2017
(r318599)
+++ head/usr.bin/catman/catman.1Sun May 21 22:28:28 2017
(r318600)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 3, 2005
+.Dd May 22, 2017
 .Dt CATMAN 1
 .Os
 .Sh NAME
@@ -40,6 +40,8 @@ The
 utility preformats all the man pages in
 .Ar directories
 using the
+.Nm mandoc
+command when supported, falling back on the
 .Nm nroff Fl man
 command.
 Directories may be separated by colons instead of spaces.
@@ -99,6 +101,7 @@ environment variable is not set.
 .Sh SEE ALSO
 .Xr makewhatis 1 ,
 .Xr man 1 ,
+.Xr mandoc 1 ,
 .Xr nroff 1
 .Sh HISTORY
 A previous version of the

Modified: head/usr.bin/catman/catman.c
==
--- head/usr.bin/catman/catman.cSun May 21 22:10:08 2017
(r318599)
+++ head/usr.bin/catman/catman.cSun May 21 22:28:28 2017
(r318600)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -70,6 +71,8 @@ static char *lang_locale; /* short form 
 static const char *machine, *machine_arch;
 static int exit_code;  /* exit code to use when finished */
 
+extern char **environ;
+
 /*
  * -T argument for nroff
  */
@@ -93,6 +96,7 @@ static const char *locale_device[] = {
 #defineGZCAT_CMD   "z"
 enum Ziptype {NONE, BZIP, GZIP};
 
+static bool mandoc_locales = false;
 static uid_t uid;
 static int starting_dir;
 static char tmp_file[MAXPATHLEN];
@@ -438,11 +442,24 @@ process_page(char *mandir, char *src, ch
}
snprintf(tmp_file, sizeof tmp_file, "%s.tmp", cat);
snprintf(cmd, sizeof cmd,
-   "%scat %s | tbl | nroff -c -T%s -man | %s > %s.tmp",
+   "%scat %s | mandoc -Tlint -Wunsupp 2>/dev/null",
zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
-   src, nroff_device,
-   zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",
-   cat);
+   src);
+   if (system(cmd) == 0) {
+   snprintf(cmd, sizeof cmd,
+   "%scat %s | mandoc -T%s | %s > %s.tmp",
+   zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : 
"",
+   src, mandoc_locales ? "locale" : "ascii",
+   zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",
+   cat);
+   } else {
+   snprintf(cmd, sizeof cmd,
+   "%scat %s | tbl | nroff -c -T%s -man | %s > %s.tmp",
+   zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : 
"",
+   src, nroff_device,
+   zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",
+   cat);
+   }
if (system(cmd) != 0)
err(1, "formatting pipeline");
if (rename(tmp_file, cat) < 0)
@@ -771,6 +788,7 @@ main(int argc, char **argv)
break;
case 'L':
determine_locale();
+   mandoc_locales = true;
break;
case 'n':
pretend++;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318599 - head/usr.sbin/efivar

[Benjamin Kaduk]

Author: bjk (doc committer)
Date: Sun May 21 22:10:08 2017
New Revision: 318599
URL: https://svnweb.freebsd.org/changeset/base/318599

Log:
  Updates for efivar.8
  
  Fix spelling [1], appease igor and mandoc -Tlint, and adopt the
  language style to be more consistent with our corpus.
  
  PR:   219434 [1]
  Submitted by: olgeni [1]

Modified:
  head/usr.sbin/efivar/efivar.8

Modified: head/usr.sbin/efivar/efivar.8
==
--- head/usr.sbin/efivar/efivar.8   Sun May 21 21:33:15 2017
(r318598)
+++ head/usr.sbin/efivar/efivar.8   Sun May 21 22:10:08 2017
(r318599)
@@ -24,12 +24,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 4, 2017
+.Dd May 21, 2017
 .Dt EFIVAR 8
 .Os
 .Sh NAME
 .Nm efivar
-.Nd UEFI environemnt variable interaction
+.Nd UEFI environment variable interaction
 .Sh SYNOPSIS
 .Nm
 .Op Fl abdDHlLNpRtw
@@ -58,7 +58,7 @@ This program manages
 .Pq UEFI
 environment variables.
 UEFI variables have three part: A namespace, a name and a value.
-The namespace is a GUID that's self assigned by the group defining the
+The namespace is a GUID that is self assigned by the group defining the
 variables.
 The name is a Unicode name for the variable.
 The value is binary data.
@@ -70,7 +70,7 @@ The following options are available:
 Specify the name of the variable to operate on.
 The
 .Ar name
-argument is the GUID of variable, followed by a dash, followed by the
+argument is the GUID of the variable, followed by a dash, followed by the
 UEFI variable name.
 The GUID may be in numeric format, or may be one of the well known
 symbolic name (see
@@ -86,19 +86,19 @@ This flag implies
 unless the
 .Fl -append
 flag is given.
-This is not well understood and currently unimplemented.
+This behavior is not well understood and is currently unimplemented.
 .It Fl a Fl -append
 Append the specified value to the UEFI variable rather than replacing
-it.p
+it.
 .It Fl t Ar attr Fl -attributes Ar attr
-Specify, in user hostile hexidecimal, the attributes for this
+Specify, in hexadecimal, the attributes for this
 variable.
 See section 7.2 (GetVariable subsection, Related Definitions) of the
 UEFI Specification for hex values to use.
 .It Fl A Fl -ascii
 Display the variable data as modified ascii: All printable characters
 are printed, while unprintable characters are rendered as a two-digit
-hexadecimal number preceeded by a % character.
+hexadecimal number preceded by a % character.
 .It Fl b Fl -binary
 Display the variable data as binary data.
 Usually will be used with the
@@ -155,29 +155,27 @@ can be used to specify simple strings.
 Display the
 .Ar name
 environment variable.
+.El
 .Sh COMPATIBILITY
 The
 .Nm
-program is intended to be compatible (strict superset) with a progam
-of the same name included in the Red Hat libefivar package.
-.Pp
-Except the
+program is intended to be compatible (strict superset) with a program
+of the same name included in the Red Hat libefivar package,
+but the
 .Fl d
 and
 .Fl -print-decimal
-flags are not implmenented and never will be.
+flags are not implemented and never will be.
+.Pp
 The
 .Fl d
-flag is a short-hand for
+flag is short for
 .Fl -device-path .
 .Sh SEE ALSO
 Appendix A of the UEFI specification has the format for GUIDs.
 All GUIDs
 .Dq Globally Unique Identifiers
 have the format described in RFC 4122.
-.El
-.Pp
-.Xr efivar 8
 .Sh HISTORY
 The
 .Nm
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318598 - head/lib/libc++experimental

[Dimitry Andric]

Author: dim
Date: Sun May 21 21:33:15 2017
New Revision: 318598
URL: https://svnweb.freebsd.org/changeset/base/318598

Log:
  Add PICFLAG to build libc++experimental.a, so it can be used in all
  situations.
  
  Noticed by:   kib

Modified:
  head/lib/libc++experimental/Makefile

Modified: head/lib/libc++experimental/Makefile
==
--- head/lib/libc++experimental/MakefileSun May 21 20:00:49 2017
(r318597)
+++ head/lib/libc++experimental/MakefileSun May 21 21:33:15 2017
(r318598)
@@ -17,6 +17,7 @@ SRCS+=filesystem/path.cpp
 SRCS+= memory_resource.cpp
 
 WARNS?=0
+CXXFLAGS+= ${PICFLAG}
 CXXFLAGS+= -isystem ${SRCDIR}/include
 CXXFLAGS+= -nostdinc++
 CXXFLAGS+= -nostdlib
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r318594 - in head: lib lib/libc++experimental tools/build/mk

[Ngie Cooper (yaneurabeya)]

> On May 21, 2017, at 11:34, Dimitry Andric  wrote:

…

> Hmm, I don't know how to tell the build system otherwise that I don't
> want any shared library.  It looks like NO_PIC is needed in bsd.lib.mk
> to force no .so to be built, though.

NO_PIC is the way to do this.

-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

svn commit: r318597 - head/sys/fs/msdosfs

[Ed Maste]

Author: emaste
Date: Sun May 21 20:00:49 2017
New Revision: 318597
URL: https://svnweb.freebsd.org/changeset/base/318597

Log:
  msdosfs: constify
  
  Obtained from:NetBSD
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/fs/msdosfs/msdosfs_conv.c

Modified: head/sys/fs/msdosfs/msdosfs_conv.c
==
--- head/sys/fs/msdosfs/msdosfs_conv.c  Sun May 21 19:48:16 2017
(r318596)
+++ head/sys/fs/msdosfs/msdosfs_conv.c  Sun May 21 20:00:49 2017
(r318597)
@@ -73,7 +73,7 @@ static uint16_t unix2winchr(const u_char
  * 2 - character ('.' and ' ') should be skipped in DOS file name,
  * and generation number inserted.
  */
-static u_char
+static const u_char
 unix2dos[256] = {
 /* iso8859-1 -> cp850 */
0,0,0,0,0,0,0,0,/* 00-07 */
@@ -110,7 +110,7 @@ unix2dos[256] = {
0x9d, 0xeb, 0xe9, 0xea, 0x9a, 0xed, 0xe8, 0x98, /* f8-ff */
 };
 
-static u_char
+static const u_char
 dos2unix[256] = {
 /* cp850 -> iso8859-1 */
0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 00-07 */
@@ -147,7 +147,7 @@ dos2unix[256] = {
0xb0, 0xa8, 0xb7, 0xb9, 0xb3, 0xb2, 0x3f, 0x3f, /* f8-ff */
 };
 
-static u_char
+static const u_char
 u2l[256] = {
 /* tolower */
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 00-07 */
@@ -184,7 +184,7 @@ u2l[256] = {
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* f8-ff */
 };
 
-static u_char
+static const u_char
 l2u[256] = {
 /* toupper */
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 00-07 */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318596 - head/sys/fs/msdosfs

[Ed Maste]

Author: emaste
Date: Sun May 21 19:48:16 2017
New Revision: 318596
URL: https://svnweb.freebsd.org/changeset/base/318596

Log:
  msdosfs: correct constant and typo in comment
  
  Revisions:
  fat.h 1.5 1.6
  
  Obtained from:NetBSD
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/fs/msdosfs/fat.h

Modified: head/sys/fs/msdosfs/fat.h
==
--- head/sys/fs/msdosfs/fat.h   Sun May 21 19:29:28 2017(r318595)
+++ head/sys/fs/msdosfs/fat.h   Sun May 21 19:48:16 2017(r318596)
@@ -68,7 +68,7 @@
  * MSDOSFS:
  * Return true if filesystem uses 12 bit FATs. Microsoft Programmer's
  * Reference says if the maximum cluster number in a filesystem is greater
- * than 4078 ((CLUST_RSRVS - CLUST_FIRST) & FAT12_MASK) then we've got a
+ * than 4084 ((CLUST_RSRVD - CLUST_FIRST) & FAT12_MASK) then we've got a
  * 16 bit FAT filesystem. While mounting, the result of this test is stored
  * in pm_fatentrysize.
  */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318595 - head/sys/fs/msdosfs

[Ed Maste]

Author: emaste
Date: Sun May 21 19:29:28 2017
New Revision: 318595
URL: https://svnweb.freebsd.org/changeset/base/318595

Log:
  msdosfs: capitalize FAT appropriately
  
  Diff reduction with NetBSD, including some nearby minor whitespace or
  style fixes.
  
  Obtained from:NetBSD
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/fs/msdosfs/denode.h
  head/sys/fs/msdosfs/fat.h
  head/sys/fs/msdosfs/msdosfs_denode.c
  head/sys/fs/msdosfs/msdosfs_fat.c
  head/sys/fs/msdosfs/msdosfs_vfsops.c
  head/sys/fs/msdosfs/msdosfs_vnops.c
  head/sys/fs/msdosfs/msdosfsmount.h

Modified: head/sys/fs/msdosfs/denode.h
==
--- head/sys/fs/msdosfs/denode.hSun May 21 17:07:12 2017
(r318594)
+++ head/sys/fs/msdosfs/denode.hSun May 21 19:29:28 2017
(r318595)
@@ -98,7 +98,7 @@
 #defineMSDOSFSROOT_OFS 0x1fff
 
 /*
- * The fat cache structure. fc_fsrcn is the filesystem relative cluster
+ * The FAT cache structure. fc_fsrcn is the filesystem relative cluster
  * number that corresponds to the file relative cluster number in this
  * structure (fc_frcn).
  */
@@ -108,11 +108,11 @@ struct fatcache {
 };
 
 /*
- * The fat entry cache as it stands helps make extending files a "quick"
- * operation by avoiding having to scan the fat to discover the last
+ * The FAT entry cache as it stands helps make extending files a "quick"
+ * operation by avoiding having to scan the FAT to discover the last
  * cluster of the file. The cache also helps sequential reads by
  * remembering the last cluster read from the file.  This also prevents us
- * from having to rescan the fat to find the next cluster to read.  This
+ * from having to rescan the FAT to find the next cluster to read.  This
  * cache is probably pretty worthless if a file is opened by multiple
  * processes.
  */
@@ -126,7 +126,7 @@ struct fatcache {
 #defineFCE_EMPTY   0x  /* doesn't represent an actual 
cluster # */
 
 /*
- * Set a slot in the fat cache.
+ * Set a slot in the FAT cache.
  */
 #definefc_setcache(dep, slot, frcn, fsrcn) \
(dep)->de_fc[(slot)].fc_frcn = (frcn); \
@@ -156,7 +156,7 @@ struct denode {
u_short de_MDate;   /* modification date */
u_long de_StartCluster; /* starting cluster of file */
u_long de_FileSize; /* size of file in bytes */
-   struct fatcache de_fc[FC_SIZE]; /* fat cache */
+   struct fatcache de_fc[FC_SIZE]; /* FAT cache */
u_quad_t de_modrev; /* Revision level for lease. */
uint64_t de_inode;  /* Inode number (really byte offset of 
direntry) */
 };

Modified: head/sys/fs/msdosfs/fat.h
==
--- head/sys/fs/msdosfs/fat.h   Sun May 21 17:07:12 2017(r318594)
+++ head/sys/fs/msdosfs/fat.h   Sun May 21 19:29:28 2017(r318595)
@@ -66,10 +66,10 @@
 
 /*
  * MSDOSFS:
- * Return true if filesystem uses 12 bit fats. Microsoft Programmer's
+ * Return true if filesystem uses 12 bit FATs. Microsoft Programmer's
  * Reference says if the maximum cluster number in a filesystem is greater
  * than 4078 ((CLUST_RSRVS - CLUST_FIRST) & FAT12_MASK) then we've got a
- * 16 bit fat filesystem. While mounting, the result of this test is stored
+ * 16 bit FAT filesystem. While mounting, the result of this test is stored
  * in pm_fatentrysize.
  */
 #defineFAT12(pmp)  (pmp->pm_fatmask == FAT12_MASK)
@@ -83,8 +83,8 @@
  * These are the values for the function argument to the function
  * fatentry().
  */
-#defineFAT_GET 0x0001  /* get a fat entry */
-#defineFAT_SET 0x0002  /* set a fat entry */
+#defineFAT_GET 0x0001  /* get a FAT entry */
+#defineFAT_SET 0x0002  /* set a FAT entry */
 #defineFAT_GET_AND_SET (FAT_GET | FAT_SET)
 
 /*

Modified: head/sys/fs/msdosfs/msdosfs_denode.c
==
--- head/sys/fs/msdosfs/msdosfs_denode.cSun May 21 17:07:12 2017
(r318594)
+++ head/sys/fs/msdosfs/msdosfs_denode.cSun May 21 19:29:28 2017
(r318595)
@@ -160,7 +160,7 @@ deget(struct msdosfsmount *pmp, u_long d
ldep->de_diroffset = diroffset;
ldep->de_inode = inode;
lockmgr(nvp->v_vnlock, LK_EXCLUSIVE, NULL);
-   fc_purge(ldep, 0);  /* init the fat cache for this denode */
+   fc_purge(ldep, 0);  /* init the FAT cache for this denode */
error = insmntque(nvp, mntp);
if (error != 0) {
free(ldep, M_MSDOSFSNODE);

Modified: head/sys/fs/msdosfs/msdosfs_fat.c
==
--- head/sys/fs/msdosfs/msdosfs_fat.c   Sun May 21 17:07:12 2017
(r318594)
+++ head/sys/fs/msdosfs/msdosfs_fat.c   Sun May 21 19:29:28 2017
(r318595)
@@ 

Re: svn commit: r318594 - in head: lib lib/libc++experimental tools/build/mk

[Konstantin Belousov]

On Sun, May 21, 2017 at 08:34:31PM +0200, Dimitry Andric wrote:
> On 21 May 2017, at 20:00, Konstantin Belousov  wrote:
> > 
> > On Sun, May 21, 2017 at 05:07:12PM +, Dimitry Andric wrote:
> >> Author: dim
> >> Date: Sun May 21 17:07:12 2017
> >> New Revision: 318594
> >> URL: https://svnweb.freebsd.org/changeset/base/318594
> >> 
> >> Log:
> >>  Add libc++experimental.a for std::experimental support
> >> 
> >>  This adds a separate library for supporting std::experimental features.
> >>  It is purposefully static, and must be explicitly linked into programs
> >>  using -lc++experimental.
> >> 
> >>  PLEASE NOTE: there is NO WARRANTY as to any stability or continuing
> >>  existence of the features in the std::experimental parts of the C++
> >>  library!
> >> 
> >>  Reviewed by:  ed
> >>  Differential Revision: https://reviews.freebsd.org/D10840
> >> 
> >> Added:
> >>  head/lib/libc++experimental/
> >>  head/lib/libc++experimental/Makefile   (contents, props changed)
> >> Modified:
> >>  head/lib/Makefile
> >>  head/tools/build/mk/OptionalObsoleteFiles.inc
> >> 
> >> Modified: head/lib/Makefile
> >> ==
> >> --- head/lib/Makefile  Sun May 21 15:37:08 2017(r318593)
> >> +++ head/lib/Makefile  Sun May 21 17:07:12 2017(r318594)
> >> @@ -156,7 +156,7 @@ _libclang_rt=  libclang_rt
> >> 
> >> .if ${MK_LIBCPLUSPLUS} != "no"
> >> _libcxxrt= libcxxrt
> >> -_libcplusplus=libc++
> >> +_libcplusplus=libc++ libc++experimental
> >> .endif
> >> 
> >> SUBDIR.${MK_EFI}+= libefivar
> >> 
> >> Added: head/lib/libc++experimental/Makefile
> >> ==
> >> --- /dev/null  00:00:00 1970   (empty, because file is newly added)
> >> +++ head/lib/libc++experimental/Makefile   Sun May 21 17:07:12 2017
> >> (r318594)
> >> @@ -0,0 +1,29 @@
> >> +# $FreeBSD$
> >> +
> >> +.include 
> >> +
> >> +PACKAGE=  clibs
> >> +SRCDIR=   ${SRCTOP}/contrib/libc++
> >> +
> >> +LIB=  c++experimental
> >> +NO_PIC=
> > I suspect for this case it is almost required to provide
> > libc++experimental_pic.a, otherwise linking the lib to dso would
> > cause textrel.
> 
> Hmm, I don't know how to tell the build system otherwise that I don't
> want any shared library.  It looks like NO_PIC is needed in bsd.lib.mk
> to force no .so to be built, though.
> 
> Maybe it is easier to just build the .a file with -fPIC always?  There
> is really no need for two .a files.

May be, indeed.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r318594 - in head: lib lib/libc++experimental tools/build/mk

[Dimitry Andric]

On 21 May 2017, at 20:00, Konstantin Belousov  wrote:
> 
> On Sun, May 21, 2017 at 05:07:12PM +, Dimitry Andric wrote:
>> Author: dim
>> Date: Sun May 21 17:07:12 2017
>> New Revision: 318594
>> URL: https://svnweb.freebsd.org/changeset/base/318594
>> 
>> Log:
>>  Add libc++experimental.a for std::experimental support
>> 
>>  This adds a separate library for supporting std::experimental features.
>>  It is purposefully static, and must be explicitly linked into programs
>>  using -lc++experimental.
>> 
>>  PLEASE NOTE: there is NO WARRANTY as to any stability or continuing
>>  existence of the features in the std::experimental parts of the C++
>>  library!
>> 
>>  Reviewed by:ed
>>  Differential Revision: https://reviews.freebsd.org/D10840
>> 
>> Added:
>>  head/lib/libc++experimental/
>>  head/lib/libc++experimental/Makefile   (contents, props changed)
>> Modified:
>>  head/lib/Makefile
>>  head/tools/build/mk/OptionalObsoleteFiles.inc
>> 
>> Modified: head/lib/Makefile
>> ==
>> --- head/lib/MakefileSun May 21 15:37:08 2017(r318593)
>> +++ head/lib/MakefileSun May 21 17:07:12 2017(r318594)
>> @@ -156,7 +156,7 @@ _libclang_rt=libclang_rt
>> 
>> .if ${MK_LIBCPLUSPLUS} != "no"
>> _libcxxrt=   libcxxrt
>> -_libcplusplus=  libc++
>> +_libcplusplus=  libc++ libc++experimental
>> .endif
>> 
>> SUBDIR.${MK_EFI}+=   libefivar
>> 
>> Added: head/lib/libc++experimental/Makefile
>> ==
>> --- /dev/null00:00:00 1970   (empty, because file is newly added)
>> +++ head/lib/libc++experimental/Makefile Sun May 21 17:07:12 2017
>> (r318594)
>> @@ -0,0 +1,29 @@
>> +# $FreeBSD$
>> +
>> +.include 
>> +
>> +PACKAGE=clibs
>> +SRCDIR= ${SRCTOP}/contrib/libc++
>> +
>> +LIB=c++experimental
>> +NO_PIC=
> I suspect for this case it is almost required to provide
> libc++experimental_pic.a, otherwise linking the lib to dso would
> cause textrel.

Hmm, I don't know how to tell the build system otherwise that I don't
want any shared library.  It looks like NO_PIC is needed in bsd.lib.mk
to force no .so to be built, though.

Maybe it is easier to just build the .a file with -fPIC always?  There
is really no need for two .a files.

-Dimitry



signature.asc
Description: Message signed with OpenPGP

Re: svn commit: r318594 - in head: lib lib/libc++experimental tools/build/mk

[Konstantin Belousov]

On Sun, May 21, 2017 at 05:07:12PM +, Dimitry Andric wrote:
> Author: dim
> Date: Sun May 21 17:07:12 2017
> New Revision: 318594
> URL: https://svnweb.freebsd.org/changeset/base/318594
> 
> Log:
>   Add libc++experimental.a for std::experimental support
>   
>   This adds a separate library for supporting std::experimental features.
>   It is purposefully static, and must be explicitly linked into programs
>   using -lc++experimental.
>   
>   PLEASE NOTE: there is NO WARRANTY as to any stability or continuing
>   existence of the features in the std::experimental parts of the C++
>   library!
>   
>   Reviewed by:ed
>   Differential Revision: https://reviews.freebsd.org/D10840
> 
> Added:
>   head/lib/libc++experimental/
>   head/lib/libc++experimental/Makefile   (contents, props changed)
> Modified:
>   head/lib/Makefile
>   head/tools/build/mk/OptionalObsoleteFiles.inc
> 
> Modified: head/lib/Makefile
> ==
> --- head/lib/Makefile Sun May 21 15:37:08 2017(r318593)
> +++ head/lib/Makefile Sun May 21 17:07:12 2017(r318594)
> @@ -156,7 +156,7 @@ _libclang_rt= libclang_rt
>  
>  .if ${MK_LIBCPLUSPLUS} != "no"
>  _libcxxrt=   libcxxrt
> -_libcplusplus=   libc++
> +_libcplusplus=   libc++ libc++experimental
>  .endif
>  
>  SUBDIR.${MK_EFI}+=   libefivar
> 
> Added: head/lib/libc++experimental/Makefile
> ==
> --- /dev/null 00:00:00 1970   (empty, because file is newly added)
> +++ head/lib/libc++experimental/Makefile  Sun May 21 17:07:12 2017
> (r318594)
> @@ -0,0 +1,29 @@
> +# $FreeBSD$
> +
> +.include 
> +
> +PACKAGE= clibs
> +SRCDIR=  ${SRCTOP}/contrib/libc++
> +
> +LIB= c++experimental
> +NO_PIC=
I suspect for this case it is almost required to provide
libc++experimental_pic.a, otherwise linking the lib to dso would
cause textrel.

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318594 - in head: lib lib/libc++experimental tools/build/mk

[Dimitry Andric]

Author: dim
Date: Sun May 21 17:07:12 2017
New Revision: 318594
URL: https://svnweb.freebsd.org/changeset/base/318594

Log:
  Add libc++experimental.a for std::experimental support
  
  This adds a separate library for supporting std::experimental features.
  It is purposefully static, and must be explicitly linked into programs
  using -lc++experimental.
  
  PLEASE NOTE: there is NO WARRANTY as to any stability or continuing
  existence of the features in the std::experimental parts of the C++
  library!
  
  Reviewed by:  ed
  Differential Revision: https://reviews.freebsd.org/D10840

Added:
  head/lib/libc++experimental/
  head/lib/libc++experimental/Makefile   (contents, props changed)
Modified:
  head/lib/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/lib/Makefile
==
--- head/lib/Makefile   Sun May 21 15:37:08 2017(r318593)
+++ head/lib/Makefile   Sun May 21 17:07:12 2017(r318594)
@@ -156,7 +156,7 @@ _libclang_rt=   libclang_rt
 
 .if ${MK_LIBCPLUSPLUS} != "no"
 _libcxxrt= libcxxrt
-_libcplusplus= libc++
+_libcplusplus= libc++ libc++experimental
 .endif
 
 SUBDIR.${MK_EFI}+= libefivar

Added: head/lib/libc++experimental/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/lib/libc++experimental/MakefileSun May 21 17:07:12 2017
(r318594)
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+.include 
+
+PACKAGE=   clibs
+SRCDIR=${SRCTOP}/contrib/libc++
+
+LIB=   c++experimental
+NO_PIC=
+MK_PROFILE=no
+
+.PATH: ${SRCDIR}/src/experimental
+
+SRCS+= filesystem/directory_iterator.cpp
+SRCS+= filesystem/operations.cpp
+SRCS+= filesystem/path.cpp
+SRCS+= memory_resource.cpp
+
+WARNS?=0
+CXXFLAGS+= -isystem ${SRCDIR}/include
+CXXFLAGS+= -nostdinc++
+CXXFLAGS+= -nostdlib
+CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
+CXXFLAGS+= -DLIBCXXRT
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+= -std=c++14
+.endif
+
+.include 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 21 15:37:08 
2017(r318593)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 21 17:07:12 
2017(r318594)
@@ -4512,6 +4512,7 @@ OLD_LIBS+=${DEBUG_LIB32_LIBS}
 OLD_LIBS+=lib/libcxxrt.so.1
 OLD_FILES+=usr/lib/libc++.a
 OLD_FILES+=usr/lib/libc++_p.a
+OLD_FILES+=usr/lib/libc++experimental.a
 OLD_FILES+=usr/lib/libc++.so
 OLD_LIBS+=usr/lib/libc++.so.1
 OLD_FILES+=usr/lib/libcxxrt.a
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318593 - head/tests/sys/aio

[Alan Somers]

Author: asomers
Date: Sun May 21 15:37:08 2017
New Revision: 318593
URL: https://svnweb.freebsd.org/changeset/base/318593

Log:
  Fix build of AIO tests with -DDEBUG
  
  Also, redefine some constants for clarity.  No functional change.
  
  MFC after:1 week

Modified:
  head/tests/sys/aio/aio_kqueue_test.c
  head/tests/sys/aio/lio_kqueue_test.c

Modified: head/tests/sys/aio/aio_kqueue_test.c
==
--- head/tests/sys/aio/aio_kqueue_test.cSun May 21 14:35:16 2017
(r318592)
+++ head/tests/sys/aio/aio_kqueue_test.cSun May 21 15:37:08 2017
(r318593)
@@ -163,7 +163,8 @@ main (int argc, char *argv[])
printf("kevent %d %d errno %d return.ident %p "
   "return.data %p return.udata %p %p\n",
   i, result, error,
-  kq_returned.ident, kq_returned.data,
+  (void*)kq_returned.ident,
+  (void*)kq_returned.data,
   kq_returned.udata,
   kq_iocb);
 #endif
@@ -171,7 +172,7 @@ main (int argc, char *argv[])
if (kq_iocb)
break;
 #ifdef DEBUG
-   printf("Try again left %d out of %d %d\n",
+   printf("Try again left %d out of %lu %d\n",
pending, nitems(iocb), cancel);
 #endif
}

Modified: head/tests/sys/aio/lio_kqueue_test.c
==
--- head/tests/sys/aio/lio_kqueue_test.cSun May 21 14:35:16 2017
(r318592)
+++ head/tests/sys/aio/lio_kqueue_test.cSun May 21 15:37:08 2017
(r318593)
@@ -55,7 +55,8 @@
 #define PATH_TEMPLATE   "aio.XX"
 
 #define LIO_MAX 5
-#define MAX_IOCBS LIO_MAX * 16
+#define IOCBS_PER_LIO  16
+#define MAX_IOCBS (LIO_MAX * IOCBS_PER_LIO)
 #define MAX_RUNS 300
 
 int
@@ -103,9 +104,9 @@ main(int argc, char *argv[])
 #endif
for (j = 0; j < LIO_MAX; j++) {
lio[j] =
-   malloc(sizeof(struct aiocb *) * MAX_IOCBS/LIO_MAX);
-   for (i = 0; i < MAX_IOCBS / LIO_MAX; i++) {
-   k = (MAX_IOCBS / LIO_MAX * j) + i;
+   malloc(sizeof(struct aiocb *) * IOCBS_PER_LIO);
+   for (i = 0; i < IOCBS_PER_LIO; i++) {
+   k = (IOCBS_PER_LIO * j) + i;
lio[j][i] = iocb[k] =
calloc(1, sizeof(struct aiocb));
iocb[k]->aio_nbytes = sizeof(buffer);
@@ -115,7 +116,7 @@ main(int argc, char *argv[])
= iocb[k]->aio_nbytes * k * (run + 1);
 
 #ifdef DEBUG
-   printf("hello iocb[k] %d\n",
+   printf("hello iocb[k] %ld\n",
   iocb[k]->aio_offset);
 #endif
iocb[k]->aio_lio_opcode = LIO_WRITE;
@@ -125,11 +126,11 @@ main(int argc, char *argv[])
sig.sigev_notify = SIGEV_KEVENT;
time();
result = lio_listio(LIO_NOWAIT, lio[j],
-   MAX_IOCBS / LIO_MAX, );
+   IOCBS_PER_LIO, );
error = errno;
time();
 #ifdef DEBUG
-   printf("Time %d %d %d result -> %d\n",
+   printf("Time %ld %ld %ld result -> %d\n",
time1, time2, time2-time1, result);
 #endif
if (result != 0) {
@@ -169,7 +170,8 @@ main(int argc, char *argv[])
printf("kevent %d %d errno %d return.ident %p "
   "return.data %p return.udata %p %p\n",
   i, result, error,
-  kq_returned.ident, kq_returned.data,
+  (void*)kq_returned.ident,
+  (void*)kq_returned.data,
   kq_returned.udata,
   lio[j]);
 #endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318592 - in head/usr.bin/compress: . tests

[Jilles Tjoelker]

Author: jilles
Date: Sun May 21 14:35:16 2017
New Revision: 318592
URL: https://svnweb.freebsd.org/changeset/base/318592

Log:
  compress: Allow uncompress -c with multiple pathnames, as required by POSIX.
  
  Per POSIX, allow passing multiple pathnames to uncompress -c, concatenating
  the uncompressed data.
  
  Passing multiple pathnames to compress -c remains disallowed, since the
  result cannot be decompressed.
  
  PR:   219387
  Reported by:  Jörg Schilling

Modified:
  head/usr.bin/compress/compress.c
  head/usr.bin/compress/tests/compress_test.sh

Modified: head/usr.bin/compress/compress.c
==
--- head/usr.bin/compress/compress.cSun May 21 14:05:32 2017
(r318591)
+++ head/usr.bin/compress/compress.cSun May 21 14:35:16 2017
(r318592)
@@ -129,7 +129,7 @@ main(int argc, char *argv[])
exit (eval);
}
 
-   if (cat == 1 && argc > 1)
+   if (cat == 1 && style == COMPRESS && argc > 1)
errx(1, "the -c option permits only a single file argument");
 
for (; *argv; ++argv)

Modified: head/usr.bin/compress/tests/compress_test.sh
==
--- head/usr.bin/compress/tests/compress_test.shSun May 21 14:05:32 
2017(r318591)
+++ head/usr.bin/compress/tests/compress_test.shSun May 21 14:35:16 
2017(r318592)
@@ -161,6 +161,27 @@ compress_uncompress_file_2_body()
atf_check cmp file2 expectfile2
 }
 
+atf_test_case compress_uncompress_file_minusc_1
+compress_uncompress_file_minusc_1_head()
+{
+   atf_set "descr" \
+   "Test compressing and uncompressing some data, passing two 
filenames to uncompress -c"
+}
+compress_uncompress_file_minusc_1_body()
+{
+   printf '%01000d\n' 7 8 >expectfile1
+   printf '%01000d\n' 8 7 >expectfile2
+   cp expectfile1 file1
+   cp expectfile2 file2
+   atf_check compress file1 file2
+   atf_check -s exit:1 cmp -s file1.Z expectfile1
+   atf_check -s exit:1 cmp -s file2.Z expectfile2
+   atf_check -s exit:1 cmp -s file1.Z file2.Z
+   atf_check -x 'uncompress -c file1.Z file2.Z >all'
+   atf_check -x 'cat expectfile1 expectfile2 >expectall'
+   atf_check cmp all expectall
+}
+
 atf_init_test_cases()
 {
atf_add_test_case uncompress_file_1
@@ -171,4 +192,5 @@ atf_init_test_cases()
atf_add_test_case compress_uncompress_minusc_1
atf_add_test_case compress_uncompress_file_1
atf_add_test_case compress_uncompress_file_2
+   atf_add_test_case compress_uncompress_file_minusc_1
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r318591 - in head: etc/mtree usr.bin/compress usr.bin/compress/tests

[Jilles Tjoelker]

Author: jilles
Date: Sun May 21 14:05:32 2017
New Revision: 318591
URL: https://svnweb.freebsd.org/changeset/base/318591

Log:
  compress: Add basic tests.

Added:
  head/usr.bin/compress/tests/
  head/usr.bin/compress/tests/Makefile   (contents, props changed)
  head/usr.bin/compress/tests/compress_test.sh   (contents, props changed)
Modified:
  head/etc/mtree/BSD.tests.dist
  head/usr.bin/compress/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist   Sun May 21 00:06:36 2017
(r318590)
+++ head/etc/mtree/BSD.tests.dist   Sun May 21 14:05:32 2017
(r318591)
@@ -606,6 +606,8 @@
 ..
 cmp
 ..
+compress
+..
 cpio
 ..
 col

Modified: head/usr.bin/compress/Makefile
==
--- head/usr.bin/compress/Makefile  Sun May 21 00:06:36 2017
(r318590)
+++ head/usr.bin/compress/Makefile  Sun May 21 14:05:32 2017
(r318591)
@@ -1,6 +1,8 @@
 #  @(#)Makefile8.2 (Berkeley) 4/17/94
 # $FreeBSD$
 
+.include 
+
 PROG=  compress
 SRCS=  compress.c zopen.c
 LINKS= ${BINDIR}/compress ${BINDIR}/uncompress
@@ -9,4 +11,8 @@ MLINKS=compress.1 uncompress.1
 # XXX zopen is not part of libc
 # MAN=zopen.3
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=   tests
+.endif
+
 .include 

Added: head/usr.bin/compress/tests/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/compress/tests/MakefileSun May 21 14:05:32 2017
(r318591)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PACKAGE=   tests
+
+ATF_TESTS_SH=  compress_test
+
+.include 

Added: head/usr.bin/compress/tests/compress_test.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/compress/tests/compress_test.shSun May 21 14:05:32 
2017(r318591)
@@ -0,0 +1,174 @@
+# Copyright (c) 2017 Jilles Tjoelker 
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+atf_test_case uncompress_file_1
+uncompress_file_1_head()
+{
+   atf_set "descr" \
+   "Test uncompress without options, filename with .Z"
+}
+uncompress_file_1_body()
+{
+   printf '%01000d\n' 7 >expectfile1
+   printf "\
+\037\235\220\060\002\012\034\110\260\240\301\203\010\023\052\134\
+\310\260\241\303\207\020\043\112\234\110\261\242\305\213\030\063\
+\152\334\310\261\243\307\217\040\103\212\034\111\262\244\311\223\
+\050\123\252\134\211\360\206\002" >file1.Z
+   atf_check uncompress file1.Z
+   atf_check cmp file1 expectfile1
+   atf_check test ! -e file1.Z
+}
+
+atf_test_case uncompress_file_2
+uncompress_file_2_head()
+{
+   atf_set "descr" \
+   "Test uncompress without options, filename without .Z"
+}
+uncompress_file_2_body()
+{
+   printf '%01000d\n' 7 >expectfile1
+   printf "\
+\037\235\220\060\002\012\034\110\260\240\301\203\010\023\052\134\
+\310\260\241\303\207\020\043\112\234\110\261\242\305\213\030\063\
+\152\334\310\261\243\307\217\040\103\212\034\111\262\244\311\223\
+\050\123\252\134\211\360\206\002" >file1.Z
+   atf_check uncompress file1
+   atf_check cmp file1 expectfile1
+   atf_check test ! -e file1.Z
+}
+
+atf_test_case uncompress_stdio_1
+uncompress_stdio_1_head()
+{
+   atf_set "descr" \
+   "Test uncompress without parameters"
+}
+uncompress_stdio_1_body()
+{
+   printf '%01000d\n' 7 >expectfile1
+