klmp200
/
fish
mirror of https://gitlab.com/klmp200/fish.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ça ne leak plus, bash rend l'argent

This commit is contained in:
Aethor 2017-06-06 10:37:58 +02:00
parent 0d00964ee9
commit b568ec339a
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fish_shell/fish_globbing.c
View File

@ -66,7 +66,6 @@ WordList* expandWord(char* path){
WordList* expandedList = createWordList(); WordList* expandedList = createWordList();
recursiveExpandWord(path, expandedList); recursiveExpandWord(path, expandedList);
printWordList(expandedList);
return expandedList; return expandedList;
} }
@ -76,14 +75,12 @@ WordList* expandWord(char* path){
void recursiveExpandWord(char* path, WordList* listToExpand){ void recursiveExpandWord(char* path, WordList* listToExpand){
printf("launching recursive expand on %s\n", path);
int lastToExpand = 1; int lastToExpand = 1;
int i = 0; int i = 0;
int indexToExpand = -1; int indexToExpand = -1;
WordList* pathToList = splitWordIntoList(path, '/'); WordList* pathToList = splitWordIntoList(path, '/');
printWordList(pathToList);
WordListElement* tempElement; //beware of the size, should be checked before anyway (?) WordListElement* tempElement; //beware of the size, should be checked before anyway (?)
tempElement = pathToList->first; tempElement = pathToList->first;
@ -102,31 +99,36 @@ void recursiveExpandWord(char* path, WordList* listToExpand){
if(lastToExpand){ if(lastToExpand){
printf("found %i files in %s, looking for regex %s\n", getFiles(getPath(path), getFileName(path))->size,getPath(path), getFileName(path)); char* tmpPath = getPath(path);
concatWordList(listToExpand, getFiles(getPath(path), getFileName(path))); char* tmpFileName = getFileName(path);
printf("listToExpand should be : \n"); concatWordList(listToExpand, getFiles(tmpPath, tmpFileName));
printWordList(listToExpand); free(tmpPath);
free(pathToList); free(tmpFileName);
freeWordList(pathToList);
} }
else{ else{
char* correctedPath = concatWordListToWord(pathToList,0, indexToExpand + 1); char* correctedPath = concatWordListToWord(pathToList,0, indexToExpand + 1);
printf("correctedPath is : %s\n", correctedPath); char* pathOfCorrectedPath = getPath(correctedPath);
WordList* foundFiles = getFiles(getPath(correctedPath), getFileName(correctedPath)); char* fileNameOfCorrectedPath = getFileName(correctedPath);
printf("list of found files in %s, looking for regex %s:\n", getPath(correctedPath), getFileName(correctedPath)); WordList* foundFiles = getFiles(pathOfCorrectedPath, fileNameOfCorrectedPath);
printWordList(foundFiles); char* tmpWord = NULL;
free(pathOfCorrectedPath);
free(fileNameOfCorrectedPath);
free(correctedPath);
if(foundFiles->size > 0){ if(foundFiles->size > 0){
tempElement = foundFiles->first; tempElement = foundFiles->first;
char* concatenedEndOfPath = concatWordListToWord(pathToList, indexToExpand, pathToList->size - 1); char* concatenedEndOfPath = concatWordListToWord(pathToList, indexToExpand, pathToList->size - 1);
printf("list to be concatened is : \n");
printWordList(pathToList);
printf("concatenedEndOfPath is : %s\n", concatenedEndOfPath);
for(i=0; i < foundFiles->size; i++){ for(i=0; i < foundFiles->size; i++){
tmpWord = tempElement->word;
tempElement->word = trueStrcat(tempElement->word, concatenedEndOfPath); tempElement->word = trueStrcat(tempElement->word, concatenedEndOfPath);
free(tmpWord);
tmpWord = NULL;
recursiveExpandWord(tempElement->word, listToExpand); recursiveExpandWord(tempElement->word, listToExpand);
tempElement = tempElement->next; tempElement = tempElement->next;
@ -138,7 +140,6 @@ void recursiveExpandWord(char* path, WordList* listToExpand){
} }
freeWordList(pathToList); freeWordList(pathToList);
free(correctedPath);
freeWordList(foundFiles); freeWordList(foundFiles);
} }
@ -152,11 +153,11 @@ char* concatWordListToWord(WordList* list,int firstElemIndex, int lastElemIndex)
int i; int i;
char* concatenedString = (char*) malloc(sizeof(char)); char* concatenedString = (char*) malloc(sizeof(char));
char* tmpConcatenedString = concatenedString;
if(concatenedString == NULL) crash(); if(concatenedString == NULL) crash();
concatenedString[0] = '\0'; concatenedString[0] = '\0';
if(lastElemIndex > list->size -1){ if(lastElemIndex > list->size -1){
printf("last elem index was %i, while size-1 was %i\n", lastElemIndex, list->size - 1);
lastElemIndex = list->size - 1; lastElemIndex = list->size - 1;
fprintf(stderr, "fish : Warning : you are a miserable failure, your element is beyond the list. pfff. I corrected it for you.\n"); fprintf(stderr, "fish : Warning : you are a miserable failure, your element is beyond the list. pfff. I corrected it for you.\n");
} }
@ -174,6 +175,7 @@ char* concatWordListToWord(WordList* list,int firstElemIndex, int lastElemIndex)
for(i=firstElemIndex; i < lastElemIndex; i++){ for(i=firstElemIndex; i < lastElemIndex; i++){
concatenedString = trueStrcat(concatenedString, tempElement->word); concatenedString = trueStrcat(concatenedString, tempElement->word);
free(tmpConcatenedString);
tempElement = tempElement->next; tempElement = tempElement->next;
} }
@ -184,24 +186,23 @@ char* concatWordListToWord(WordList* list,int firstElemIndex, int lastElemIndex)
char* getFileName(char* string){ char* getFileName(char* string){
int wordSize = strlen(string) - 1;
if(!stringContains(string, '/')){ if(!stringContains(string, '/')){
return string; return string;
} }
else{ else{
/*int i = 0;
int i = wordSize;
while(string[i] != '/'){ while(string[i] != '/'){
i++; i--;
} }
return strndup(string + i + 1, strlen(string) - i);*/ return strndup(string + i + 1,wordSize);
int i = strlen(string) - 1;
while(string[i] != '/'){
i--;
}
printf("strndup SAID %s\n", strndup(string + 1 + i,strlen(string) - 1));
return strndup(string + i + 1,strlen(string) - 1);
} }
} }