remove trailing whitespace
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23815 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
30
appl/kx/kx.c
30
appl/kx/kx.c
@@ -2,22 +2,22 @@
|
||||
* Copyright (c) 1995-2003 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
@@ -48,7 +48,7 @@ childhandler (int sig)
|
||||
pid_t pid;
|
||||
int status;
|
||||
|
||||
do {
|
||||
do {
|
||||
pid = waitpid (-1, &status, WNOHANG|WUNTRACED);
|
||||
if (pid > 0 && (WIFEXITED(status) || WIFSIGNALED(status)))
|
||||
if (--nchild == 0 && donep)
|
||||
@@ -114,7 +114,7 @@ connect_host (kx_context *kc)
|
||||
warnx ("%s: %s", kc->host, gai_strerror(error));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
for (a = ai; a != NULL; a = a->ai_next) {
|
||||
s = socket (a->ai_family, a->ai_socktype, a->ai_protocol);
|
||||
if (s < 0)
|
||||
@@ -279,7 +279,7 @@ doit_passive (kx_context *kc)
|
||||
p++;
|
||||
p += kx_get_int (p, &tmp, 4, 0);
|
||||
}
|
||||
|
||||
|
||||
++nchild;
|
||||
child = fork ();
|
||||
if (child < 0) {
|
||||
@@ -292,7 +292,7 @@ doit_passive (kx_context *kc)
|
||||
close (otherside);
|
||||
|
||||
socket_set_port(kc->thataddr, htons(tmp));
|
||||
|
||||
|
||||
fd = socket (kc->thataddr->sa_family, SOCK_STREAM, 0);
|
||||
if (fd < 0)
|
||||
err(1, "socket");
|
||||
@@ -337,7 +337,7 @@ doit_passive (kx_context *kc)
|
||||
}
|
||||
|
||||
/*
|
||||
* Allocate a local pseudo-xserver and wait for connections
|
||||
* Allocate a local pseudo-xserver and wait for connections
|
||||
*/
|
||||
|
||||
static int
|
||||
@@ -384,7 +384,7 @@ doit_active (kx_context *kc)
|
||||
--rem;
|
||||
|
||||
str = getenv("DISPLAY");
|
||||
if (str == NULL || (str = strchr(str, ':')) == NULL)
|
||||
if (str == NULL || (str = strchr(str, ':')) == NULL)
|
||||
str = ":0";
|
||||
len = strlen (str);
|
||||
tmp = kx_put_int (len, p, rem, 4);
|
||||
@@ -449,7 +449,7 @@ doit_active (kx_context *kc)
|
||||
|
||||
FD_ZERO(&fdset);
|
||||
for (i = 0; i < nsockets; ++i) {
|
||||
if (sockets[i].fd >= FD_SETSIZE)
|
||||
if (sockets[i].fd >= FD_SETSIZE)
|
||||
errx (1, "fd too large");
|
||||
FD_SET(sockets[i].fd, &fdset);
|
||||
}
|
||||
@@ -575,7 +575,7 @@ doit (kx_context *kc, int passive_flag)
|
||||
*/
|
||||
|
||||
static int
|
||||
doit_v4 (const char *host, int port, const char *user,
|
||||
doit_v4 (const char *host, int port, const char *user,
|
||||
int passive_flag, int debug_flag, int keepalive_flag, int tcp_flag)
|
||||
{
|
||||
int ret;
|
||||
@@ -742,7 +742,7 @@ main(int argc, char **argv)
|
||||
use_v4 = 0;
|
||||
if(use_v5 == -1 && use_v4 == 1)
|
||||
use_v5 = 0;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef KRB5
|
||||
if (ret && use_v5) {
|
||||
@@ -756,7 +756,7 @@ main(int argc, char **argv)
|
||||
if (ret && use_v4) {
|
||||
if (port == 0)
|
||||
port = k_getportbyname("kx", "tcp", htons(KX_PORT));
|
||||
ret = doit_v4 (host, port, user,
|
||||
ret = doit_v4 (host, port, user,
|
||||
passive_flag, debug_flag, keepalive_flag, tcp_flag);
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user