CVS commit: src/external/bsd/file/dist/src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Apr  5 16:56:58 UTC 2024

Modified Files:
src/external/bsd/file/dist/src: apprentice.c

Log Message:
break strength ties so that qsort is deterministic


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/file/dist/src/apprentice.c

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/file/dist/src/apprentice.c
diff -u src/external/bsd/file/dist/src/apprentice.c:1.28 src/external/bsd/file/dist/src/apprentice.c:1.29
--- src/external/bsd/file/dist/src/apprentice.c:1.28	Fri Aug 18 15:00:11 2023
+++ src/external/bsd/file/dist/src/apprentice.c	Fri Apr  5 12:56:58 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: apprentice.c,v 1.28 2023/08/18 19:00:11 christos Exp $	*/
+/*	$NetBSD: apprentice.c,v 1.29 2024/04/05 16:56:58 christos Exp $	*/
 
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
@@ -37,7 +37,7 @@
 #if 0
 FILE_RCSID("@(#)$File: apprentice.c,v 1.342 2023/07/17 14:38:35 christos Exp $")
 #else
-__RCSID("$NetBSD: apprentice.c,v 1.28 2023/08/18 19:00:11 christos Exp $");
+__RCSID("$NetBSD: apprentice.c,v 1.29 2024/04/05 16:56:58 christos Exp $");
 #endif
 #endif	/* lint */
 
