Merge FreeBSD 2024-07-26

ObsoleteFiles.inc

@@ -51,6 +51,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20240726: deprecate contigfree(9)
+OLD_FILES+=usr/share/man/man9/contigfree.9.gz
+
+# 20240721: retire vm_page_alloc_freelist
+OLD_FILES+=usr/share/man/man9/vm_page_alloc_freelist.9.gz
+OLD_FILES+=usr/share/man/man9/vm_page_alloc_freelist_domain.9.gz
+
 # 20240716: retire mergemaster
 OLD_FILES+=usr/sbin/mergemaster
 OLD_FILES+=usr/share/man/man8/mergemaster.8.gz

bin/ls/ls.1

@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 21, 2024
+.Dd July 22, 2024
 .Dt LS 1
 .Os
 .Sh NAME
@@ -434,6 +434,8 @@ output is not to a terminal.
 .It Fl ,
 (Comma) When the
 .Fl l
+or
+.Fl s
 option is set, print file sizes grouped and separated by thousands using the
 non-monetary separator returned by
 .Xr localeconv 3 ,

bin/ls/ls.c

@@ -969,7 +969,8 @@ display(const FTSENT *p, FTSENT *list, int options)
 	d.maxlen = maxlen;
 	if (needstats) {
 		d.btotal = btotal;
-		d.s_block = snprintf(NULL, 0, "%lu", howmany(maxblock, blocksize));
+		d.s_block = snprintf(NULL, 0, f_thousands ? "%'ld" : "%ld",
+		    howmany(maxblock, blocksize));
 		d.s_flags = maxflags;
 		d.s_label = maxlabelstr;
 		d.s_group = maxgroup;

bin/ls/print.c

@@ -221,7 +221,7 @@ printlong(const DISPLAY *dp)
 			(void)printf("%*ju ",
 			    dp->s_inode, (uintmax_t)sp->st_ino);
 		if (f_size)
-			(void)printf("%*jd ",
+			(void)printf(f_thousands ? "%'*jd " : "%*jd ",
 			    dp->s_block, howmany(sp->st_blocks, blocksize));
 		strmode(sp->st_mode, buf);
 		aclmode(buf, p);
@@ -400,7 +400,7 @@ printaname(const FTSENT *p, u_long inodefield, u_long sizefield)
 		chcnt += printf("%*ju ",
 		    (int)inodefield, (uintmax_t)sp->st_ino);
 	if (f_size)
-		chcnt += printf("%*jd ",
+		chcnt += printf(f_thousands ? "%'*jd " : "%*jd ",
 		    (int)sizefield, howmany(sp->st_blocks, blocksize));
 #ifdef COLORLS
 	if (f_color)
@@ -753,12 +753,10 @@ printsize(size_t width, off_t bytes)
 		humanize_number(buf, sizeof(buf), (int64_t)bytes, "",
 		    HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
 		(void)printf("%*s ", (u_int)width, buf);
-	} else if (f_thousands) {		/* with commas */
-		/* This format assignment needed to work round gcc bug. */
-		const char *format = "%*j'd ";
-		(void)printf(format, (u_int)width, bytes);
-	} else
-		(void)printf("%*jd ", (u_int)width, bytes);
+	} else {
+		(void)printf(f_thousands ? "%'*jd " : "%*jd ",
+		    (u_int)width, bytes);
+	}
 }
 
 /*

bin/ls/tests/ls_tests.sh

@@ -800,6 +800,21 @@ s_flag_body()
 	done
 }
 
+atf_test_case scomma_flag
+scomma_flag_head()
+{
+	atf_set "descr" "Verify that -s, prints out the size with ',' delimiters"
+}
+
+scomma_flag_body()
+{
+	export LC_ALL=en_US.UTF-8
+	atf_check -e ignore dd if=/dev/urandom of=file bs=65536 count=64
+	blocks=$(stat -f "%b" file)
+	cblocks=$(printf "%'d" $blocks)
+	atf_check -e empty -o match:"$cblocks[[:space:]]+file" ls -s, file
+}
+
 atf_test_case t_flag
 t_flag_head()
 {
@@ -972,6 +987,7 @@ atf_init_test_cases()
 	atf_add_test_case q_flag_and_w_flag
 	atf_add_test_case r_flag
 	atf_add_test_case s_flag
+	atf_add_test_case scomma_flag
 	atf_add_test_case t_flag
 	atf_add_test_case u_flag
 	atf_add_test_case v_flag

bin/pax/cpio.c

@@ -274,13 +274,13 @@ cpio_rd(ARCHD *arcn, char *buf)
 	 */
 	if (cpio_id(buf, sizeof(HD_CPIO)) < 0)
 		return(-1);
+	memset(arcn, 0, sizeof *arcn);
 	hd = (HD_CPIO *)buf;
 
 	/*
 	 * byte oriented cpio (posix) does not have padding! extract the octal
 	 * ascii fields from the header
 	 */
-	arcn->pad = 0L;
 	arcn->sb.st_dev = (dev_t)asc_ul(hd->c_dev, sizeof(hd->c_dev), OCT);
 	arcn->sb.st_ino = (ino_t)asc_ul(hd->c_ino, sizeof(hd->c_ino), OCT);
 	arcn->sb.st_mode = (mode_t)asc_ul(hd->c_mode, sizeof(hd->c_mode), OCT);
@@ -309,8 +309,6 @@ cpio_rd(ARCHD *arcn, char *buf)
 		/*
 	 	 * no link name to read for this file
 	 	 */
-		arcn->ln_nlen = 0;
-		arcn->ln_name[0] = '\0';
 		return(com_rd(arcn));
 	}
 
