RomanNum3ral
/
ly
mirror of https://github.com/fairyglade/ly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle the creation of LY_CFG_SAVE before ncurses initialization

This commit is contained in:
Timothée Floure 2018-06-26 11:08:07 +02:00
parent d9a5768af2
commit 2a5e5c8e47
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lang.h
View File

@ -13,8 +13,9 @@
#define LY_LANG_PASSWORD "password : " #define LY_LANG_PASSWORD "password : "
/* ioctl */ /* ioctl */
#define LY_ERR_FD "Failed to create the console file descriptor" #define LY_ERR_FD_CONSOLE "Failed to create the console file descriptor"
#define LY_ERR_FD_ADVICE "(ly probably wasn't run with enough privileges)" #define LY_ERR_FD_CONSOLE_ADVICE "(ly probably wasn't run with enough privileges)"
#define LY_ERR_FD_CFG_SAVE "Failed to create the config file"
/* pam */ /* pam */
#define LY_ERR_PAM_BUF "Memory buffer error" #define LY_ERR_PAM_BUF "Memory buffer error"

16
src/main.c
View File

@ -58,11 +58,20 @@ int main(void)
if(!console) if(!console)
{ {
fprintf(stderr, "%s\n", LY_ERR_FD); fprintf(stderr, "%s\n", LY_ERR_FD_CONSOLE);
fprintf(stderr, "%s\n", LY_ERR_FD_ADVICE); fprintf(stderr, "%s\n", LY_ERR_FD_CONSOLE_ADVICE);
return 0; return 0;
} }
/* create LY_CFG_SAVE if it doesn't exist yet */
FILE* cfg_save = fopen(LY_CFG_SAVE, "ab+");
if (!cfg_save)
{
fprintf(stderr, "%s: %s\n", LY_ERR_FD_CFG_SAVE, LY_CFG_SAVE);
return 0;
}
fclose(cfg_save);
kernel_log(0); kernel_log(0);
/* initializes ncurses UI */ /* initializes ncurses UI */
init_ncurses(console); init_ncurses(console);
@ -102,8 +111,7 @@ int main(void)
/* saves the username and DE if enabled */ /* saves the username and DE if enabled */
if(LY_CFG_WRITE_SAVE) if(LY_CFG_WRITE_SAVE)
{ {
FILE* file = fopen(LY_CFG_SAVE, "ab+"); FILE* file = fopen(LY_CFG_SAVE, "wb");
file = fopen(LY_CFG_SAVE, "wb");
fprintf(file, "%s\n%d", username, de_id); fprintf(file, "%s\n%d", username, de_id);
fclose(file); fclose(file);
} }

4
src/ncui.c
View File

@ -40,9 +40,7 @@ void init_form(struct ncform* form, char** list, int max_de, int* de_id)
char line[LY_LIM_LINE_FILE]; char line[LY_LIM_LINE_FILE];
char user[LY_LIM_LINE_FILE]; char user[LY_LIM_LINE_FILE];
int de; int de;
/* creates the file if it can't be found */
file = fopen(LY_CFG_SAVE, "ab+");
fclose(file);
/* opens the file */ /* opens the file */
file = fopen(LY_CFG_SAVE, "rb"); file = fopen(LY_CFG_SAVE, "rb");
memset(user, '\0', LY_LIM_LINE_FILE); memset(user, '\0', LY_LIM_LINE_FILE);