octave-lyh: liboctave/oct-env.cc comparison

[project @ 2002-10-05 03:02:56 by jwe]

comparison

equal deleted inserted replaced

-:ddc722b38e87
+:a54f61b5d491
 retval = name;
 return retval;
 }
-// Return 1 if STRING contains an absolute pathname, else 0.
+#if defined (__CYGWIN__)
+#define IS_DIR_SEP(c) (c == '/' || c == '\\')
+#else
+#define IS_DIR_SEP(c) (c == '/')
+#endif
 bool
 octave_env::do_absolute_pathname (const std::string& s) const
 {
-if (s.empty ())
+size_t len = s.length ();
-return 0;
+if (len == 0)
+return false;
 if (s[0] == '/')
 return true;
+#if defined (__CYGWIN__)
+if (len > 2 && isalpha (s[0]) && s[1] == ':' && IS_DIR_SEP (s[2]))
+return true;
+#endif
 if (s[0] == '.')
 {
-if (s[1] == '\0' || s[1] == '/')
+if (len == 1 || IS_DIR_SEP (s[1]))
 	return true;
-if (s[1] == '.')
+if (s[1] == '.' && (len == 2 || IS_DIR_SEP (s[2])))
-	if (s[2] == '\0' || s[2] == '/')
+	return true;
-	  return true;
 }
 return false;
 }
 #if defined (__EMX__)
 if (s.length () > 1 && s[1] == ':')
 return s;
 #endif
-if (dot_path.empty () || s[0] == '/' || s.empty ())
+if (dot_path.empty () || s.empty () || do_absolute_pathname (s))
 return s;
 std::string current_path = dot_path;
 if (current_path.empty ())

Mercurial > hg > octave-lyh