add expand_from()

This commit is contained in:
David Rose 2002-06-26 17:38:44 +00:00
parent b0bdc0639c
commit 0821c7c48a
2 changed files with 15 additions and 0 deletions

View File

@ -313,6 +313,19 @@ from_os_specific(const string &os_specific, Filename::Type type) {
#endif // WIN32
}
////////////////////////////////////////////////////////////////////
// Function: Filename::expand_from
// Access: Public, Static
// Description: Returns the same thing as from_os_specific(), but
// embedded environment variable references
// (e.g. "$DMODELS/foo.txt") are expanded out.
////////////////////////////////////////////////////////////////////
Filename Filename::
expand_from(const string &os_specific, Filename::Type type) {
return from_os_specific(ExecutionEnvironment::expand_string(os_specific),
type);
}
////////////////////////////////////////////////////////////////////
// Function: Filename::temporary
// Access: Public

View File

@ -77,6 +77,8 @@ PUBLISHED:
static Filename from_os_specific(const string &os_specific,
Type type = T_general);
static Filename expand_from(const string &user_string,
Type type = T_general);
static Filename temporary(const string &dirname, const string &prefix,
Type type = T_general);