Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Libraries updates and cleanup

Browse Source 
* Updating common/lib
 * Updating lib/csu
 * Updating lib/libc
 * Updating libexec/ld.elf_so
 * Corrected test on __minix in featuretest to actually follow the
   meaning of the comment.
 * Cleaned up _REENTRANT-related defintions.
 * Disabled -D_REENTRANT for libfetch
 * Removing some unneeded __NBSD_LIBC defines and tests

Change-Id: Ic1394baef74d11b9f86b312f5ff4bbc3cbf72ce2
This commit is contained in:
Lionel Sambuc
2012-11-15 12:06:41 +01:00
parent f6aac1c3b5
commit f14fb60209
1285 changed files with 44244 additions and 14308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libexec/ld.elf_so/paths.c
View File

@@ -61,13 +61,17 @@ __RCSID("$NetBSD: paths.c,v 1.40 2009/05/19 20:44:52 christos Exp $");
static Search_Path *_rtld_find_path(Search_Path *, const char *, size_t);
static Search_Path **_rtld_append_path(Search_Path **, Search_Path **,
const char *, const char *, const char *);
#if !defined(__minix)
static void _rtld_process_mapping(Library_Xform **, const char *,
const char *);
#endif /* !defined(__minix) */
static char *exstrdup(const char *, const char *);
#if !defined(__minix)
static const char *getstr(const char **, const char *, const char *);
static const char *getcstr(const char **, const char *, const char *);
static const char *getword(const char **, const char *, const char *);
static int matchstr(const char *, const char *, const char *);
#endif /* !defined(__minix) */
static const char WS[] = " \t\n";
@@ -86,6 +90,7 @@ exstrdup(const char *bp, const char *ep)
return (cp);
}
#if !defined(__minix)
/*
* Like strsep(), but takes end of string and doesn't put any NUL. To
* detect empty string, compare `*p' and return value.
@@ -158,6 +163,7 @@ matchstr(const char *p, const char *bp, const char *ep)
return (*p == 0);
}
#endif /* !defined(__minix) */
static Search_Path *
_rtld_find_path(Search_Path *path, const char *pathstr, size_t pathlen)
@@ -228,6 +234,7 @@ _rtld_add_paths(const char *execname, Search_Path **path_p, const char *pathstr)
}
}
#if !defined(__minix)
/*
* Process library mappings of the form:
* <library_name> <machdep_variable> <value,...:library_name,...> ...
@@ -333,6 +340,7 @@ cleanup:
xfree(hwptr->name);
xfree(hwptr);
}
#endif /* !defined(__minix) */
void
_rtld_process_hints(const char *execname, Search_Path **path_p,
@@ -349,6 +357,7 @@ _rtld_process_hints(const char *execname, Search_Path **path_p,
struct stat st;
ssize_t sz;
Search_Path **head_p = path_p;
if ((fd = open(fname, O_RDONLY)) == -1) {
/* Don't complain */
return;