oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed indentation using

Browse Source 
'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
1 changed files with 285 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

284
sysdeps/common/gnuslib.c
View File

@@ -1,19 +1,19 @@
/* -*-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
* 11-Nov-1990 bristor@simba
@@ -30,7 +30,8 @@
*/
#if 0
static char rcsid [] = "!Header: gnuslib.c,v 2.4 95/02/16 11:57:37 arup alpha !";
static char rcsid[] = "!Header: gnuslib.c,v 2.4 95/02/16 11:57:37 arup alpha !";
#endif
#include <glibtop/gnuserv.h>
@@ -39,25 +40,28 @@ 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'. */
#ifdef HAVE_BROKEN_INET_ADDR
# define IN_ADDR struct in_addr
# define NUMERIC_ADDR_ERROR (numeric_addr.s_addr == -1)
#define IN_ADDR struct in_addr
#define NUMERIC_ADDR_ERROR (numeric_addr.s_addr == -1)
#else
# if (LONGBITS > 32)
# define IN_ADDR unsigned int
# else
# define IN_ADDR unsigned long
# endif
# define NUMERIC_ADDR_ERROR (numeric_addr == (IN_ADDR) -1)
#if (LONGBITS > 32)
#define IN_ADDR unsigned int
#else
#define IN_ADDR unsigned long
#endif
#define NUMERIC_ADDR_ERROR (numeric_addr == (IN_ADDR) -1)
#endif
#include <arpa/inet.h>
@@ -70,15 +74,16 @@ 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)
if (portarg == 0 && (ptr = getenv ("LIBGTOP_PORT")) != NULL)
portarg = atoi (ptr);
#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;
@@ -103,8 +110,11 @@ glibtop_make_connection (hostarg, portarg, s)
return (int) CONN_IPC;
#elif defined(INTERNET_DOMAIN_SOCKETS)
{
char localhost [HOSTNAMSZ];
gethostname (localhost, HOSTNAMSZ); /* use this host by default */
char localhost[HOSTNAMSZ];
gethostname (localhost, HOSTNAMSZ); /* use this
* host by
* default */
*s = connect_to_internet_server (localhost, portarg);
return (int) CONN_INTERNET;
}
@@ -114,17 +124,17 @@ 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)
{
int s; /* connected msqid */
key_t key; /* message key */
char buf [GSERV_BUFSZ+1]; /* buffer for filename */
char buf[GSERV_BUFSZ + 1]; /* buffer for filename */
sprintf (buf, "/tmp/lgtd%d", (int)geteuid());
sprintf (buf, "/tmp/lgtd%d", (int) geteuid ());
creat (buf, 0600);
if ((key = ftok (buf, 1)) == -1)
glibtop_error_io ("unable to get ipc key from %s", buf);
@@ -132,41 +142,43 @@ connect_to_ipc_server (void)
if ((s = msgget (key, 0600)) == -1)
glibtop_error_io ("unable to access msg queue");
return(s);
return (s);
} /* connect_to_ipc_server */
/*
disconnect_from_ipc_server -- inform the server that sending has finished,
and wait for its reply.
*/
void disconnect_from_ipc_server(s,msgp,echo)
* disconnect_from_ipc_server -- inform the server that sending has finished,
* and wait for its reply.
*/
void
disconnect_from_ipc_server (s, msgp, echo)
int s;
struct msgbuf *msgp;
int echo;
{
int len; /* length of received message */
send_string(s,EOT_STR); /* EOT terminates this message */
send_string (s, EOT_STR); /* EOT terminates this message */
msgp->mtype = 1;
if(msgsnd(s,msgp,strlen(msgp->mtext)+1,0) < 0) {
perror(progname);
fprintf(stderr,"%s: unable to send message to server\n",progname);
exit(1);
if (msgsnd (s, msgp, strlen (msgp->mtext) + 1, 0) < 0) {
perror (progname);
fprintf (stderr, "%s: unable to send message to server\n", progname);
exit (1);
}; /* if */
if((len = msgrcv(s,msgp,GSERV_BUFSZ,getpid(),0)) < 0) {
perror(progname);
fprintf(stderr,"%s: unable to receive message from server\n",progname);
exit(1);
if ((len = msgrcv (s, msgp, GSERV_BUFSZ, getpid (), 0)) < 0) {
perror (progname);
fprintf (stderr, "%s: unable to receive message from server\n", progname);
exit (1);
}; /* if */
if (echo) {
msgp->mtext[len] = '\0'; /* string terminate message */
fputs(msgp->mtext, stdout);
if (msgp->mtext[len-1] != '\n') putchar ('\n');
fputs (msgp->mtext, stdout);
if (msgp->mtext[len - 1] != '\n')
putchar ('\n');
}; /* if */
} /* disconnect_from_ipc_server */
@@ -175,31 +187,32 @@ 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
send_string(s,msg)
send_string (s, msg)
int s;
const char *msg;
{
#if 0
if (send(s,msg,strlen(msg),0) < 0) {
perror(progname);
fprintf(stderr,"%s: unable to send\n",progname);
exit(1);
if (send (s, msg, strlen (msg), 0) < 0) {
perror (progname);
fprintf (stderr, "%s: unable to send\n", progname);
exit (1);
}; /* if */
#else
int len, left=strlen(msg);
int len, left = strlen (msg);
while (left > 0) {
if ((len=write(s,msg,min2(left,GSERV_BUFSZ))) < 0) {
if ((len = write (s, msg, min2 (left, GSERV_BUFSZ))) < 0) {
/* XEmacs addition: robertl@arnet.com */
if (errno == EPIPE) {
return ;
return;
}
perror(progname);
fprintf(stderr,"%s: unable to send\n",progname);
exit(1);
perror (progname);
fprintf (stderr, "%s: unable to send\n", progname);
exit (1);
}; /* if */
left -= len;
msg += len;
@@ -208,23 +221,23 @@ 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)
read_line (int s, char *dest)
{
int length;
int offset=0;
char buffer[GSERV_BUFSZ+1];
int offset = 0;
char buffer[GSERV_BUFSZ + 1];
while ((length=read(s,buffer+offset,1)>0) && buffer[offset]!='\n'
while ((length = read (s, buffer + offset, 1) > 0) && buffer[offset] != '\n'
&& buffer[offset] != EOT_CHR) {
offset += length;
if (offset >= GSERV_BUFSZ)
break;
}
buffer[offset] = '\0';
strcpy(dest,buffer);
strcpy (dest, buffer);
return 1;
} /* read_line */
#endif
@@ -233,10 +246,10 @@ 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)
{
@@ -248,14 +261,14 @@ connect_to_unix_server (void)
server.sun_family = AF_UNIX;
#ifdef HIDE_UNIX_SOCKET
sprintf(server.sun_path, "/tmp/lgtddir%d/lgtd", (int)geteuid());
sprintf (server.sun_path, "/tmp/lgtddir%d/lgtd", (int) geteuid ());
#else /* HIDE_UNIX_SOCKET */
sprintf(server.sun_path, "/tmp/lgtd%d", (int)geteuid());
sprintf (server.sun_path, "/tmp/lgtd%d", (int) geteuid ());
#endif /* HIDE_UNIX_SOCKET */
if (connect (s, (struct sockaddr *)&server, strlen(server.sun_path)+2) < 0)
if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2) < 0)
glibtop_error_io ("unable to connect to local");
return(s);
return (s);
} /* connect_to_unix_server */
#endif /* UNIX_DOMAIN_SOCKETS */
@@ -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.
*/
long glibtop_internet_addr (host)
* internet_addr -- return the internet addr of the hostname or
* internet address passed. Return -1 on error.
*/
long
glibtop_internet_addr (host)
const char *host;
{
struct hostent *hp; /* pointer to host info for remote host */
@@ -276,7 +290,7 @@ long glibtop_internet_addr (host)
if (!NUMERIC_ADDR_ERROR)
return numeric_addr;
else if ((hp = gethostbyname (host)) != NULL)
return ((struct in_addr *)(hp->h_addr))->s_addr;
return ((struct in_addr *) (hp->h_addr))->s_addr;
else {
glibtop_warn_io ("gethostbyname (%s)", host);
return -1;
@@ -285,17 +299,18 @@ long glibtop_internet_addr (host)
} /* glibtop_internet_addr */
#ifdef AUTH_MAGIC_COOKIE
# include <X11/X.h>
# include <X11/Xauth.h>
#include <X11/X.h>
#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)
{
@@ -305,7 +320,7 @@ connect_to_internet_server (const char *serverhost, u_short port)
char buf[512]; /* temporary buffer */
/* clear out address structures */
memset((char *)&peeraddr_in, 0, sizeof(struct sockaddr_in));
memset ((char *) &peeraddr_in, 0, sizeof (struct sockaddr_in));
/* Set up the peer address to which we will connect. */
peeraddr_in.sin_family = AF_INET;
@@ -315,23 +330,23 @@ connect_to_internet_server (const char *serverhost, u_short port)
glibtop_error ("unable to find %s in /etc/hosts or from YP", serverhost);
if (port == 0) {
if ((sp = getservbyname ("gtopd","tcp")) == NULL)
peeraddr_in.sin_port = htons (DEFAULT_PORT+getuid());
if ((sp = getservbyname ("gtopd", "tcp")) == NULL)
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);
/* Create the socket. */
if ((s = socket (AF_INET, SOCK_STREAM, 0))== -1)
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.
*/
if (connect(s, (struct sockaddr *)&peeraddr_in,
sizeof(struct sockaddr_in)) == -1)
/* 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");
#ifdef AUTH_MAGIC_COOKIE
@@ -339,26 +354,25 @@ connect_to_internet_server (const char *serverhost, u_short port)
/* send credentials using MIT-MAGIC-COOKIE-1 protocol */
server_xauth =
XauGetAuthByAddr(FamilyInternet,
sizeof(peeraddr_in.sin_addr.s_addr),
XauGetAuthByAddr (FamilyInternet,
sizeof (peeraddr_in.sin_addr.s_addr),
(char *) &peeraddr_in.sin_addr.s_addr,
strlen(MCOOKIE_SCREEN), MCOOKIE_SCREEN,
strlen(MCOOKIE_X_NAME), MCOOKIE_X_NAME);
strlen (MCOOKIE_SCREEN), MCOOKIE_SCREEN,
strlen (MCOOKIE_X_NAME), MCOOKIE_X_NAME);
if (server_xauth && server_xauth->data) {
sprintf(buf, "%s\n%d\n", MCOOKIE_NAME, server_xauth->data_length);
write (s, buf, strlen(buf));
sprintf (buf, "%s\n%d\n", MCOOKIE_NAME, server_xauth->data_length);
write (s, buf, strlen (buf));
write (s, server_xauth->data, server_xauth->data_length);
return (s);
}
#endif /* AUTH_MAGIC_COOKIE */
sprintf (buf, "%s\n", DEFAUTH_NAME);
write (s, buf, strlen(buf));
write (s, buf, strlen (buf));
return(s);
return (s);
} /* connect_to_internet_server */
#endif /* INTERNET_DOMAIN_SOCKETS */
@@ -366,24 +380,26 @@ 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
disconnect_from_server(s,echo)
disconnect_from_server (s, echo)
int s;
int echo;
{
#if 0
char buffer[REPLYSIZ+1];
char buffer[REPLYSIZ + 1];
#else
char buffer[GSERV_BUFSZ+1];
char buffer[GSERV_BUFSZ + 1];
#endif
int add_newline = 1;
int length;
send_string(s,EOT_STR); /* make sure server gets string */
send_string (s, EOT_STR); /* make sure server gets string */
#if !defined (linux) && !defined (_SCO_DS)
/*
@@ -394,38 +410,40 @@ disconnect_from_server(s,echo)
* with unix sockets persists. Sigh.
*/
if (shutdown(s,1) == -1) {
perror(progname);
fprintf(stderr, "%s: unable to shutdown socket\n",progname);
exit(1);
if (shutdown (s, 1) == -1) {
perror (progname);
fprintf (stderr, "%s: unable to shutdown socket\n", progname);
exit (1);
}; /* if */
#endif
#if 0
while((length = recv(s,buffer,REPLYSIZ,0)) > 0) {
while ((length = recv (s, buffer, REPLYSIZ, 0)) > 0) {
buffer[length] = '\0';
if (echo) fputs(buffer,stdout);
add_newline = (buffer[length-1] != '\n');
if (echo)
fputs (buffer, stdout);
add_newline = (buffer[length - 1] != '\n');
}; /* while */
#else
while ((length = read(s,buffer,GSERV_BUFSZ)) > 0 ||
while ((length = read (s, buffer, GSERV_BUFSZ)) > 0 ||
(length == -1 && errno == EINTR)) {
if (length) {
buffer[length] = '\0';
if (echo) {
fputs(buffer,stdout);
add_newline = (buffer[length-1] != '\n');
fputs (buffer, stdout);
add_newline = (buffer[length - 1] != '\n');
}; /* if */
}; /* if */
}; /* while */
#endif
if (echo && add_newline) putchar('\n');
if (echo && add_newline)
putchar ('\n');
if(length < 0) {
perror(progname);
fprintf(stderr,"%s: unable to read the reply from the server\n",progname);
exit(1);
if (length < 0) {
perror (progname);
fprintf (stderr, "%s: unable to read the reply from the server\n", progname);
exit (1);
}; /* if */
} /* disconnect_from_server */