Browse Source

Merge branch 'master' of gitlab.com:klmp200/fish

master
Antoine Bartuccio 1 year ago
parent
commit
4568e12652
Signed by: klmp200 <klmp200@klmp200.net> GPG Key ID: E7245548C53F904B
2 changed files with 13 additions and 1 deletions
  1. 1
    1
      fish_shell/fish_globbing.c
  2. 12
    0
      fish_shell/fish_globbing.h

+ 1
- 1
fish_shell/fish_globbing.c View File

@@ -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;

+ 12
- 0
fish_shell/fish_globbing.h View File

@@ -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

Loading…
Cancel
Save