summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-06-07 16:23:54 -0400
committerJune McEnroe <june@causal.agency>2020-06-08 16:46:02 -0400
commit3e530e05790261b3b97aeee69a5c7d40957ca9d4 (patch)
tree48ac1d802fdc1af375cca4f66e38b7907daeb3ea
parentRemove reference to FreeBSD-specific libedit hack (diff)
downloadsrc-3e530e05790261b3b97aeee69a5c7d40957ca9d4.tar.gz
src-3e530e05790261b3b97aeee69a5c7d40957ca9d4.zip
Replace __FBSDID macros with comments
sed -E 's|__FBSDID[(]"([^"]+)"[)];|/* \1 */|'
-rw-r--r--bin/1sh/alias.c2
-rw-r--r--bin/1sh/arith_yacc.c2
-rw-r--r--bin/1sh/arith_yylex.c2
-rw-r--r--bin/1sh/cd.c2
-rw-r--r--bin/1sh/echo.c2
-rw-r--r--bin/1sh/error.c2
-rw-r--r--bin/1sh/eval.c2
-rw-r--r--bin/1sh/exec.c2
-rw-r--r--bin/1sh/expand.c2
-rw-r--r--bin/1sh/histedit.c2
-rw-r--r--bin/1sh/input.c2
-rw-r--r--bin/1sh/jobs.c2
-rw-r--r--bin/1sh/kill.c2
-rw-r--r--bin/1sh/mail.c2
-rw-r--r--bin/1sh/main.c2
-rw-r--r--bin/1sh/memalloc.c2
-rw-r--r--bin/1sh/miscbltin.c2
-rw-r--r--bin/1sh/mknodes.c2
-rw-r--r--bin/1sh/mksyntax.c2
-rw-r--r--bin/1sh/mystring.c2
-rw-r--r--bin/1sh/options.c2
-rw-r--r--bin/1sh/output.c2
-rw-r--r--bin/1sh/parser.c2
-rw-r--r--bin/1sh/redir.c2
-rw-r--r--bin/1sh/show.c2
-rw-r--r--bin/1sh/test.c2
-rw-r--r--bin/1sh/trap.c2
-rw-r--r--bin/1sh/var.c2
28 files changed, 28 insertions, 28 deletions
diff --git a/bin/1sh/alias.c b/bin/1sh/alias.c
index 8f553cd1..e343b853 100644
--- a/bin/1sh/alias.c
+++ b/bin/1sh/alias.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/alias.c 317039 2017-04-16 22:10:02Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/alias.c 317039 2017-04-16 22:10:02Z jilles $ */
 
 #include <stdlib.h>
 #include "shell.h"
diff --git a/bin/1sh/arith_yacc.c b/bin/1sh/arith_yacc.c
index 6a96465a..08e25ab3 100644
--- a/bin/1sh/arith_yacc.c
+++ b/bin/1sh/arith_yacc.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/arith_yacc.c 345117 2019-03-13 21:53:10Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/arith_yacc.c 345117 2019-03-13 21:53:10Z jilles $ */
 
 #include <limits.h>
 #include <errno.h>
diff --git a/bin/1sh/arith_yylex.c b/bin/1sh/arith_yylex.c
index 9238c925..da3a4f70 100644
--- a/bin/1sh/arith_yylex.c
+++ b/bin/1sh/arith_yylex.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/arith_yylex.c 345117 2019-03-13 21:53:10Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/arith_yylex.c 345117 2019-03-13 21:53:10Z jilles $ */
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/bin/1sh/cd.c b/bin/1sh/cd.c
index de1350dc..61bb60cf 100644
--- a/bin/1sh/cd.c
+++ b/bin/1sh/cd.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/cd.c 336320 2018-07-15 21:55:17Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/cd.c 336320 2018-07-15 21:55:17Z jilles $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/1sh/echo.c b/bin/1sh/echo.c
index 2613955b..5fd50f59 100644
--- a/bin/1sh/echo.c
+++ b/bin/1sh/echo.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/bltin/echo.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/bltin/echo.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 /*
  * Echo command.
diff --git a/bin/1sh/error.c b/bin/1sh/error.c
index 463cc7b6..1cc55ded 100644
--- a/bin/1sh/error.c
+++ b/bin/1sh/error.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/error.c 314436 2017-02-28 23:42:47Z imp $");
+/* $FreeBSD: releng/12.1/bin/sh/error.c 314436 2017-02-28 23:42:47Z imp $ */
 
 /*
  * Errors and exceptions.
diff --git a/bin/1sh/eval.c b/bin/1sh/eval.c
index 67a40691..f4baf39e 100644
--- a/bin/1sh/eval.c
+++ b/bin/1sh/eval.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/eval.c 327212 2017-12-26 16:23:18Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/eval.c 327212 2017-12-26 16:23:18Z jilles $ */
 
 #include <paths.h>
 #include <signal.h>
