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

Normalize exit codes

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

10
src/login.c
View File

@ -370,7 +370,7 @@ const char* de_command, enum deserv_t display_server)
break; break;
} }
exit(0); exit(EXIT_SUCCESS);
} }
/* waits for the de/shell to exit */ /* waits for the de/shell to exit */
@ -477,7 +477,7 @@ int xinitrc)
if(child == 0) if(child == 0)
{ {
execl(pwd->pw_shell, pwd->pw_shell, "-c", cmd, NULL); execl(pwd->pw_shell, pwd->pw_shell, "-c", cmd, NULL);
exit(0); exit(EXIT_SUCCESS);
} }
waitpid(child, &status, 0); waitpid(child, &status, 0);
@ -489,7 +489,7 @@ int xinitrc)
de_command, LY_CMD_X, de_command, LY_CMD_X,
display_name, vt, getenv("XAUTHORITY")); display_name, vt, getenv("XAUTHORITY"));
execve(pwd->pw_shell, argv, environ); execve(pwd->pw_shell, argv, environ);
exit(0); exit(EXIT_SUCCESS);
} }
void launch_wayland(struct passwd* pwd, pam_handle_t* pam_handle, void launch_wayland(struct passwd* pwd, pam_handle_t* pam_handle,
@ -507,7 +507,7 @@ void launch_shell(struct passwd* pwd, pam_handle_t* pam_handle)
strncpy(args + 1, ((pos = strrchr(pwd->pw_shell, strncpy(args + 1, ((pos = strrchr(pwd->pw_shell,
'/')) ? pos + 1 : pwd->pw_shell), sizeof(args) - 1); '/')) ? pos + 1 : pwd->pw_shell), sizeof(args) - 1);
execl(pwd->pw_shell, args, NULL); execl(pwd->pw_shell, args, NULL);
exit(0); exit(EXIT_SUCCESS);
} }
void destroy_env(void) void destroy_env(void)
@ -594,7 +594,7 @@ void reset_terminal(struct passwd* pwd)
if(pid == 0) if(pid == 0)
{ {
execl(pwd->pw_shell, pwd->pw_shell, "-c", cmd, NULL); execl(pwd->pw_shell, pwd->pw_shell, "-c", cmd, NULL);
exit(0); exit(EXIT_SUCCESS);
} }
waitpid(pid, &status, 0); waitpid(pid, &status, 0);

6
src/main.c
View File

@ -60,7 +60,7 @@ int main(void)
{ {
fprintf(stderr, "%s\n", LY_ERR_FD_CONSOLE); fprintf(stderr, "%s\n", LY_ERR_FD_CONSOLE);
fprintf(stderr, "%s\n", LY_ERR_FD_CONSOLE_ADVICE); fprintf(stderr, "%s\n", LY_ERR_FD_CONSOLE_ADVICE);
return 0; return EXIT_FAILURE;
} }
/* create LY_CFG_SAVE if it doesn't exist yet */ /* create LY_CFG_SAVE if it doesn't exist yet */
@ -68,7 +68,7 @@ int main(void)
if (!cfg_save) if (!cfg_save)
{ {
fprintf(stderr, "%s: %s\n", LY_ERR_FD_CFG_SAVE, LY_CFG_SAVE); fprintf(stderr, "%s: %s\n", LY_ERR_FD_CFG_SAVE, LY_CFG_SAVE);
return 0; return EXIT_FAILURE;
} }
fclose(cfg_save); fclose(cfg_save);
@ -217,5 +217,5 @@ int main(void)
free_list(de_list); free_list(de_list);
end_form(&form); end_form(&form);
endwin(); endwin();
return 0; return EXIT_SUCCESS;
} }

6
src/utils.c
View File

@ -22,7 +22,7 @@ void kernel_log(int mode)
pid = fork(); pid = fork();
if(pid < 0) { if(pid < 0) {
perror("fork"); perror("fork");
exit(1); exit(EXIT_FAILURE);
} }
if(pid == 0) if(pid == 0)
@ -37,12 +37,12 @@ void kernel_log(int mode)
} }
/* execl should not return */ /* execl should not return */
perror("execl"); perror("execl");
exit(1); exit(EXIT_FAILURE);
} }
waitpid(pid, &status, 0); waitpid(pid, &status, 0);
if(!WIFEXITED(status) || WEXITSTATUS(status)) if(!WIFEXITED(status) || WEXITSTATUS(status))
exit(1); exit(EXIT_FAILURE);
} }
char* trim(char* s) char* trim(char* s)