aboutsummaryrefslogtreecommitdiffstats
path: root/src/firecfg
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-07-14 09:06:57 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-07-14 09:23:28 -0300
commit03a01071970a21b306b9916feb95c0993356d902 (patch)
tree63f17921942e1144622d6c3af945d8ce705647b3 /src/firecfg
parentfirecfg: rename get_user to get_sudo_user (diff)
downloadfirejail-03a01071970a21b306b9916feb95c0993356d902.tar.gz
firejail-03a01071970a21b306b9916feb95c0993356d902.tar.zst
firejail-03a01071970a21b306b9916feb95c0993356d902.zip
firecfg: add const to a few functions/variables
To make it clearer that they are not modified later.
Diffstat (limited to 'src/firecfg')
-rw-r--r--src/firecfg/desktop_files.c2
-rw-r--r--src/firecfg/firecfg.h2
-rw-r--r--src/firecfg/main.c13
3 files changed, 8 insertions, 9 deletions
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) {
108 return rv; 108 return rv;
109} 109}
110 110
111void fix_desktop_files(char *homedir) { 111void fix_desktop_files(const char *homedir) {
112 assert(homedir); 112 assert(homedir);
113 struct stat sb; 113 struct stat sb;
114 114
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);
49void sound(void); 49void sound(void);
50 50
51// desktop_files.c 51// desktop_files.c
52void fix_desktop_files(char *homedir); 52void fix_desktop_files(const char *homedir);
53 53
54#endif 54#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) {
288 free(firejail_exec); 288 free(firejail_exec);
289} 289}
290 290
291static char *get_sudo_user(void) { 291static const char *get_sudo_user(void) {
292 char *user = getenv("SUDO_USER"); 292 const char *user = getenv("SUDO_USER");
293 if (!user) { 293 if (!user) {
294 user = getpwuid(getuid())->pw_name; 294 user = getpwuid(getuid())->pw_name;
295 if (!user) { 295 if (!user) {
@@ -301,13 +301,13 @@ static char *get_sudo_user(void) {
301 return user; 301 return user;
302} 302}
303 303
304static char *get_homedir(const char *user, uid_t *uid, gid_t *gid) { 304static const char *get_homedir(const char *user, uid_t *uid, gid_t *gid) {
305 // find home directory 305 // find home directory
306 struct passwd *pw = getpwnam(user); 306 struct passwd *pw = getpwnam(user);
307 if (!pw) 307 if (!pw)
308 goto errexit; 308 goto errexit;
309 309
310 char *home = pw->pw_dir; 310 const char *home = pw->pw_dir;
311 if (!home) 311 if (!home)
312 goto errexit; 312 goto errexit;
313 313
@@ -326,12 +326,11 @@ int main(int argc, char **argv) {
326 int bindir_set = 0; 326 int bindir_set = 0;
327 327
328 // user setup 328 // user setup
329 char *user = get_sudo_user(); 329 const char *user = get_sudo_user();
330 assert(user); 330 assert(user);
331 uid_t uid; 331 uid_t uid;
332 gid_t gid; 332 gid_t gid;
333 char *home = get_homedir(user, &uid, &gid); 333 const char *home = get_homedir(user, &uid, &gid);
334
335 334
336 // check for --bindir 335 // check for --bindir
337 for (i = 1; i < argc; i++) { 336 for (i = 1; i < argc; i++) {