diff --git a/bin/1sh/exec.c b/bin/1sh/exec.c
index 7897e024..985fbdeb 100644
--- a/bin/1sh/exec.c
+++ b/bin/1sh/exec.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/exec.c 336320 2018-07-15 21:55:17Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/exec.c 336320 2018-07-15 21:55:17Z jilles $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/1sh/expand.c b/bin/1sh/expand.c
index 8fde14f5..3bdd0733 100644
--- a/bin/1sh/expand.c
+++ b/bin/1sh/expand.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/expand.c 341767 2018-12-09 19:14:21Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/expand.c 341767 2018-12-09 19:14:21Z jilles $ */
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/1sh/histedit.c b/bin/1sh/histedit.c
index 459cc751..437cb15c 100644
--- a/bin/1sh/histedit.c
+++ b/bin/1sh/histedit.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/histedit.c 345613 2019-03-27 21:53:44Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/histedit.c 345613 2019-03-27 21:53:44Z jilles $ */
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/bin/1sh/input.c b/bin/1sh/input.c
index d4bc93df..37f689a5 100644
--- a/bin/1sh/input.c
+++ b/bin/1sh/input.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/input.c 314436 2017-02-28 23:42:47Z imp $");
+/* $FreeBSD: releng/12.1/bin/sh/input.c 314436 2017-02-28 23:42:47Z imp $ */
 
 #include <stdio.h>	/* defines BUFSIZ */
 #include <fcntl.h>
diff --git a/bin/1sh/jobs.c b/bin/1sh/jobs.c
index aa06e7de..492251e0 100644
--- a/bin/1sh/jobs.c
+++ b/bin/1sh/jobs.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/jobs.c 345487 2019-03-24 22:10:26Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/jobs.c 345487 2019-03-24 22:10:26Z jilles $ */
 
 #include <sys/ioctl.h>
 #include <sys/param.h>
diff --git a/bin/1sh/kill.c b/bin/1sh/kill.c
index ab36126d..6003fa9d 100644
--- a/bin/1sh/kill.c
+++ b/bin/1sh/kill.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)kill.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/kill/kill.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/kill/kill.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 #include <ctype.h>
 #include <err.h>
diff --git a/bin/1sh/mail.c b/bin/1sh/mail.c
index 01b370c6..adf54a06 100644
--- a/bin/1sh/mail.c
+++ b/bin/1sh/mail.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/mail.c 336303 2018-07-15 09:14:30Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/mail.c 336303 2018-07-15 09:14:30Z jilles $ */
 
 /*
  * Routines to check for mail.  (Perhaps make part of main.c?)
diff --git a/bin/1sh/main.c b/bin/1sh/main.c
index 86b6e981..3f0bc1da 100644
--- a/bin/1sh/main.c
+++ b/bin/1sh/main.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/main.c 336320 2018-07-15 21:55:17Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/main.c 336320 2018-07-15 21:55:17Z jilles $ */
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/bin/1sh/memalloc.c b/bin/1sh/memalloc.c
index dacc8c90..c53521ad 100644
--- a/bin/1sh/memalloc.c
+++ b/bin/1sh/memalloc.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/memalloc.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/memalloc.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 #include <sys/param.h>
 #include "shell.h"
