klmp200/fish
1
0
Fork 0
mirror of https://gitlab.com/klmp200/fish.git synced 2024-11-21 16:23:20 +00:00
Code Issues Releases Wiki Activity

Please dont be invaliiiiiiid, yeah-eah

Browse Source
This commit is contained in:
Aethor 2017-06-07 17:58:44 +02:00
parent b568ec339a
commit 1b99d6cfe5
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fish_shell/fish_globbing.c
View File

@ -38,6 +38,7 @@ WordList * fishExpand(WordList *wordList) {
tempElement = tempElement->next;
}
freeWordList(wordList);
@ -122,14 +123,20 @@ void recursiveExpandWord(char* path, WordList* listToExpand){
tempElement = foundFiles->first;
char* concatenedEndOfPath = concatWordListToWord(pathToList, indexToExpand, pathToList->size - 1);
int isDir;
for(i=0; i < foundFiles->size; i++){
tmpWord = tempElement->word;
isDir = isDirectory(tmpWord);
tempElement->word = trueStrcat(tempElement->word, concatenedEndOfPath);
free(tmpWord);
tmpWord = NULL;
if(isDir){
recursiveExpandWord(tempElement->word, listToExpand);
}
tempElement = tempElement->next;
@ -153,7 +160,7 @@ char* concatWordListToWord(WordList* list,int firstElemIndex, int lastElemIndex)
int i;
char* concatenedString = (char*) malloc(sizeof(char));
char* tmpConcatenedString = concatenedString;
char* tmpConcatenedString = NULL;
if(concatenedString == NULL) crash();
concatenedString[0] = '\0';
@ -174,6 +181,7 @@ char* concatWordListToWord(WordList* list,int firstElemIndex, int lastElemIndex)
}
for(i=firstElemIndex; i < lastElemIndex; i++){
tmpConcatenedString = concatenedString;
concatenedString = trueStrcat(concatenedString, tempElement->word);
free(tmpConcatenedString);
tempElement = tempElement->next;

21
fish_shell/fish_utils.c
View File

@ -7,6 +7,8 @@
#include <string.h>
#include <time.h>
#include <pcre.h>
#include <dirent.h>
#include <errno.h>
#include "fish_utils.h"
#include "fish_types.h"
@ -343,3 +345,22 @@ char* trueStrcat(char* string1, char* string2){
return newString;
}
int isDirectory(char* path){
DIR* directory = opendir(path);
//printf("testing %s\n", path);
if(directory != NULL){
closedir(directory);
return 1;
}
else if(errno == ENOTDIR){
return 0;
}
else{
fprintf(stderr, "fish : Warning : %s is an invalid path you stupid human\n", path);
return 0; //hihi
}
}

2
fish_shell/fish_utils.h
View File

@ -43,5 +43,7 @@ int stringContains(char* string, char charToTest);
char* trueStrcat(char* string1, char* string2);
int isDirectory(char* path);
#endif //FISH_FISH_UTILS_H