- OpenBSD CVS updates:

[openssh.git] / session.c

diff --git a/session.c b/session.c
index 4b7404f7380c6d62c4d4c5eb74b590e106e4a282..4791857c0d3561d5782d20e4213ee1e3f7a26a74 100644 (file)
--- a/session.c
+++ b/session.c
@@ -8,7 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.12 2000/05/03 18:03:07 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.14 2000/05/25 03:10:18 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -645,7 +645,8 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
                }
 #endif
                /* Do common processing for the child, such as execing the command. */
-               do_child(command, pw, s->term, s->display, s->auth_proto, s->auth_data, s->tty);
+               do_child(command, pw, s->term, s->display, s->auth_proto,
+                   s->auth_data, s->tty);
                /* NOTREACHED */
        }
        if (pid < 0)
@@ -749,7 +750,10 @@ read_environment_file(char ***env, unsigned int *envsize,
                        fprintf(stderr, "Bad line in %.100s: %.200s\n", filename, buf);
                        continue;
                }
-               /* Replace the equals sign by nul, and advance value to the value string. */
+               /*
+                * Replace the equals sign by nul, and advance value to
+                * the value string.
+                */
                *value = '\0';
                value++;
                child_set_env(env, envsize, cp, value);
@@ -948,7 +952,8 @@ do_child(const char *command, struct passwd * pw, const char *term,
 
        /* read $HOME/.ssh/environment. */
        if (!options.use_login) {
-               snprintf(buf, sizeof buf, "%.200s/.ssh/environment", pw->pw_dir);
+               snprintf(buf, sizeof buf, "%.200s/.ssh/environment",
+                   pw->pw_dir);
                read_environment_file(&env, &envsize, buf);
        }
        if (debug_flag) {
@@ -1037,21 +1042,27 @@ do_child(const char *command, struct passwd * pw, const char *term,
                        if (auth_proto != NULL && auth_data != NULL) {
                                char *screen = strchr(display, ':');
                                if (debug_flag) {
-                                       fprintf(stderr, "Running %.100s add %.100s %.100s %.100s\n",
+                                       fprintf(stderr,
+                                           "Running %.100s add %.100s %.100s %.100s\n",
                                            XAUTH_PATH, display, auth_proto, auth_data);
                                        if (screen != NULL)
-                                               fprintf(stderr, "Adding %.*s/unix%s %s %s\n",
-                                                   screen-display, display, screen, auth_proto, auth_data);
+                                               fprintf(stderr,
+                                                   "Adding %.*s/unix%s %s %s\n",
+                                                   screen-display, display,
+                                                   screen, auth_proto, auth_data);
                                }
                                f = popen(XAUTH_PATH " -q -", "w");
                                if (f) {
-                                       fprintf(f, "add %s %s %s\n", display, auth_proto, auth_data);
+                                       fprintf(f, "add %s %s %s\n", display,
+                                           auth_proto, auth_data);
                                        if (screen != NULL) 
                                                fprintf(f, "add %.*s/unix%s %s %s\n",
-                                                    screen-display, display, screen, auth_proto, auth_data);
+                                                   screen-display, display,
+                                                   screen, auth_proto, auth_data);
                                        pclose(f);
                                } else
-                                       fprintf(stderr, "Could not run %s -q -\n", XAUTH_PATH);
+                                       fprintf(stderr, "Could not run %s -q -\n",
+                                           XAUTH_PATH);
                        }
                }
 #endif /* XAUTH_PATH */
@@ -1081,7 +1092,8 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                struct stat mailstat;
                                mailbox = getenv("MAIL");
                                if (mailbox != NULL) {
-                                       if (stat(mailbox, &mailstat) != 0 || mailstat.st_size == 0)
+                                       if (stat(mailbox, &mailstat) != 0 ||
+                                           mailstat.st_size == 0)
                                                printf("No mail.\n");
                                        else if (mailstat.st_mtime < mailstat.st_atime)
                                                printf("You have mail.\n");