diff --git a/bin/1sh/miscbltin.c b/bin/1sh/miscbltin.c
index 123593b0..66329850 100644
--- a/bin/1sh/miscbltin.c
+++ b/bin/1sh/miscbltin.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/miscbltin.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/miscbltin.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 /*
  * Miscellaneous builtins.
diff --git a/bin/1sh/mknodes.c b/bin/1sh/mknodes.c
index 41a93b09..a90acff1 100644
--- a/bin/1sh/mknodes.c
+++ b/bin/1sh/mknodes.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/mknodes.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/mknodes.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 /*
  * This program reads the nodetypes file and nodes.c.pat file.  It generates
diff --git a/bin/1sh/mksyntax.c b/bin/1sh/mksyntax.c
index d21c4565..b61378a9 100644
--- a/bin/1sh/mksyntax.c
+++ b/bin/1sh/mksyntax.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/mksyntax.c 334008 2018-05-21 21:52:48Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/mksyntax.c 334008 2018-05-21 21:52:48Z jilles $ */
 
 /*
  * This program creates syntax.h and syntax.c.
diff --git a/bin/1sh/mystring.c b/bin/1sh/mystring.c
index aecfb38c..ddeea4c1 100644
--- a/bin/1sh/mystring.c
+++ b/bin/1sh/mystring.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/mystring.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/mystring.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 /*
  * String functions.
diff --git a/bin/1sh/options.c b/bin/1sh/options.c
index 6327bd1d..a1bb57ca 100644
--- a/bin/1sh/options.c
+++ b/bin/1sh/options.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/options.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/options.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/1sh/output.c b/bin/1sh/output.c
index 26a83873..af93ec6d 100644
--- a/bin/1sh/output.c
+++ b/bin/1sh/output.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/output.c 345613 2019-03-27 21:53:44Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/output.c 345613 2019-03-27 21:53:44Z jilles $ */
 
 /*
  * Shell output routines.  We use our own output routines because:
diff --git a/bin/1sh/parser.c b/bin/1sh/parser.c
index 1038aa43..a6f976ed 100644
--- a/bin/1sh/parser.c
+++ b/bin/1sh/parser.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/parser.c 334008 2018-05-21 21:52:48Z jilles $");
+/* $FreeBSD: releng/12.1/bin/sh/parser.c 334008 2018-05-21 21:52:48Z jilles $ */
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/bin/1sh/redir.c b/bin/1sh/redir.c
index 494c88cd..f8fd9324 100644
--- a/bin/1sh/redir.c
+++ b/bin/1sh/redir.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/redir.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/redir.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/1sh/show.c b/bin/1sh/show.c
index e9c79883..a87a506d 100644
--- a/bin/1sh/show.c
+++ b/bin/1sh/show.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/show.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/show.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/bin/1sh/test.c b/bin/1sh/test.c
index fcebb292..594a7d89 100644
--- a/bin/1sh/test.c
+++ b/bin/1sh/test.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/test/test.c 298232 2016-04-19 00:38:07Z araujo $");
+/* $FreeBSD: releng/12.1/bin/test/test.c 298232 2016-04-19 00:38:07Z araujo $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/1sh/trap.c b/bin/1sh/trap.c
index 7025fe3b..fed13fcf 100644
--- a/bin/1sh/trap.c
+++ b/bin/1sh/trap.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/trap.c 326025 2017-11-20 19:49:47Z pfg $");
+/* $FreeBSD: releng/12.1/bin/sh/trap.c 326025 2017-11-20 19:49:47Z pfg $ */
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/1sh/var.c b/bin/1sh/var.c
index d7467cc7..23c56943 100644
--- a/bin/1sh/var.c
+++ b/bin/1sh/var.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/12.1/bin/sh/var.c 329221 2018-02-13 16:48:57Z bdrewery $");
+/* $FreeBSD: releng/12.1/bin/sh/var.c 329221 2018-02-13 16:48:57Z bdrewery $ */
 
 #include <unistd.h>
 #include <stdlib.h>