From 16d1325f96f7823289c1d1978e40bf679aaf376a Mon Sep 17 00:00:00 2001 From: rmntgx Date: Sun, 29 Jun 2025 10:56:31 +0500 Subject: [PATCH 1/2] style: formatting and linter satisfaction --- include/launch_state.h | 11 +++++++---- src/launch_state.c | 34 +++++++++++++++++----------------- src/ui.c | 16 +++++++++------- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/include/launch_state.h b/include/launch_state.h index bc05bba..eb15b23 100644 --- a/include/launch_state.h +++ b/include/launch_state.h @@ -1,9 +1,12 @@ -#ifndef _LAUNCHSTATEH_ -#define _LAUNCHSTATEH_ +#ifndef LAUNCHSTATEH_ +#define LAUNCHSTATEH_ + +#include +#include struct LaunchState { - int user_opt; - int session_opt; + int user_opt; + int session_opt; }; struct LaunchState read_launch_state(); diff --git a/src/launch_state.c b/src/launch_state.c index 9ac2ac6..381209d 100644 --- a/src/launch_state.c +++ b/src/launch_state.c @@ -1,27 +1,27 @@ -// Small file to save last selection +// Small file for saving last selection #define STATE_PATH "/var/lib/lidm/state" -#include -#include - #include "launch_state.h" struct LaunchState read_launch_state() { - struct LaunchState state; - state.user_opt = 1; - state.session_opt = 1; - FILE* f = fopen(STATE_PATH, "r"); - if(!f) return state; - fscanf(f, "%i;%i", &state.user_opt, &state.session_opt); - fclose(f); - return state; + struct LaunchState state; + state.user_opt = 1; + state.session_opt = 1; + FILE* state_fd = fopen(STATE_PATH, "r"); + if (!state_fd) return state; + if (fscanf(state_fd, "%i;%i", &state.user_opt, &state.session_opt) != 2) { + state.user_opt = 1; + state.session_opt = 1; + } + (void)fclose(state_fd); + return state; } bool write_launch_state(struct LaunchState state) { - FILE* f = fopen(STATE_PATH, "w"); - if(!f) return false; - fprintf(f, "%i;%i", state.user_opt, state.session_opt); - fclose(f); - return true; + FILE* state_fd = fopen(STATE_PATH, "w"); + if (!state_fd) return false; + (void)fprintf(state_fd, "%i;%i", state.user_opt, state.session_opt); + (void)fclose(state_fd); + return true; } diff --git a/src/ui.c b/src/ui.c index 26c380b..f411c75 100644 --- a/src/ui.c +++ b/src/ui.c @@ -20,13 +20,13 @@ #include "auth.h" #include "efield.h" #include "keys.h" +#include "launch_state.h" #include "ofield.h" #include "sessions.h" #include "ui.h" #include "ui_state.h" #include "users.h" #include "util.h" -#include "launch_state.h" const u_char INPUTS_N = 3; @@ -200,9 +200,11 @@ int load(struct Vector* users, struct Vector* sessions) { of_passwd = ofield_new(0); struct LaunchState initial_state = read_launch_state(); - if(initial_state.user_opt > users->length || initial_state.session_opt > sessions->length + g_config->behavior.include_defshell) { - initial_state.user_opt = 1; - initial_state.session_opt = 1; + if (initial_state.user_opt > users->length || + initial_state.session_opt > + sessions->length + g_config->behavior.include_defshell) { + initial_state.user_opt = 1; + initial_state.session_opt = 1; } of_user.current_opt = initial_state.user_opt; of_session.current_opt = initial_state.session_opt; @@ -264,9 +266,9 @@ int load(struct Vector* users, struct Vector* sessions) { } else { if (len == 1 && *seq == '\n') { struct LaunchState ls; - ls.user_opt = of_user.current_opt; - ls.session_opt = of_session.current_opt; - write_launch_state(ls); + ls.user_opt = of_user.current_opt; + ls.session_opt = of_session.current_opt; + write_launch_state(ls); if (!launch(st_user().username, of_passwd.efield.content, st_session(g_config->behavior.include_defshell), From f0e962ad506d234c40bf8c895fcb43071d3babf3 Mon Sep 17 00:00:00 2001 From: rmntgx Date: Sun, 29 Jun 2025 11:51:42 +0500 Subject: [PATCH 2/2] fix: create directory --- include/launch_state.h | 1 + src/launch_state.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/launch_state.h b/include/launch_state.h index eb15b23..e63ebe3 100644 --- a/include/launch_state.h +++ b/include/launch_state.h @@ -3,6 +3,7 @@ #include #include +#include struct LaunchState { int user_opt; diff --git a/src/launch_state.c b/src/launch_state.c index 381209d..5a26fdb 100644 --- a/src/launch_state.c +++ b/src/launch_state.c @@ -1,6 +1,7 @@ // Small file for saving last selection -#define STATE_PATH "/var/lib/lidm/state" +#define STATE_DIR "/var/lib/lidm" +#define STATE_FILE "/var/lib/lidm/state" #include "launch_state.h" @@ -8,8 +9,8 @@ struct LaunchState read_launch_state() { struct LaunchState state; state.user_opt = 1; state.session_opt = 1; - FILE* state_fd = fopen(STATE_PATH, "r"); - if (!state_fd) return state; + FILE* state_fd = fopen(STATE_FILE, "r"); + if (state_fd == NULL) return state; if (fscanf(state_fd, "%i;%i", &state.user_opt, &state.session_opt) != 2) { state.user_opt = 1; state.session_opt = 1; @@ -19,8 +20,12 @@ struct LaunchState read_launch_state() { } bool write_launch_state(struct LaunchState state) { - FILE* state_fd = fopen(STATE_PATH, "w"); - if (!state_fd) return false; + FILE* state_fd = fopen(STATE_FILE, "w"); + if (state_fd == NULL) { + if (mkdir(STATE_DIR, 0755) == -1) return false; + state_fd = fopen(STATE_FILE, "w"); + if (state_fd == NULL) return false; + } (void)fprintf(state_fd, "%i;%i", state.user_opt, state.session_opt); (void)fclose(state_fd); return true;