From 03a01071970a21b306b9916feb95c0993356d902 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 14 Jul 2023 09:06:57 -0300 Subject: firecfg: add const to a few functions/variables To make it clearer that they are not modified later. --- src/firecfg/desktop_files.c | 2 +- src/firecfg/firecfg.h | 2 +- src/firecfg/main.c | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/firecfg') diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c index 963e05ff3..7ac60f70c 100644 --- a/src/firecfg/desktop_files.c +++ b/src/firecfg/desktop_files.c @@ -108,7 +108,7 @@ static int have_profile(const char *filename, const char *homedir) { return rv; } -void fix_desktop_files(char *homedir) { +void fix_desktop_files(const char *homedir) { assert(homedir); struct stat sb; diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h index 825bf8d03..8f74a1198 100644 --- a/src/firecfg/firecfg.h +++ b/src/firecfg/firecfg.h @@ -49,6 +49,6 @@ int is_link(const char *fname); void sound(void); // desktop_files.c -void fix_desktop_files(char *homedir); +void fix_desktop_files(const char *homedir); #endif diff --git a/src/firecfg/main.c b/src/firecfg/main.c index ccb55457c..a6cae995e 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c @@ -288,8 +288,8 @@ static void set_links_homedir(const char *homedir) { free(firejail_exec); } -static char *get_sudo_user(void) { - char *user = getenv("SUDO_USER"); +static const char *get_sudo_user(void) { + const char *user = getenv("SUDO_USER"); if (!user) { user = getpwuid(getuid())->pw_name; if (!user) { @@ -301,13 +301,13 @@ static char *get_sudo_user(void) { return user; } -static char *get_homedir(const char *user, uid_t *uid, gid_t *gid) { +static const char *get_homedir(const char *user, uid_t *uid, gid_t *gid) { // find home directory struct passwd *pw = getpwnam(user); if (!pw) goto errexit; - char *home = pw->pw_dir; + const char *home = pw->pw_dir; if (!home) goto errexit; @@ -326,12 +326,11 @@ int main(int argc, char **argv) { int bindir_set = 0; // user setup - char *user = get_sudo_user(); + const char *user = get_sudo_user(); assert(user); uid_t uid; gid_t gid; - char *home = get_homedir(user, &uid, &gid); - + const char *home = get_homedir(user, &uid, &gid); // check for --bindir for (i = 1; i < argc; i++) { -- cgit v1.2.3-54-g00ecf