Mercurial > octave-nkf
changeset 5618:36074b79a73b
[project @ 2006-02-13 18:23:59 by jwe]
| author | jwe |
|---|---|
| date | Mon, 13 Feb 2006 18:24:00 +0000 |
| parents | e92411b7eb21 |
| children | e9112ff172b1 |
| files | liboctave/ChangeLog liboctave/kpse.cc |
| diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Mon Feb 13 17:24:05 2006 +0000 +++ b/liboctave/ChangeLog Mon Feb 13 18:24:00 2006 +0000 @@ -1,8 +1,10 @@ 2006-02-13 John W. Eaton <jwe@octave.org> - * kpse.cc (kpse_path_iterator::operator =): Declare as private - function but don't define to prevent attempts to use assignment - operator. + * kpse.cc (kpse_path_iterator::next): Reverse order of tests in + while loop condition. + (kpse_path_iterator::operator =): Declare as private function but + don't define to prevent attempts to use assignment operator. + Don't define ST_NLINK_TRICK for Cygwin systems. 2006-02-10 John W. Eaton <jwe@octave.org>
--- a/liboctave/kpse.cc Mon Feb 13 17:24:05 2006 +0000 +++ b/liboctave/kpse.cc Mon Feb 13 18:24:00 2006 +0000 @@ -73,8 +73,9 @@ /* If you want to find subdirectories in a directory with non-Unix semantics (specifically, if a directory with no subdirectories does - not have exactly two links), define this. */ -#if !defined (DOSISH) || defined(__DJGPP__) + not have exactly two links), define this. Cygwin systems do not + have Unix semantics for network mapped drives. */ +#if defined(__DJGPP__) || ! (defined (DOSISH) || defined (__CYGWIN__)) /* Surprise! DJGPP returns st_nlink exactly like on Unix. */ #define ST_NLINK_TRICK #endif /* either not DOSISH or __DJGPP__ */ @@ -465,7 +466,7 @@ b = e + 1; /* Skip any consecutive colons. */ - while (kpse_is_env_sep (path[b]) && b < len) + while (b < len && kpse_is_env_sep (path[b])) b++; if (b >= len)