Module Name: src
Committed By: tkusumi
Date: Sat Nov 16 12:26:54 UTC 2019
Modified Files:
src/usr.sbin/autofs: auto_master.5 defined.c
Log Message:
autofs: Support DOLLAR for $ literal
taken-from FreeBSD and DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/autofs/auto_master.5
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/autofs/defined.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/autofs/auto_master.5
diff -u src/usr.sbin/autofs/auto_master.5:1.6 src/usr.sbin/autofs/auto_master.5:1.7
--- src/usr.sbin/autofs/auto_master.5:1.6 Thu Jan 25 19:15:10 2018
+++ src/usr.sbin/autofs/auto_master.5 Sat Nov 16 12:26:54 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: auto_master.5,v 1.6 2018/01/25 19:15:10 uwe Exp $
+.\" $NetBSD: auto_master.5,v 1.7 2019/11/16 12:26:54 tkusumi Exp $
.\" Copyright (c) 2017 The NetBSD Foundation, Inc.
.\" Copyright (c) 2016 The DragonFly Project
.\" Copyright (c) 2014 The FreeBSD Foundation
@@ -33,7 +33,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 25, 2017
+.Dd November 16, 2019
.Dt AUTO_MASTER 5
.Os
.Sh NAME
@@ -195,6 +195,8 @@ Expands to the output of
.It Dv CPU
Same as
.Dv ARCH .
+.It Dv DOLLAR
+A literal $ sign.
.It Dv HOST
Expands to the output of
.Li "uname -n" .
Index: src/usr.sbin/autofs/defined.c
diff -u src/usr.sbin/autofs/defined.c:1.1 src/usr.sbin/autofs/defined.c:1.2
--- src/usr.sbin/autofs/defined.c:1.1 Tue Jan 9 03:31:15 2018
+++ src/usr.sbin/autofs/defined.c Sat Nov 16 12:26:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: defined.c,v 1.1 2018/01/09 03:31:15 christos Exp $ */
+/* $NetBSD: defined.c,v 1.2 2019/11/16 12:26:54 tkusumi Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: defined.c,v 1.1 2018/01/09 03:31:15 christos Exp $");
+__RCSID("$NetBSD: defined.c,v 1.2 2019/11/16 12:26:54 tkusumi Exp $");
/*
* All the "defined" stuff is for handling variables,
@@ -256,6 +256,7 @@ defined_init(void)
defined_add("ARCH", name.machine);
defined_add("CPU", name.machine);
+ defined_add("DOLLAR", "$");
defined_add("HOST", name.nodename);
defined_add("OSNAME", name.sysname);
defined_add("OSREL", name.release);