@@ -555,8 +553,8 @@ vcpio_rd(ARCHD *arcn, char *buf)
 			return(-1);
 	}
 
+	memset(arcn, 0, sizeof *arcn);
 	hd = (HD_VCPIO *)buf;
-	arcn->pad = 0L;
 
 	/*
 	 * extract the hex ascii fields from the header
@@ -603,8 +601,6 @@ vcpio_rd(ARCHD *arcn, char *buf)
 		/*
 		 * we have a valid header (not a link)
 		 */
-		arcn->ln_nlen = 0;
-		arcn->ln_name[0] = '\0';
 		arcn->pad = VCPIO_PAD(arcn->sb.st_size);
 		return(com_rd(arcn));
 	}
@@ -851,7 +847,7 @@ bcpio_rd(ARCHD *arcn, char *buf)
 	if (bcpio_id(buf, sizeof(HD_BCPIO)) < 0)
 		return(-1);
 
-	arcn->pad = 0L;
+	memset(arcn, 0, sizeof *arcn);
 	hd = (HD_BCPIO *)buf;
 	if (swp_head) {
 		/*
@@ -913,8 +909,6 @@ bcpio_rd(ARCHD *arcn, char *buf)
 		/*
 		 * we have a valid header (not a link)
 		 */
-		arcn->ln_nlen = 0;
-		arcn->ln_name[0] = '\0';
 		arcn->pad = BCPIO_PAD(arcn->sb.st_size);
 		return(com_rd(arcn));
 	}

bin/pax/tar.c

@@ -367,9 +367,9 @@ tar_rd(ARCHD *arcn, char *buf)
 	 */
 	if (tar_id(buf, BLKMULT) < 0)
 		return(-1);
+	memset(arcn, 0, sizeof *arcn);
 	arcn->org_name = arcn->name;
 	arcn->sb.st_nlink = 1;
-	arcn->pat = NULL;
 
 	/*
 	 * copy out the name and values in the stat buffer
@@ -396,8 +396,6 @@ tar_rd(ARCHD *arcn, char *buf)
 	 * to encode this as a directory
 	 */
 	pt = &(arcn->name[arcn->nlen - 1]);