@@ -1141,8 +1141,12 @@ apprentice_sort(const void *a, const voi
 	const struct magic_entry *mb = CAST(const struct magic_entry *, b);
 	size_t sa = file_magic_strength(ma->mp, ma->cont_count);
 	size_t sb = file_magic_strength(mb->mp, mb->cont_count);
-	if (sa == sb)
-		return 0;
+	if (sa == sb) {
+		int x = memcmp(ma->mp, mb->mp, sizeof(*ma->mp));
+		if (x == 0)
+			abort();
+		return x > 0 ? -1 : 1;
+	}
 	else if (sa > sb)
 		return -1;
 	else

CVS commit: src/external/bsd/file/dist/src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Apr  5 16:56:58 UTC 2024

Modified Files:
src/external/bsd/file/dist/src: apprentice.c

Log Message:
break strength ties so that qsort is deterministic


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/file/dist/src/apprentice.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb  3 20:07:35 UTC 2023

Removed Files:
src/external/bsd/file/dist: configure~

Log Message:
remove trash (pointed out by des @ freebsd)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/external/bsd/file/dist/configure~

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb  3 20:07:35 UTC 2023

Removed Files:
src/external/bsd/file/dist: configure~

Log Message:
remove trash (pointed out by des @ freebsd)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/external/bsd/file/dist/configure~

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist/magic/magdir

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 10 20:57:10 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
dedup


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/bsd/file/dist/magic/magdir/filesystems

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist/magic/magdir

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 10 20:57:10 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
dedup


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/bsd/file/dist/magic/magdir/filesystems

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/file/dist/magic/magdir/filesystems
diff -u src/external/bsd/file/dist/magic/magdir/filesystems:1.20 src/external/bsd/file/dist/magic/magdir/filesystems:1.21
--- src/external/bsd/file/dist/magic/magdir/filesystems:1.20	Sat Dec 10 11:22:21 2022
+++ src/external/bsd/file/dist/magic/magdir/filesystems	Sat Dec 10 15:57:10 2022
@@ -1,5 +1,5 @@
 #--
-# $File: filesystems,v 1.150 2022/07/04 16:40:33 christos Exp $
+# $File: filesystems,v 1.152 2022/12/10 20:56:50 christos Exp $
 # filesystems:  file(1) magic for different filesystems
 #
 0	name	partid
@@ -1596,7 +1596,8 @@
 >0x1e	lequad	x			%lld total clusters,
 >0x26	lequad	x			%lld clusters in use
 
-9564	lelong		0x00011954	Unix Fast File system [v1] (little-endian),
+
+0	name		ffsv1
 >8404	string		x		last mounted on %s,
 #>9504	ledate		x		last checked at %s,
 >8224	ledate		x		last written at %s,
@@ -1612,185 +1613,59 @@
 >8320	lelong		0		TIME optimization
 >8320	lelong		1		SPACE optimization
 
-42332	lelong		0x19540119	Unix Fast File system [v2] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-66908	lelong		0x19540119	Unix Fast File system [v2] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-42332	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-66908	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
+9564	lelong		0x00011954	Unix Fast File system [v1] (little-endian),
+>0	use		ffsv1
 
 9564	belong		0x00011954	Unix Fast File system [v1] (big-endian),
 >7168  

CVS commit: src/external/bsd/file/dist/magic/magdir

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 16:22:21 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
Add magic to recognize FFSv2ea


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/bsd/file/dist/magic/magdir/filesystems

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/file/dist/magic/magdir/filesystems
diff -u src/external/bsd/file/dist/magic/magdir/filesystems:1.19 src/external/bsd/file/dist/magic/magdir/filesystems:1.20
--- src/external/bsd/file/dist/magic/magdir/filesystems:1.19	Sat Sep 24 20:21:46 2022
+++ src/external/bsd/file/dist/magic/magdir/filesystems	Sat Dec 10 16:22:21 2022
@@ -1652,6 +1652,46 @@
 >&-1248	lelong		0		TIME optimization
 >&-1248	lelong		1		SPACE optimization
 
+42332	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	leqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	lequad		x		number of blocks %lld,
+>&-288	lequad		x		number of data blocks %lld,
+>&-1332	lelong		x		number of cylinder groups %d,
+>&-1328	lelong		x		block size %d,
+>&-1324	lelong		x		fragment size %d,
+>&-180	lelong		x		average file size %d,
+>&-176	lelong		x		average number of files in dir %d,
+>&-272	lequad		x		pending blocks to free %lld,
+>&-264	lelong		x		pending inodes to free %d,
+>&-664	lequad		x		system-wide uuid %0llx,
+>&-1316	lelong		x		minimum percentage of free blocks %d,
+>&-1248	lelong		0		TIME optimization
+>&-1248	lelong		1		SPACE optimization
+
+66908	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	leqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	lequad		x		number of blocks %lld,
+>&-288	lequad		x		number of data blocks %lld,
+>&-1332	lelong		x		number of cylinder groups %d,
+>&-1328	lelong		x		block size %d,
+>&-1324	lelong		x		fragment size %d,
+>&-180	lelong		x		average file size %d,
+>&-176	lelong		x		average number of files in dir %d,
+>&-272	lequad		x		pending blocks to free %lld,
+>&-264	lelong		x		pending inodes to free %d,
+>&-664	lequad		x		system-wide uuid %0llx,
+>&-1316	lelong		x		minimum percentage of free blocks %d,
+>&-1248	lelong		0		TIME optimization
+>&-1248	lelong		1		SPACE optimization
+
 9564	belong		0x00011954	Unix Fast File system [v1] (big-endian),
 >7168   belong		0x4c41424c	Apple UFS Volume
 >>7186  string		x		named %s,
@@ -1712,6 +1752,46 @@
 >&-1248	belong		0		TIME optimization
 >&-1248	belong		1		SPACE optimization
 
+42332	belong		0x19012038	Unix Fast File system [v2ea] (big-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	beqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	bequad		x		number of blocks %lld,
+>&-288	bequad		x		number of data blocks %lld,
+>&-1332	belong		x		number of cylinder groups %d,
+>&-1328	belong		x		block size %d,
+>&-1324	belong		x		fragment size %d,
+>&-180	belong		x		average file size %d,
+>&-176	belong		x		average number of files in dir %d,
+>&-272	bequad		x		pending blocks to free %lld,
+>&-264	belong		x		pending inodes to free %d,
+>&-664	bequad		x		system-wide uuid %0llx,
+>&-1316	belong		x		minimum percentage of free blocks %d,
+>&-1248	belong		0		TIME optimization
+>&-1248	belong		1		SPACE optimization
+
+66908	belong		0x19012038	Unix Fast File system [v2ea] (big-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	beqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	bequad		x		number of blocks %lld,
+>&-288	bequad		x		number of data blocks %lld,
+>&-1332	belong		x		number of cylinder groups %d,
+>&-1328	belong		x		block size %d,
+>&-1324	belong		x		fragment size %d,
+>&-180	belong		x		average file size %d,
+>&-176	belong		x		average number of files in dir %d,
+>&-272	bequad		x		pending blocks to free %lld,
+>&-264	belong		x		pending inodes to free %d,
+>&-664	bequad		x		system-wide uuid %0llx,
+>&-1316	belong		x		minimum percentage of free blocks %d,
+>&-1248	belong		0		TIME optimization
+>&-1248	belong		1		SPACE optimization
+
 0	ulequad		0xc8414d4dc5523031	HAMMER filesystem (little-endian),
 >0x90	lelong+1	x			volume %d
 >0x94	lelong		x			(of %d),

CVS commit: src/external/bsd/file/dist/magic/magdir

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 16:22:21 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
Add magic to recognize FFSv2ea


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/bsd/file/dist/magic/magdir/filesystems

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Sep 25 00:48:37 UTC 2022

Added Files:
src/external/bsd/file/dist: depcomp missing

Log Message:
more autoconf files


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.11 src/external/bsd/file/dist/depcomp
cvs rdiff -u -r0 -r1.12 src/external/bsd/file/dist/missing

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/file/dist/depcomp
diff -u /dev/null src/external/bsd/file/dist/depcomp:1.11
--- /dev/null	Sat Sep 24 20:48:37 2022
+++ src/external/bsd/file/dist/depcomp	Sat Sep 24 20:48:37 2022
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva .
+
+case $1 in
+  '')
+echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+exit 1;
+;;
+  -h | --h*)
+cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode Dependency tracking mode.
+  source  Source file read by 'PROGRAMS ARGS'.
+  object  Object file output by 'PROGRAMS ARGS'.
+  DEPDIR  directory where to store dependencies.
+  depfile Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool Whether libtool is used (yes/no).
+
+Report bugs to .
+EOF
+exit $?
+;;
+  -v | --v*)
+echo "depcomp $scriptversion"
+exit $?
+;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+*/*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+  *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+# Each line is of the form 'foo.o: dependency.h'.
+# Do two passes, one to just change these to
+#   $object: dependency.h
+# and one to simply output
+#   dependency.h:
+# which is needed to avoid the deleted-header problem.
+{ sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+  sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+} > "$depfile"
+rm -f "$tmpdepfile"
+  else
+make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# 

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Sep 25 00:48:37 UTC 2022

Added Files:
src/external/bsd/file/dist: depcomp missing

Log Message:
more autoconf files


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.11 src/external/bsd/file/dist/depcomp
cvs rdiff -u -r0 -r1.12 src/external/bsd/file/dist/missing

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Sep 25 00:47:27 UTC 2022

Added Files:
src/external/bsd/file/dist: compile

Log Message:
compile is needed too


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.13 src/external/bsd/file/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/file/dist/compile
diff -u /dev/null src/external/bsd/file/dist/compile:1.13
--- /dev/null	Sat Sep 24 20:47:27 2022
+++ src/external/bsd/file/dist/compile	Sat Sep 24 20:47:27 2022
@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+  if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	file_conv=mingw
+	;;
+	  CYGWIN* | MSYS*)
+	file_conv=cygwin
+	;;
+	  *)
+	file_conv=wine
+	;;
+	esac
+  fi
+  case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/* | msys/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+  esac
+  ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+lib_path=$file
+  else
+lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+IFS=$save_IFS
+if $shared && test -f "$dir/$lib.dll.lib"; then
+  found=yes
+  lib=$dir/$lib.dll.lib
+  break
+fi
+if test -f "$dir/$lib.lib"; then
+  found=yes
+  lib=$dir/$lib.lib
+  break
+fi
+if test -f "$dir/lib$lib.a"; then
+  found=yes
+  lib=$dir/lib$lib.a
+  break
+fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+if test -n "$eat"; then
+  eat=
+else
+  case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	*.o | *.[oO][bB][jJ])
+	  func_file_conv "$2"
+	  set x "$@" -Fo"$file"
+	  shift
+	  ;;
+	*)
+	  func_file_conv "$2"
+	  set x "$@" -Fe"$file"
+	  shift
+	  ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	IFS="$save_ifs"
+	linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Sep 25 00:47:27 UTC 2022

Added Files:
src/external/bsd/file/dist: compile

Log Message:
compile is needed too


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.13 src/external/bsd/file/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 24 20:33:30 UTC 2022

Modified Files:
src/external/bsd/file/dist: configure
Added Files:
src/external/bsd/file/dist: Makefile.in aclocal.m4 config.guess
config.h.in config.sub configure~ install-sh ltmain.sh
src/external/bsd/file/dist/doc: Makefile.in
src/external/bsd/file/dist/magic: Makefile.in
src/external/bsd/file/dist/python: Makefile.in
src/external/bsd/file/dist/src: Makefile.in
src/external/bsd/file/dist/tests: Makefile.in

Log Message:
Add configure glue


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.21 src/external/bsd/file/dist/Makefile.in
cvs rdiff -u -r0 -r1.16 src/external/bsd/file/dist/aclocal.m4
cvs rdiff -u -r0 -r1.17 src/external/bsd/file/dist/config.guess
cvs rdiff -u -r0 -r1.18 src/external/bsd/file/dist/config.h.in
cvs rdiff -u -r0 -r1.14 src/external/bsd/file/dist/config.sub \
src/external/bsd/file/dist/install-sh
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/file/dist/configure
cvs rdiff -u -r0 -r1.1 src/external/bsd/file/dist/configure~
cvs rdiff -u -r0 -r1.3 src/external/bsd/file/dist/ltmain.sh
cvs rdiff -u -r0 -r1.15 src/external/bsd/file/dist/doc/Makefile.in
cvs rdiff -u -r0 -r1.25 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r0 -r1.16 src/external/bsd/file/dist/python/Makefile.in
cvs rdiff -u -r0 -r1.18 src/external/bsd/file/dist/src/Makefile.in
cvs rdiff -u -r0 -r1.18 src/external/bsd/file/dist/tests/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffs are larger than 1MB and have been omitted

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 24 20:33:30 UTC 2022

Modified Files:
src/external/bsd/file/dist: configure
Added Files:
src/external/bsd/file/dist: Makefile.in aclocal.m4 config.guess
config.h.in config.sub configure~ install-sh ltmain.sh
src/external/bsd/file/dist/doc: Makefile.in
src/external/bsd/file/dist/magic: Makefile.in
src/external/bsd/file/dist/python: Makefile.in
src/external/bsd/file/dist/src: Makefile.in
src/external/bsd/file/dist/tests: Makefile.in

Log Message:
Add configure glue


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.21 src/external/bsd/file/dist/Makefile.in
cvs rdiff -u -r0 -r1.16 src/external/bsd/file/dist/aclocal.m4
cvs rdiff -u -r0 -r1.17 src/external/bsd/file/dist/config.guess
cvs rdiff -u -r0 -r1.18 src/external/bsd/file/dist/config.h.in
cvs rdiff -u -r0 -r1.14 src/external/bsd/file/dist/config.sub \
src/external/bsd/file/dist/install-sh
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/file/dist/configure
cvs rdiff -u -r0 -r1.1 src/external/bsd/file/dist/configure~
cvs rdiff -u -r0 -r1.3 src/external/bsd/file/dist/ltmain.sh
cvs rdiff -u -r0 -r1.15 src/external/bsd/file/dist/doc/Makefile.in
cvs rdiff -u -r0 -r1.25 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r0 -r1.16 src/external/bsd/file/dist/python/Makefile.in
cvs rdiff -u -r0 -r1.18 src/external/bsd/file/dist/src/Makefile.in
cvs rdiff -u -r0 -r1.18 src/external/bsd/file/dist/tests/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Sep 24 20:21:46 UTC 2022

Modified Files:
src/external/bsd/file/dist: ChangeLog Makefile.am configure.ac
src/external/bsd/file/dist/doc: file.1 libmagic.3 magic.5
src/external/bsd/file/dist/magic: Makefile.am
src/external/bsd/file/dist/magic/magdir: apple archive cad coff
commands elf filesystems games geo jpeg linux mail.news msdos pgp
xenix
src/external/bsd/file/dist/src: apprentice.c cdf.c cdf_time.c
compress.c der.c encoding.c file.c file.h fsmagic.c funcs.c
is_csv.c is_json.c magic.c print.c readcdf.c readelf.c softmagic.c
Removed Files:
src/external/bsd/file/dist: Makefile.in README aclocal.m4 compile
config.guess config.h.in config.sub configure depcomp install-sh
ltmain.sh missing
src/external/bsd/file/dist/doc: Makefile.in
src/external/bsd/file/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
src/external/bsd/file/dist/magic: Makefile.in
src/external/bsd/file/dist/magic/magdir: guile neko
src/external/bsd/file/dist/python: Makefile.in
src/external/bsd/file/dist/src: Makefile.in
src/external/bsd/file/dist/tests: Makefile.in

Log Message:
merge changes between 5.40 and 5.43


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/ChangeLog
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/Makefile.am
cvs rdiff -u -r1.19 -r0 src/external/bsd/file/dist/Makefile.in
cvs rdiff -u -r1.1.1.12 -r0 src/external/bsd/file/dist/README
cvs rdiff -u -r1.14 -r0 src/external/bsd/file/dist/aclocal.m4
cvs rdiff -u -r1.11 -r0 src/external/bsd/file/dist/compile
cvs rdiff -u -r1.15 -r0 src/external/bsd/file/dist/config.guess
cvs rdiff -u -r1.16 -r0 src/external/bsd/file/dist/config.h.in
cvs rdiff -u -r1.12 -r0 src/external/bsd/file/dist/config.sub \
src/external/bsd/file/dist/install-sh
cvs rdiff -u -r1.24 -r0 src/external/bsd/file/dist/configure
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/configure.ac
cvs rdiff -u -r1.9 -r0 src/external/bsd/file/dist/depcomp
cvs rdiff -u -r1.1.1.8 -r0 src/external/bsd/file/dist/ltmain.sh
cvs rdiff -u -r1.10 -r0 src/external/bsd/file/dist/missing
cvs rdiff -u -r1.13 -r0 src/external/bsd/file/dist/doc/Makefile.in
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/doc/libmagic.3
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/file/dist/m4/libtool.m4 \
src/external/bsd/file/dist/m4/ltoptions.m4 \
src/external/bsd/file/dist/m4/ltversion.m4 \
src/external/bsd/file/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/file/dist/m4/ltsugar.m4
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/magic/Makefile.am
cvs rdiff -u -r1.23 -r0 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/magic/magdir/apple
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/magic/magdir/archive
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/cad \
src/external/bsd/file/dist/magic/magdir/coff \
src/external/bsd/file/dist/magic/magdir/commands \
src/external/bsd/file/dist/magic/magdir/games \
src/external/bsd/file/dist/magic/magdir/linux \
src/external/bsd/file/dist/magic/magdir/mail.news \
src/external/bsd/file/dist/magic/magdir/msdos \
src/external/bsd/file/dist/magic/magdir/xenix
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/magic/magdir/elf
cvs rdiff -u -r1.18 -r1.19 \
src/external/bsd/file/dist/magic/magdir/filesystems
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/geo \
src/external/bsd/file/dist/magic/magdir/jpeg
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/file/dist/magic/magdir/guile \
src/external/bsd/file/dist/magic/magdir/neko
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/magdir/pgp
cvs rdiff -u -r1.14 -r0 src/external/bsd/file/dist/python/Makefile.in
cvs rdiff -u -r1.16 -r0 src/external/bsd/file/dist/src/Makefile.in
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/file/dist/src/apprentice.c \
src/external/bsd/file/dist/src/file.h
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/src/cdf.c \
src/external/bsd/file/dist/src/funcs.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/src/cdf_time.c \
src/external/bsd/file/dist/src/encoding.c
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/src/compress.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/src/der.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/src/file.c \
src/external/bsd/file/dist/src/fsmagic.c \
src/external/bsd/file/dist/src/magic.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/src/is_csv.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/is_json.c
cvs rdiff -u -r1.15 

Re: CVS commit: src/external/bsd/file/dist/src

[Alan Barrett]

On Thu, 16 Jan 2014, Joerg Sonnenberger wrote:

Module Name:src
Committed By:   joerg
Date:   Thu Jan 16 23:36:52 UTC 2014

Modified Files:
src/external/bsd/file/dist/src: file.c

Log Message:
Only use __dead if it exists.


I think the code would be easier to read with

#ifndef __dead
#define __dead /* nothing */
#endif

--apb (Alan Barrett)