diff --git a/src/jrd/utl.cpp b/src/jrd/utl.cpp index 82d3ad28ab..0bb81e6a1d 100644 --- a/src/jrd/utl.cpp +++ b/src/jrd/utl.cpp @@ -1113,12 +1113,12 @@ BOOLEAN API_ROUTINE isc_set_path(TEXT* file_name, * the ISC_PATH user variable. * **************************************/ - TEXT *pathname, *p; /* look for the environment variables to tack onto the beginning of the database path */ - if (!(pathname = getenv("ISC_PATH"))) + const TEXT* pathname = getenv("ISC_PATH"); + if (!pathname) return FALSE; if (!file_length) @@ -1128,6 +1128,8 @@ BOOLEAN API_ROUTINE isc_set_path(TEXT* file_name, /* if the file already contains a remote node or any path at all forget it */ + TEXT *p; + for (p = file_name; *p; p++) if (*p == ':' || *p == '/' || *p == '\\') return FALSE;