Skip to content

<fix>(m_glob.c): off by one error in translate #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shea690901 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

<fix>(m_glob.c): off by one error in translate #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/std/modules/m_glob.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,18 @@ varargs string translate( string pat, int flag )
res += pat[i..i];
continue;
}
case '.':
case '.':
res += "\\" + pat[i..i];
continue;
case '*':
res += ".*";
continue;
case '?':
case '?':
res += ".";
continue;
case '[':
j=i;
// j=i; <= pat[i] == pat[j] == '['
j = i + 1
if( j<n && pat[j] == '!' ) j++;
#ifdef CARET_AS_NOT
if( j<n && pat[j] == '^' ) j++;
Expand Down Expand Up @@ -111,7 +112,7 @@ string* glob( mixed pathname ){
if( !stringp(pathname) ) return ({});
if( !has_magic(pathname) ){
if( path_exists( pathname ) ){
return ({ pathname });
return ({ pathname });
}
else{
return ({});
Expand All @@ -126,8 +127,8 @@ string* glob( mixed pathname ){
else{
list = ({ dirname });
}
result = ({}); // <= needed in both cases
if( !has_magic(basename) ){
result = ({});
i = sizeof(list);
while(i--){
dirname = list[i];
Expand All @@ -141,7 +142,6 @@ string* glob( mixed pathname ){
}
}
else{
result = ({});
i = sizeof(list);
while(i--){
dirname = list[i];
Expand All @@ -150,7 +150,7 @@ string* glob( mixed pathname ){
{
if( strlen(dirname) == 1 )
dirname = "";
else
else
dirname = dirname[0..<2];
}
sublist = glob1( dirname, basename );
Expand Down