diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 9b68f669202e..40c502b3ecdd 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,251 +1,261 @@
 .\" Copyright (c) 1987, 1990, 1993
 .\"	The Regents of the University of California.  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.
 .\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
 .\"
 .\"     @(#)ctags.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd June 6, 1993
+.Dd May 23, 2023
 .Dt CTAGS 1
 .Os
 .Sh NAME
 .Nm ctags
 .Nd create a
 .Pa tags
 file
 .Sh SYNOPSIS
 .Nm
 .Op Fl BFTaduwvx
 .Op Fl f Ar tagsfile
 .Ar
 .Sh DESCRIPTION
 The
 .Nm
 utility makes a
 .Pa tags
 file for
 .Xr ex 1
 from the specified C,
 Pascal, Fortran,
 .Xr yacc 1 ,
 .Xr lex 1 ,
 and Lisp sources.
 A tags file gives the locations of specified objects in a group of files.
 Each line of the tags file contains the object name, the file in which it
 is defined, and a search pattern for the object definition, separated by
 white-space.
 Using the
 .Pa tags
 file,
 .Xr ex 1
 can quickly locate these object definitions.
 Depending upon the options provided to
 .Nm ,
 objects will consist of subroutines, typedefs, defines, structs,
 enums and unions.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl B
 Use backward searching patterns
 .Pq Li ?...? .
 .It Fl F
 Use forward searching patterns
 .Pq Li /.../
 (the default).
 .It Fl T
 Do not create tags for typedefs, structs, unions, and enums.
 .It Fl a
 Append to
 .Pa tags
 file.
 .It Fl d
 Create tags for
 .Li #defines
 that do not take arguments;
 .Li #defines
 that take arguments are tagged automatically.
 .It Fl f
 Place the tag descriptions in a file called
 .Ar tagsfile .
 The default behaviour is to place them in a file called
 .Pa tags .
+If
+.Ar tagsfile
+is
+.Dq - ,
+the tags will be written to standard output instead.
 .It Fl u
 Update the specified files in the
 .Pa tags
 file, that is, all
 references to them are deleted, and the new values are appended to the
 file.
