From: Simon Ruderich Date: Tue, 19 Sep 2017 06:01:08 +0000 (+0200) Subject: Make multi-line comments consistent X-Git-Tag: 0.1~10 X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=9e19e8130dfecfaf97bbf8a7e0c9f908a8df1dfc;p=ptyas%2Fptyas.git Make multi-line comments consistent Use Git/Kernel-style. --- diff --git a/ptyas.c b/ptyas.c index 9ffe998..e6ecd55 100644 --- a/ptyas.c +++ b/ptyas.c @@ -222,8 +222,10 @@ static void proxy_input_between_ttys(int pty_master, int ctty, volatile pid_t *p break; } - /* Handle errors first. (Data available before the error occurred - * might be dropped, but shouldn't matter here.) */ + /* + * Handle errors first. (Data available before the error occurred + * might be dropped, but shouldn't matter here.) + */ if (fds[0].revents & (POLLERR | POLLNVAL)) { fprintf(stderr, "poll: error on master: %d\n", fds[0].revents); break; @@ -359,9 +361,11 @@ int main(int argc, char **argv) { if (pid == -1) { die("fork child"); } else if (pid == 0) { - /* Drop the privileges just now so that the other user doesn't get + /* + * Drop the privileges just now so that the other user doesn't get * access to the master TTY or the session leader (which might - * have additional privileges). */ + * have additional privileges). + */ drop_privileges_or_die(uid, gid); dup2_or_die(pty_slave, STDIN_FILENO); @@ -376,10 +380,12 @@ int main(int argc, char **argv) { } const char *home = passwd->pw_dir; - // Ignore errors here as we don't want to die on non-existent home - // directories to allow running as any user (think "/nonexistent" - // as home) and an error message will be annoying to ignore when - // running this command in scripts. + /* + * Ignore errors here as we don't want to die on non-existent home + * directories to allow running as any user (think "/nonexistent" + * as home) and an error message will be annoying to ignore when + * running this command in scripts. + */ chdir(home); char envp_user[strlen("USER=") + strlen(user) + 1]; @@ -450,8 +456,10 @@ int main(int argc, char **argv) { die("tcsetattr restore"); } - /* Wait until we got the status code from our child. poll() might already - * exit after POLLHUP while we haven't collected the child yet. */ + /* + * Wait until we got the status code from our child. poll() might already + * exit after POLLHUP while we haven't collected the child yet. + */ if (sigprocmask(SIG_BLOCK, &sigset, &sigset_old) != 0) { die("sigprocmask block sigchld loop"); }