libutils: clean up some code

This commit is contained in:
Fries 2022-04-28 18:30:13 -07:00
parent d9a58c5751
commit bdd58c27d9
4 changed files with 9 additions and 20 deletions

View File

@ -1,18 +1,14 @@
#include <dirent.h>
#include <errno.h>
#include <stdlib.h>
int checkDir(char* directory) {
DIR *dir = opendir(directory);
DIR *dir = opendir (directory);
if (dir) {
closedir(dir);
free (directory);
closedir (dir);
return 1;
} else if (ENOENT == errno) {
free (directory);
return 0;
} else {
free (directory);
return 0;
}
}

View File

@ -2,5 +2,5 @@
#include <unistd.h>
void createDir(const char* directory) {
mkdir(directory, 0777);
mkdir (directory, 0777);
}

View File

@ -6,29 +6,22 @@
#include "createDir.h"
char* flatpakCheck() {
char *checkFileName;
char *homeDirectory = getenv ("HOME");
char *mosaicDirectory;
char *homeDirectory = getenv ("HOME");
if (isFlatpak()) {
char *xdgdatahome = getenv ("XDG_DATA_HOME");
return xdgdatahome;
}
checkFileName = (char *)malloc((
strlen (getenv ("HOME") + strlen (".mosaic"))
));
sprintf (checkFileName, "%s/%s", homeDirectory, ".mosaic");
mosaicDirectory = (char *)malloc((
strlen (homeDirectory + strlen("/") + strlen(".mosaic"))
strlen (homeDirectory + strlen ("/") + strlen (".mosaic"))
));
sprintf(mosaicDirectory, "%s/%s", homeDirectory, ".mosaic");
if (!checkDir(mosaicDirectory))
createDir (mosaicDirectory);
if (!checkDir(checkFileName))
createDir(mosaicDirectory);
return mosaicDirectory;
}

View File

@ -3,7 +3,7 @@
int isFlatpak() {
FILE *file;
if ((file = fopen("/.flatpak-info", "r"))) {
fclose(file);
fclose (file);
return 1;
} else {
return 0;