-(Beware: this option is implemented in a way which is rather
+This is ignored if the tags file does not exist or is not a regular
+file (e.g.
+.Fl f Ns -
+was used to write to standard output).
+.Pp
+Beware: this option is implemented in a way which is rather
 slow; it is usually faster to simply rebuild the
 .Pa tags
-file.)
+file.
 .It Fl v
 An index of the form expected by
 .Xr vgrind 1
 is produced on the standard output.
 This listing
 contains the object name, file name, and page number (assuming 64
 line pages).
 Since the output will be sorted into lexicographic order,
 it may be desired to run the output through
 .Xr sort 1 .
 Sample use:
 .Bd -literal -offset indent
 ctags -v files | sort -f > index
 vgrind -x index
 .Ed
 .It Fl w
 Suppress warning diagnostics.
 .It Fl x
 .Nm
 produces a list of object
 names, the line number and file name on which each is defined, as well
 as the text of that line and prints this on the standard output.
 This
 is a simple index which can be printed out as an off-line readable
 function index.
 .El
 .Pp
 Files whose names end in
 .Pa .c
 or
 .Pa .h
 are assumed to be C
 source files and are searched for C style routine and macro definitions.
 Files whose names end in
 .Pa .y
 are assumed to be
 .Xr yacc 1
 source files.
 Files whose names end in
 .Pa .l
 are assumed to be Lisp files if their
 first non-blank character is
 .Ql \&; ,
 .Ql \&( ,
 or
 .Ql \&[ ,
 otherwise, they are
 treated as
 .Xr lex 1
 files.
 Other files are first examined to see if they
 contain any Pascal or Fortran routine definitions, and, if not, are
 searched for C style definitions.
 .Pp
 The tag
 .Dq Li main
 is treated specially in C programs.
 The tag formed
 is created by prepending
 .Ql M
 to the name of the file, with the
 trailing
 .Pa .c
 and any leading pathname components removed.
 This makes use of
 .Nm
 practical in directories with more than one
 program.
 .Pp
 The
 .Xr yacc 1
 and
 .Xr lex 1
 files each have a special tag.
 .Dq Li yyparse
 is the start
 of the second section of the
 .Xr yacc 1
 file, and
 .Dq Li yylex
 is the start of
 the second section of the
 .Xr lex 1
 file.
 .Sh FILES
 .Bl -tag -width ".Pa tags" -compact
 .It Pa tags
 default output tags file
 .El
 .Sh EXIT STATUS
 The
 .Nm
 utility exits with a value of 1 if an error occurred, 0 otherwise.
 Duplicate objects are not considered errors.
 .Sh COMPATIBILITY
 The
 .Fl t
 option is a no-op for compatibility with previous versions of
 .Nm
 that did not create tags for typedefs, enums, structs and unions
 by default.
 .Sh SEE ALSO
 .Xr ex 1 ,
 .Xr vi 1
 .Sh STANDARDS
 The
 .Nm
 utility conforms to
 .St -p1003.1-2001 .
 .Sh HISTORY
 The
 .Nm
 utility appeared in
 .Bx 3.0 .
 .Sh BUGS
 Recognition of functions, subroutines and procedures
 for Fortran and Pascal is done in a very simpleminded way.
 No attempt
 is made to deal with block structure; if you have two Pascal procedures
 in different blocks with the same name you lose.
 The
 .Nm
 utility does not
 understand about Pascal types.
 .Pp
 The method of deciding whether to look for C, Pascal or
 Fortran
 functions is a hack.
 .Pp
 The
 .Nm
 utility relies on the input being well formed, and any syntactical
 errors will completely confuse it.
 It also finds some legal syntax
 confusing; for example, since it does not understand
 .Li #ifdef Ns 's
 (incidentally, that is a feature, not a bug), any code with unbalanced
 braces inside
 .Li #ifdef Ns 's
 will cause it to become somewhat disoriented.
 In a similar fashion, multiple line changes within a definition will
 cause it to enter the last line of the object, rather than the first, as
 the searching pattern.
 The last line of multiple line
 .Li typedef Ns 's
 will similarly be noted.
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 409b07f5354b..d94b6e87ae1b 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,326 +1,345 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 1987, 1993, 1994, 1995
  *	The Regents of the University of California.  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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
  */
 
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
 #endif
 #endif
 
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
-__FBSDID("$FreeBSD$");
 
 #include <err.h>
+#include <errno.h>
 #include <limits.h>
 #include <locale.h>
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "ctags.h"
 
 /*
  * ctags: create a tags file
  */
 
 NODE	*head;			/* head of the sorted binary tree */
 
 				/* boolean "func" (see init()) */
 bool	_wht[256], _etk[256], _itk[256], _btk[256], _gd[256];
 
 FILE	*inf;			/* ioptr for current input file */
 FILE	*outf;			/* ioptr for tags file */
 
 long	lineftell;		/* ftell after getc( inf ) == '\n' */
 
 int	lineno;			/* line number of current line */
 int	dflag;			/* -d: non-macro defines */
 int	tflag;			/* -t: create tags for typedefs */
 int	vflag;			/* -v: vgrind style index output */
 int	wflag;			/* -w: suppress warnings */
 int	xflag;			/* -x: cxref style output */
 
 char	*curfile;		/* current input file name */
 char	searchar = '/';		/* use /.../ searches by default */
 char	lbuf[LINE_MAX];
 
 void	init(void);
 void	find_entries(char *);
 static void usage(void);
 
 int
 main(int argc, char **argv)
 {
 	static const char	*outfile = "tags";	/* output file */
 	int	aflag;				/* -a: append to tags */
 	int	uflag;				/* -u: update tags */
 	int	exit_val;			/* exit value */
 	int	step;				/* step through args */
 	int	ch;				/* getopts char */
 
 	setlocale(LC_ALL, "");
 
 	aflag = uflag = NO;
 	tflag = YES;
 	while ((ch = getopt(argc, argv, "BFTadf:tuwvx")) != -1)
 		switch(ch) {
 		case 'B':
 			searchar = '?';
 			break;
 		case 'F':
 			searchar = '/';
 			break;
 		case 'T':
 			tflag = NO;
 			break;
 		case 'a':
 			aflag++;
 			break;
 		case 'd':
 			dflag++;
 			break;
 		case 'f':
 			outfile = optarg;
 			break;
 		case 't':
 			tflag = YES;
 			break;
 		case 'u':
 			uflag++;
 			break;
 		case 'w':
 			wflag++;
 			break;
 		case 'v':
 			vflag++;
 		case 'x':
 			xflag++;
 			break;
 		case '?':
 		default:
 			usage();
 		}
 	argv += optind;
 	argc -= optind;
 	if (!argc)
 		usage();
 
+	if (strcmp(outfile, "-") == 0)
+		outfile = "/dev/stdout";
+
 	if (!xflag)
 		setlocale(LC_COLLATE, "C");
 
 	init();
 
 	for (exit_val = step = 0; step < argc; ++step)
 		if (!(inf = fopen(argv[step], "r"))) {
 			warn("%s", argv[step]);
 			exit_val = 1;
 		}
 		else {
 			curfile = argv[step];
 			find_entries(argv[step]);
 			(void)fclose(inf);
 		}
 
 	if (head) {
 		if (xflag)
 			put_entries(head);
 		else {
 			if (uflag) {
+				struct stat sb;
 				FILE *oldf;
 				regex_t *regx;
 
-				if ((oldf = fopen(outfile, "r")) == NULL)
+				if ((oldf = fopen(outfile, "r")) == NULL) {
+					if (errno == ENOENT) {
+						uflag = 0;
+						goto udone;
+					}
 					err(1, "opening %s", outfile);
+				}
+				if (fstat(fileno(oldf), &sb) != 0 ||
+				    !S_ISREG(sb.st_mode)) {
+					fclose(oldf);
+					uflag = 0;
+					goto udone;
+				}
 				if (unlink(outfile))
 					err(1, "unlinking %s", outfile);
 				if ((outf = fopen(outfile, "w")) == NULL)
 					err(1, "recreating %s", outfile);
 				if ((regx = calloc(argc, sizeof(regex_t))) == NULL)
 					err(1, "RE alloc");
 				for (step = 0; step < argc; step++) {
 					(void)strcpy(lbuf, "\t");
 					(void)strlcat(lbuf, argv[step], LINE_MAX);
 					(void)strlcat(lbuf, "\t", LINE_MAX);
 					if (regcomp(regx + step, lbuf,
 					    REG_NOSPEC))
 						warn("RE compilation failed");
 				}
 nextline:
 				while (fgets(lbuf, LINE_MAX, oldf)) {
 					for (step = 0; step < argc; step++)
 						if (regexec(regx + step,
 						    lbuf, 0, NULL, 0) == 0)
 							goto nextline;
 					fputs(lbuf, outf);
 				}
 				for (step = 0; step < argc; step++)
 					regfree(regx + step);
 				free(regx);
 				fclose(oldf);
 				fclose(outf);
 				++aflag;
 			}
+udone:
 			if (!(outf = fopen(outfile, aflag ? "a" : "w")))
 				err(1, "%s", outfile);
 			put_entries(head);
 			(void)fclose(outf);
 			if (uflag) {
 				pid_t pid;
 
 				if ((pid = fork()) == -1)
 					err(1, "fork failed");
 				else if (pid == 0) {
 					execlp("sort", "sort", "-o", outfile,
 					    outfile, NULL);
 					err(1, "exec of sort failed");
 				}
 				/* Just assume the sort went OK. The old code
 				   did not do any checks either. */
 				(void)wait(NULL);
 			}
 		}
 	}
 	if (ferror(stdout) != 0 || fflush(stdout) != 0)
 		err(1, "stdout");
 	exit(exit_val);
 }
 
 static void
 usage(void)
 {
 	(void)fprintf(stderr, "usage: ctags [-BFTaduwvx] [-f tagsfile] file ...\n");
 	exit(1);
 }
 
 /*
  * init --
  *	this routine sets up the boolean pseudo-functions which work by
  *	setting boolean flags dependent upon the corresponding character.
  *	Every char which is NOT in that string is false with respect to
  *	the pseudo-function.  Therefore, all of the array "_wht" is NO
  *	by default and then the elements subscripted by the chars in
  *	CWHITE are set to YES.  Thus, "_wht" of a char is YES if it is in
  *	the string CWHITE, else NO.
  */
 void
 init(void)
 {
 	int		i;
 	const unsigned char	*sp;
 
 	for (i = 0; i < 256; i++) {
 		_wht[i] = _etk[i] = _itk[i] = _btk[i] = NO;
 		_gd[i] = YES;
 	}
 #define	CWHITE	" \f\t\n"
 	for (sp = CWHITE; *sp; sp++)	/* white space chars */
 		_wht[*sp] = YES;
 #define	CTOKEN	" \t\n\"'#()[]{}=-+%*/&|^~!<>;,.:?"
 	for (sp = CTOKEN; *sp; sp++)	/* token ending chars */
 		_etk[*sp] = YES;
 #define	CINTOK	"ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz0123456789"
 	for (sp = CINTOK; *sp; sp++)	/* valid in-token chars */
 		_itk[*sp] = YES;
 #define	CBEGIN	"ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
 	for (sp = CBEGIN; *sp; sp++)	/* token starting chars */
 		_btk[*sp] = YES;
 #define	CNOTGD	",;"
 	for (sp = CNOTGD; *sp; sp++)	/* invalid after-function chars */
 		_gd[*sp] = NO;
 }
 
 /*
  * find_entries --
  *	this routine opens the specified file and calls the function
  *	which searches the file.
  */
 void
 find_entries(char *file)
 {
 	char	*cp;
 
 	lineno = 0;				/* should be 1 ?? KB */
 	if ((cp = strrchr(file, '.'))) {
 		if (cp[1] == 'l' && !cp[2]) {
 			int	c;
 
 			for (;;) {
 				if (GETC(==, EOF))
 					return;
 				if (!iswhite(c)) {
 					rewind(inf);
 					break;
 				}
 			}
 #define	LISPCHR	";(["
 /* lisp */		if (strchr(LISPCHR, c)) {
 				l_entries();
 				return;
 			}
 /* lex */		else {
 				/*
 				 * we search all 3 parts of a lex file
 				 * for C references.  This may be wrong.
 				 */
 				toss_yysec();
 				(void)strcpy(lbuf, "%%$");
 				pfnote("yylex", lineno);
 				rewind(inf);
 			}
 		}
 /* yacc */	else if (cp[1] == 'y' && !cp[2]) {
 			/*
 			 * we search only the 3rd part of a yacc file
 			 * for C references.  This may be wrong.
 			 */
 			toss_yysec();
 			(void)strcpy(lbuf, "%%$");
 			pfnote("yyparse", lineno);
 			y_entries();
 		}
 /* fortran */	else if ((cp[1] != 'c' && cp[1] != 'h') && !cp[2]) {
 			if (PF_funcs())
 				return;
 			rewind(inf);
 		}
 	}
 /* C */	c_entries();
 }