Changed indentation using

'indent -br -ce -sc -pcs -cs -bs -i8 -bad -bap -fca '
This commit is contained in:
Martin Baulig
1998-07-12 14:24:49 +00:00
parent b177c3930d
commit 61071132bf

View File

@@ -1,18 +1,18 @@
/* -*-C-*-
Common library code for the GNU Emacs server and client.
This file is part of GNU Emacs.
Copying is permitted under those conditions described by the GNU
General Public License.
Copyright (C) 1989 Free Software Foundation, Inc.
Author: Andy Norman (ange@hplb.hpl.hp.com), based on
'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
Emacs distribution.
Please mail bugs and suggestions to the author at the above address.
* Common library code for the GNU Emacs server and client.
*
* This file is part of GNU Emacs.
*
* Copying is permitted under those conditions described by the GNU
* General Public License.
*
* Copyright (C) 1989 Free Software Foundation, Inc.
*
* Author: Andy Norman (ange@hplb.hpl.hp.com), based on
* 'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
* Emacs distribution.
*
* Please mail bugs and suggestions to the author at the above address.
*/
/* HISTORY
@@ -31,6 +31,7 @@
#if 0
static char rcsid[] = "!Header: gnuslib.c,v 2.4 95/02/16 11:57:37 arup alpha !";
#endif
#include <glibtop/gnuserv.h>
@@ -39,12 +40,15 @@ static char rcsid [] = "!Header: gnuslib.c,v 2.4 95/02/16 11:57:37 arup alpha !"
#ifdef SYSV_IPC
static int connect_to_ipc_server (void);
#endif
#ifdef UNIX_DOMAIN_SOCKETS
static int connect_to_unix_server (void);
#endif
#ifdef INTERNET_DOMAIN_SOCKETS
static int connect_to_internet_server (const char *serverhost, u_short port);
#endif
/* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */
@@ -70,6 +74,7 @@ glibtop_make_connection (hostarg, portarg, s)
{
#ifdef INTERNET_DOMAIN_SOCKETS
char *ptr;
if (hostarg == NULL)
hostarg = getenv ("LIBGTOP_HOST");
if (portarg == 0 && (ptr = getenv ("LIBGTOP_PORT")) != NULL)
@@ -77,8 +82,8 @@ glibtop_make_connection (hostarg, portarg, s)
#endif
if (hostarg != NULL) {
/* hostname was given explicitly, via cmd line arg or LIBGTOP_HOST,
* so obey it. */
/* hostname was given explicitly, via cmd line arg or
* LIBGTOP_HOST, * so obey it. */
#ifdef UNIX_DOMAIN_SOCKETS
if (!strcmp (hostarg, "unix")) {
*s = connect_to_unix_server ();
@@ -90,11 +95,13 @@ glibtop_make_connection (hostarg, portarg, s)
return (int) CONN_INTERNET;
#endif
#ifdef SYSV_IPC
return -1; /* hostarg should always be NULL for SYSV_IPC */
return -1; /* hostarg should always be NULL for SYSV_IPC
*/
#endif
} else {
/* no hostname given. Use unix-domain/sysv-ipc, or
* internet-domain connection to local host if they're not available. */
/* no hostname given. Use unix-domain/sysv-ipc, or *
* internet-domain connection to local host if they're not
* available. */
#if defined(UNIX_DOMAIN_SOCKETS)
*s = connect_to_unix_server ();
return (int) CONN_UNIX;
@@ -104,7 +111,10 @@ glibtop_make_connection (hostarg, portarg, s)
#elif defined(INTERNET_DOMAIN_SOCKETS)
{
char localhost[HOSTNAMSZ];
gethostname (localhost, HOSTNAMSZ); /* use this host by default */
gethostname (localhost, HOSTNAMSZ); /* use this
* host by
* default */
*s = connect_to_internet_server (localhost, portarg);
return (int) CONN_INTERNET;
}
@@ -114,8 +124,8 @@ glibtop_make_connection (hostarg, portarg, s)
#ifdef SYSV_IPC
/*
connect_to_ipc_server -- establish connection with server process via SYSV IPC
Returns msqid for server if successful.
* connect_to_ipc_server -- establish connection with server process via SYSV IPC
* Returns msqid for server if successful.
*/
static int
connect_to_ipc_server (void)
@@ -138,10 +148,11 @@ connect_to_ipc_server (void)
/*
disconnect_from_ipc_server -- inform the server that sending has finished,
and wait for its reply.
* disconnect_from_ipc_server -- inform the server that sending has finished,
* and wait for its reply.
*/
void disconnect_from_ipc_server(s,msgp,echo)
void
disconnect_from_ipc_server (s, msgp, echo)
int s;
struct msgbuf *msgp;
int echo;
@@ -166,7 +177,8 @@ void disconnect_from_ipc_server(s,msgp,echo)
if (echo) {
msgp->mtext[len] = '\0'; /* string terminate message */
fputs (msgp->mtext, stdout);
if (msgp->mtext[len-1] != '\n') putchar ('\n');
if (msgp->mtext[len - 1] != '\n')
putchar ('\n');
}; /* if */
} /* disconnect_from_ipc_server */
@@ -175,7 +187,7 @@ void disconnect_from_ipc_server(s,msgp,echo)
#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
/*
send_string -- send string to socket.
* send_string -- send string to socket.
*/
#if 0
static void
@@ -191,6 +203,7 @@ send_string(s,msg)
}; /* if */
#else
int len, left = strlen (msg);
while (left > 0) {
if ((len = write (s, msg, min2 (left, GSERV_BUFSZ))) < 0) {
/* XEmacs addition: robertl@arnet.com */
@@ -208,7 +221,7 @@ send_string(s,msg)
} /* send_string */
/*
read_line -- read a \n terminated line from a socket
* read_line -- read a \n terminated line from a socket
*/
static int
read_line (int s, char *dest)
@@ -233,9 +246,9 @@ read_line(int s, char *dest)
#ifdef UNIX_DOMAIN_SOCKETS
/*
connect_to_unix_server -- establish connection with server process via a unix-
domain socket. Returns socket descriptor for server
if successful.
* connect_to_unix_server -- establish connection with server process via a unix-
* domain socket. Returns socket descriptor for server
* if successful.
*/
static int
connect_to_unix_server (void)
@@ -263,10 +276,11 @@ connect_to_unix_server (void)
#ifdef INTERNET_DOMAIN_SOCKETS
/*
internet_addr -- return the internet addr of the hostname or
internet address passed. Return -1 on error.
* internet_addr -- return the internet addr of the hostname or
* internet address passed. Return -1 on error.
*/
long glibtop_internet_addr (host)
long
glibtop_internet_addr (host)
const char *host;
{
struct hostent *hp; /* pointer to host info for remote host */
@@ -289,12 +303,13 @@ long glibtop_internet_addr (host)
#include <X11/Xauth.h>
static Xauth *server_xauth = NULL;
#endif
/*
connect_to_internet_server -- establish connection with server process via
an internet domain socket. Returns socket
descriptor for server if successful.
* connect_to_internet_server -- establish connection with server process via
* an internet domain socket. Returns socket
* descriptor for server if successful.
*/
static int
connect_to_internet_server (const char *serverhost, u_short port)
@@ -319,7 +334,8 @@ connect_to_internet_server (const char *serverhost, u_short port)
peeraddr_in.sin_port = htons (DEFAULT_PORT + getuid ());
else
peeraddr_in.sin_port = sp->s_port;
} /* if */
}
/* if */
else
peeraddr_in.sin_port = htons (port);
@@ -327,9 +343,8 @@ connect_to_internet_server (const char *serverhost, u_short port)
if ((s = socket (AF_INET, SOCK_STREAM, 0)) == -1)
glibtop_error_io ("unable to create socket");
/* Try to connect to the remote server at the address
* which was just built into peeraddr.
*/
/* Try to connect to the remote server at the address * which was
* just built into peeraddr. */
if (connect (s, (struct sockaddr *) &peeraddr_in,
sizeof (struct sockaddr_in)) == -1)
glibtop_error_io ("unable to connect to remote");
@@ -352,7 +367,6 @@ connect_to_internet_server (const char *serverhost, u_short port)
return (s);
}
#endif /* AUTH_MAGIC_COOKIE */
sprintf (buf, "%s\n", DEFAUTH_NAME);
@@ -366,8 +380,8 @@ connect_to_internet_server (const char *serverhost, u_short port)
#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
/*
disconnect_from_server -- inform the server that sending has finished, and wait for
its reply.
* disconnect_from_server -- inform the server that sending has finished, and wait for
* its reply.
*/
#if 0
static void
@@ -377,8 +391,10 @@ disconnect_from_server(s,echo)
{
#if 0
char buffer[REPLYSIZ + 1];
#else
char buffer[GSERV_BUFSZ + 1];
#endif
int add_newline = 1;
int length;
@@ -404,7 +420,8 @@ disconnect_from_server(s,echo)
#if 0
while ((length = recv (s, buffer, REPLYSIZ, 0)) > 0) {
buffer[length] = '\0';
if (echo) fputs(buffer,stdout);
if (echo)
fputs (buffer, stdout);
add_newline = (buffer[length - 1] != '\n');
}; /* while */
#else
@@ -420,7 +437,8 @@ disconnect_from_server(s,echo)
}; /* while */
#endif
if (echo && add_newline) putchar('\n');
if (echo && add_newline)
putchar ('\n');
if (length < 0) {
perror (progname);