Author: kib
Date: Mon Mar 12 12:29:31 2012
New Revision: 232863
URL: http://svn.freebsd.org/changeset/base/232863
Log:
MFC r232572:
Use hand-made isspace1() macro which is enough to detect spaces in
libmap.conf.
MFC r232590 (by pluknet):
Rename isspace1() macro to the more appropriate rtld_isspace().
Modified:
stable/9/libexec/rtld-elf/libmap.c
Directory Properties:
stable/9/libexec/rtld-elf/ (props changed)
Modified: stable/9/libexec/rtld-elf/libmap.c
==============================================================================
--- stable/9/libexec/rtld-elf/libmap.c Mon Mar 12 12:16:08 2012
(r232862)
+++ stable/9/libexec/rtld-elf/libmap.c Mon Mar 12 12:29:31 2012
(r232863)
@@ -3,7 +3,6 @@
*/
#include <stdio.h>
-#include <ctype.h>
#include <string.h>
#include <stdlib.h>
#include <sys/queue.h>
@@ -53,6 +52,12 @@ static int closestrfn (void * cookie);
#define iseol(c) (((c) == '#') || ((c) == '\0') || \
((c) == '\n') || ((c) == '\r'))
+/*
+ * Do not use ctype.h macros, which rely on working TLS. It is
+ * too early to have thread-local variables functional.
+ */
+#define rtld_isspace(c) ((c) == ' ' || (c) == '\t')
+
int
lm_init (char *libmap_override)
{
@@ -107,7 +112,7 @@ lmc_parse (FILE *fp)
t = f = c = NULL;
/* Skip over leading space */
- while (isspace(*cp)) cp++;
+ while (rtld_isspace(*cp)) cp++;
/* Found a comment or EOL */
if (iseol(*cp)) continue;
@@ -117,7 +122,7 @@ lmc_parse (FILE *fp)
cp++;
/* Skip leading space */
- while (isspace(*cp)) cp++;
+ while (rtld_isspace(*cp)) cp++;
/* Found comment, EOL or end of selector */
if (iseol(*cp) || *cp == ']')
@@ -125,11 +130,11 @@ lmc_parse (FILE *fp)
c = cp++;
/* Skip to end of word */
- while (!isspace(*cp) && !iseol(*cp) && *cp != ']')
+ while (!rtld_isspace(*cp) && !iseol(*cp) && *cp != ']')
cp++;
/* Skip and zero out trailing space */
- while (isspace(*cp)) *cp++ = '\0';
+ while (rtld_isspace(*cp)) *cp++ = '\0';
/* Check if there is a closing brace */
if (*cp != ']') continue;
@@ -141,7 +146,7 @@ lmc_parse (FILE *fp)
* There should be nothing except whitespace or comment
from this point to the end of the line.
*/
- while(isspace(*cp)) cp++;
+ while(rtld_isspace(*cp)) cp++;
if (!iseol(*cp)) continue;
strcpy(prog, c);
@@ -151,20 +156,20 @@ lmc_parse (FILE *fp)
/* Parse the 'from' candidate. */
f = cp++;
- while (!isspace(*cp) && !iseol(*cp)) cp++;
+ while (!rtld_isspace(*cp) && !iseol(*cp)) cp++;
/* Skip and zero out the trailing whitespace */
- while (isspace(*cp)) *cp++ = '\0';
+ while (rtld_isspace(*cp)) *cp++ = '\0';
/* Found a comment or EOL */
if (iseol(*cp)) continue;
/* Parse 'to' mapping */
t = cp++;
- while (!isspace(*cp) && !iseol(*cp)) cp++;
+ while (!rtld_isspace(*cp) && !iseol(*cp)) cp++;
/* Skip and zero out the trailing whitespace */
- while (isspace(*cp)) *cp++ = '\0';
+ while (rtld_isspace(*cp)) *cp++ = '\0';
/* Should be no extra tokens at this point */
if (!iseol(*cp)) continue;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
