Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

__CONCAT does token pasting, not string concatnation. if something like:

Browse Source 
__CONCAT("PATH=",_PATH_STDPATH);
actually works to concantate strings, it's because the preprocessor expands
it into "PATH=""whatever _PATH_STDPATH is" as separate strings, and then
ANSI string concatenation is performed on that.  It's more straightforward
to just use ANSI string concatenation directly, and newer GCCs complain
(rightly) about mis-use of token pasting.
This commit is contained in:
cgd 2000-12-19 23:09:02 +00:00
parent 47a48d2057
commit 3e7f7ef82d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libutil/ttyaction.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ttyaction.c,v 1.14 2000/07/05 11:46:42 ad Exp $ */
/* $NetBSD: ttyaction.c,v 1.15 2000/12/19 23:09:02 cgd Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: ttyaction.c,v 1.14 2000/07/05 11:46:42 ad Exp $");
__RCSID("$NetBSD: ttyaction.c,v 1.15 2000/12/19 23:09:02 cgd Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@ -67,7 +67,7 @@ __RCSID("$NetBSD: ttyaction.c,v 1.14 2000/07/05 11:46:42 ad Exp $");
#endif
static char *actfile = _PATH_TTYACTION;
static char *pathenv = __CONCAT("PATH=",_PATH_STDPATH);
static char *pathenv = "PATH=" _PATH_STDPATH;
int
ttyaction(const char *tty, const char *act, const char *user)