-	arcn->pad = 0;
-	arcn->skip = 0;
 	switch(hd->linkflag) {
 	case SYMTYPE:
 		/*
@@ -434,17 +432,13 @@ tar_rd(ARCHD *arcn, char *buf)
 		arcn->type = PAX_DIR;
 		arcn->sb.st_mode |= S_IFDIR;
 		arcn->sb.st_nlink = 2;
-		arcn->ln_name[0] = '\0';
-		arcn->ln_nlen = 0;
 		break;
 	case AREGTYPE:
 	case REGTYPE:
 	default:
 		/*
 		 * If we have a trailing / this is a directory and NOT a file.
 		 */
-		arcn->ln_name[0] = '\0';
-		arcn->ln_nlen = 0;
 		if (*pt == '/') {
 			/*
 			 * it is a directory, set the mode for -v printing
@@ -721,10 +715,9 @@ ustar_rd(ARCHD *arcn, char *buf)
 	 */
 	if (ustar_id(buf, BLKMULT) < 0)
 		return(-1);
+	memset(arcn, 0, sizeof *arcn);
 	arcn->org_name = arcn->name;
 	arcn->sb.st_nlink = 1;
-	arcn->pat = NULL;
-	arcn->nlen = 0;
 	hd = (HD_USTAR *)buf;
 
 	/*
@@ -771,15 +764,6 @@ ustar_rd(ARCHD *arcn, char *buf)
 	if (uid_name(hd->uname, &(arcn->sb.st_uid)) < 0)
 		arcn->sb.st_uid = (uid_t)asc_ul(hd->uid, sizeof(hd->uid), OCT);
 
-	/*
-	 * set the defaults, these may be changed depending on the file type
-	 */
-	arcn->ln_name[0] = '\0';
-	arcn->ln_nlen = 0;
-	arcn->pad = 0;
-	arcn->skip = 0;
-	arcn->sb.st_rdev = (dev_t)0;
-
 	/*
 	 * set the mode and PAX type according to the typeflag in the header
 	 */

contrib/bmake/ChangeLog

@@ -1,3 +1,86 @@
+2024-07-13  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* cleanup redundant differences from NetBSD make
+	o parse.c: no longer uses mmap
+	o var.c: check __STDC_VERSION__ not __STDC__
+
+2024-07-12  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* Apply some patches from NetBSD pkgsrc to reduce divergence
+	o meta.c: requires sys/select.h if available
+	o var.c: ensure SIZE_MAX has a value
+	o util.c: ensure SA_RESTART is defined
+
+	* configure.in: use *ksh* rather than just *ksh to match
+	ksh shell specification.
+
+	* unit-tests/Makefile: expand BROKEN_TESTS for ksh and
+	mksh in particular
+
+2024-07-11  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20240711
+	Merge with NetBSD make, pick up
+	o compat.c: allow Compat_RunCommand to also handle very long
+	commands by writing to a temp file when needed.
+	o main.c: extract the temp file logic recently added to Cmd_Exec
+	to Cmd_Argv so it can be leveraged by Compat_RunCommand.
+
+2024-07-09  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20240709
+	Merge with NetBSD make, pick up
+	o error out on parse/evaluation errors in shell commands
+	o var.c: error out on syntax errors in ':M' and ':N' modifiers
+
+2024-07-07  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20240707
+	Merge with NetBSD make, pick up
+	o only generate code for cleanup functions in CLEANUP mode
+	o hash.c: don't track hash table chain lengths during lookup
+	unless debugging
+	o main.c: move initialization of variable scopes to targ.c
+	o var.c: remove Var_End as it is now unnecessary
+
+2024-07-06  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20240706
+	Merge with NetBSD make, pick up
+	o reduce lint comments about ARGSUSED
+	o cond.c: error out on conditions containing the operators '&' and '|'
+	o str.c: error out on a matching malformed matching pattern '[['
+	o var.c: in error messages, distinguish parsing from evaluating
+	in error messages for anonymous variables, log the value
+	error out on unclosed expressions during parse time
+
+2024-07-04  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20240704
+	Merge with NetBSD make, pick up
+	o add more context information to error messages
+	o main.c: on error, print the targets to be made
+	add detailed exit status to message for failed sub-commands
+	o var.c: error out on the "Bad modifier" error message
+
+2024-07-01  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20240701
+	Merge with NetBSD make, pick up
+	o var.c: add :tt for Title case
+
+2024-06-30  Simon J Gerraty  <sjg@beast.crufty.net>
+
+	* configure.in: 20240630 further refine check for whether
+	TZ=Europe/Berlin works
+
+	* VERSION (_MAKE_VERSION): 20240630
+	Merge with NetBSD make, pick up
+	o job.c: reduce use of UNCONST
+	o main.c: add detailed exit status to message for failed sub-commands
+	o var.c: error out on some more syntax errors
+	add more context to "returned non-zero status" message
+
 2024-06-25  Simon J Gerraty  <sjg@beast.crufty.net>
 
 	* VERSION (_MAKE_VERSION): 20240625

contrib/bmake/FILES

@@ -759,6 +759,8 @@ unit-tests/varmod-to-one-word.exp
 unit-tests/varmod-to-one-word.mk
 unit-tests/varmod-to-separator.exp
 unit-tests/varmod-to-separator.mk
+unit-tests/varmod-to-title.exp
+unit-tests/varmod-to-title.mk
 unit-tests/varmod-to-upper.exp
 unit-tests/varmod-to-upper.mk
 unit-tests/varmod-undefined.exp

contrib/bmake/VERSION

@@ -1,2 +1,2 @@
 # keep this compatible with sh and make
-_MAKE_VERSION=20240625
+_MAKE_VERSION=20240711

contrib/bmake/arch.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: arch.c,v 1.219 2024/06/02 15:31:25 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.221 2024/07/07 07:50:57 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -147,7 +147,7 @@ struct ar_hdr {
 #include "dir.h"
 
 /*	"@(#)arch.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: arch.c,v 1.219 2024/06/02 15:31:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.221 2024/07/07 07:50:57 rillig Exp $");
 
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
@@ -821,7 +821,6 @@ Arch_Touch(GNode *gn)
  * Both the modification time of the library and of the RANLIBMAG member are
  * set to 'now'.
  */
-/*ARGSUSED*/
 void
 Arch_TouchLib(GNode *gn MAKE_ATTR_UNUSED)
 {
@@ -922,7 +921,6 @@ Arch_FindLib(GNode *gn, SearchPath *path)
 	Var_Set(gn, TARGET, gn->name);
 }
 
-/* ARGSUSED */
 static bool
 RanlibOODate(const GNode *gn MAKE_ATTR_UNUSED)
 {
@@ -1002,18 +1000,18 @@ Arch_Init(void)
 	Lst_Init(&archives);
 }
 
+#ifdef CLEANUP
 /* Clean up the archives module. */
 void
 Arch_End(void)
 {
-#ifdef CLEANUP
 	ArchListNode *ln;
 
 	for (ln = archives.first; ln != NULL; ln = ln->next)
 		ArchFree(ln->datum);
 	Lst_Done(&archives);
-#endif
 }
+#endif
 
 bool
 Arch_IsLib(GNode *gn)