diff --git a/fish_shell/fish_globbing.c b/fish_shell/fish_globbing.c index 4e7d77c..6ae738f 100644 --- a/fish_shell/fish_globbing.c +++ b/fish_shell/fish_globbing.c @@ -270,7 +270,7 @@ WordList* getFiles(char* path, char* wildcardedString){ } -int wildcardedStringMatches(char* string1, char* string2){//TODO +int wildcardedStringMatches(char* string1, char* string2){ int i = 0; char tempIChar; diff --git a/fish_shell/fish_globbing.h b/fish_shell/fish_globbing.h index 690d9ae..aabb770 100644 --- a/fish_shell/fish_globbing.h +++ b/fish_shell/fish_globbing.h @@ -4,22 +4,34 @@ typedef struct dirent dirent; +/*send back a WordList containing every path correspnding to the different expand*/ WordList* fishExpand(WordList* wordArray); +/*return a WordList containing every file in a path corresponding to a bash-like regex*/ WordList* getFiles(char* path, char* wildcardedString); + +/*return a WordList containing every path corresponding to the expand of a word ( in shell meaning )*/ WordList* expandWord(char* word); +/*Launch recursively the expand for every directory, and add each found path in listToExpand*/ void recursiveExpandWord(char* path, WordList* listToExpand); +/*function returning true or false, depending on the regex matching of string2 with string1*/ int wildcardedStringMatches(char* string1, char* string2); + +/*transform a string in a word list by splitting on splitchar*/ WordList* splitWordIntoList(char* string, char splitchar); + +/*Given a string, return only the corresponding filename, deleting the path*/ char* getFileName(char* string); +/*Given a string, return only the corresponding path, cutting the filename*/ char* getPath(char* string); +/*Transform a word list into a string by concatenating every element of the list*/ char* concatWordListToWord(WordList* list, int firstElemIndex, int lastElemIndex); #endif //FISH_FISH_GLOBBING_H