# HG changeset patch # User jwe # Date 1052951017 0 # Node ID 34438519fac393307b637036b88ddc7253c81b9f # Parent cd14ff360ec81f1a87f1ca4a1b2a849635de25a6 [project @ 2003-05-14 22:23:37 by jwe] diff -r cd14ff360ec8 -r 34438519fac3 liboctave/ChangeLog --- a/liboctave/ChangeLog Wed May 14 01:10:28 2003 +0000 +++ b/liboctave/ChangeLog Wed May 14 22:23:37 2003 +0000 @@ -1,3 +1,9 @@ +2003-05-14 John W. Eaton + + * kpse.cc (kpse_path_iterator::next): Skip consecutive colons here. + (kpse_path_iterator::set_end): Don't miss last element when not + followed by a colon. + 2003-05-11 John W. Eaton * Array-idx.h (Array::index): Fix off-by-one error. diff -r cd14ff360ec8 -r 34438519fac3 liboctave/kpse.cc --- a/liboctave/kpse.cc Wed May 14 01:10:28 2003 +0000 +++ b/liboctave/kpse.cc Wed May 14 22:23:37 2003 +0000 @@ -545,7 +545,9 @@ { e = b + 1; - if (e >= len) + if (e == len) + ; /* OK, we have found the last element. */ + else if (e > len) b = e = NPOS; else { @@ -562,6 +564,10 @@ { b = e + 1; + /* Skip any consecutive colons. */ + while (kpse_is_env_sep (path[b]) && b < len) + b++; + if (b >= len) b = e = NPOS; else