debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill lots of warnings in DtSvc.

Browse Source
This commit is contained in:
Pascal Stumpf
2013-07-21 22:55:09 +02:00
committed by Jon Trulson
parent 0d7568e843
commit 8f98ac92cd
42 changed files with 275 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/lib/DtSvc/DtEncap/MemoryMgr.c
View File

@@ -36,6 +36,8 @@
#include "/usr/include/apollo/shlib.h"
#endif
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <bms/bms.h>
@@ -55,8 +57,8 @@ void * XeMalloc( size_t size )
XeString ptr;
if (!size) return 0;
if (ptr = malloc(size)) {
*ptr = (XeChar)NULL; /* Force first byte to NULL for bozos who */
if ((ptr = malloc(size))) {
*ptr = (XeChar)0; /* Force first byte to NULL for bozos who */
/* think malloc zeros memory! */
return ptr;
}

2
cde/lib/DtSvc/DtEncap/Symbolic.c
View File

@@ -36,6 +36,8 @@
#define SBSTDINC_H_NO_REDEFINE
#endif
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <assert.h>

13
cde/lib/DtSvc/DtEncap/connect.c
View File

@@ -32,6 +32,8 @@
* (c) Copyright 1993, 1994 Novell, Inc. *
*/
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <sys/socket.h> /**** needed by gethostbyname et al *****/
@@ -208,6 +210,7 @@ UnParseFileString(XeString host, XeString path)
/*------------------------------------------------------------------------+*/
int
XeParseFileString(XeString line,
XeString *host_addr,
XeString *path_addr)
@@ -261,7 +264,7 @@ GetDomainName(XeString buffer, unsigned int bufsize)
int status;
/* try to get domain name from hostname */
if (status = gethostname(tmpbuf, bufsize)) {
if ((status = gethostname(tmpbuf, bufsize))) {
XeFree(tmpbuf);
return status; /* failed gethostname */
}
@@ -287,7 +290,7 @@ GetDomainName(XeString buffer, unsigned int bufsize)
_DtSvcProcessUnlock();
return -1;
}
if (ptr = strstr(host_ret->h_name, (XeString)".")) /* if dot in canonical name */
if ((ptr = strstr(host_ret->h_name, (XeString)"."))) /* if dot in canonical name */
domainname = strdup(ptr);
}
@@ -308,9 +311,9 @@ Xegetshorthostname(XeString buffer, unsigned int bufsize)
XeString ptr;
int status;
if (status = gethostname(buffer, bufsize))
if ((status = gethostname(buffer, bufsize)))
return status; /* failed gethostname */
if (ptr = strstr(buffer, (XeString)"."))
if ((ptr = strstr(buffer, (XeString)".")))
*ptr = '\0'; /* delete domain name if there is one */
return 0;
}
@@ -385,7 +388,7 @@ Xegetcwd(char *buf, int size)
Boolean pwd_ok = FALSE;
char *env, *current_dir;
if (current_dir = getenv("PWD")) { /* use PWD instead of slow call */
if ((current_dir = getenv("PWD"))) { /* use PWD instead of slow call */
int s1, s2;
struct stat sb1, sb2;

4
cde/lib/DtSvc/DtEncap/local.c
View File

@@ -154,7 +154,7 @@ int local_channel_object_wait_for_termination(SPC_Channel_Ptr channel)
}
/*----------------------------------------------------------------------+*/
remove_logfile_local_channel_object(SPC_Channel_Ptr channel)
int remove_logfile_local_channel_object(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
int result;
@@ -206,7 +206,7 @@ void local_channel_object_input_handler(void * client_data,
timeout.tv_sec = 0;
timeout.tv_usec = 0;
#if defined(SVR4) || defined(__osf__) || defined(__hpux)
#if defined(SVR4) || defined(__osf__) || defined(__hpux) || defined(__OpenBSD__)
select(max_fds, (fd_set*)&read_fd_vect, NULL, (fd_set*)&except_fd_vect, &timeout);
#else
/* UX has select defined with int*, not fd_set* parms */

1
cde/lib/DtSvc/DtEncap/nls.c
View File

@@ -35,6 +35,7 @@
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <bms/bms.h>
#include <bms/MemoryMgr.h>
#ifndef CDE_LOGFILES_TOP
#define CDE_LOGFILES_TOP "/var/dt/tmp"

7
cde/lib/DtSvc/DtEncap/pty.c
View File

@@ -260,7 +260,7 @@ static int getspec1170ptypair(Wire *wire)
/*----------------------------------------------------------------------+*/
static getptypair(Wire *wire)
static int getptypair(Wire *wire)
/*----------------------------------------------------------------------+*/
{
/* Attempt to open the master/slave pair of preset pty */
@@ -639,7 +639,7 @@ int read_pty_channel_object(SPC_Channel_Ptr channel,
result = read(fd, buffer, nbytes);
} while (result<0 && errno == EINTR);
if(result == ERROR)
if(result == ERROR) {
if(errno == EIO) {
SPC_XtRemoveInput(&channel->wires[connector]->read_toolkit_id, SPC_Input);
SPC_Change_State(channel, connector, 0, -1);
@@ -652,6 +652,7 @@ int read_pty_channel_object(SPC_Channel_Ptr channel,
XeFree(connection_hostname);
return(SPC_ERROR);
}
}
return(result);
}
@@ -1031,7 +1032,7 @@ struct termios *SPC_Get_Current_Termio(void)
}
/*----------------------------------------------------------------------+*/
SPC_Setpgrp(int read_current_termio)
int SPC_Setpgrp(int read_current_termio)
/*----------------------------------------------------------------------+*/
{
_DtSvcProcessLock();

4
cde/lib/DtSvc/DtEncap/remote.c
View File

@@ -221,7 +221,7 @@ int reset_remote_channel_object(SPC_Channel_Ptr channel)
flush any queued data on this channel. */
{
if (tmpqueue=channel->queued_remote_data)
if ((tmpqueue=channel->queued_remote_data))
{
Xe_for_queue(protocol_request_ptr, prot, tmpqueue) {
Xe_delete_queue_element(channel->queued_remote_data, prot);
@@ -402,6 +402,7 @@ int attach_remote_channel_object(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
remove_logfile_remote_channel_object(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -448,6 +449,7 @@ int add_input_remote_channel_object(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
SPC_Debug_Mode(SPC_Channel_Ptr channel,
XeString file)
/*----------------------------------------------------------------------+*/

1
cde/lib/DtSvc/DtEncap/spc-env.c
View File

@@ -32,6 +32,7 @@
* (c) Copyright 1993, 1994 Novell, Inc. *
*/
#include <ctype.h>
#include <stdlib.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */

10
cde/lib/DtSvc/DtEncap/spc-error.c
View File

@@ -32,6 +32,8 @@
* (c) Copyright 1993, 1994 Novell, Inc. *
*/
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <errno.h>
#include <stdarg.h>
@@ -55,7 +57,7 @@ XeChar spc_logfile[MAXPATHLEN+1];
XeChar spc_logging = FALSE;
/* FILE *spc_logF = NULL; -- to bmsglob.c */
int spc_logfd = NULL;
int spc_logfd = 0;
/* This is the SPC error number variable */
/* ------------------------------------- */
@@ -243,6 +245,7 @@ void SPC_Error (int error, ...)
*/
/*----------------------------------------------------------------------+*/
int
SPC_Make_Log_Filename(XeString name,
int unique) /* When TRUE, make name unique */
/*----------------------------------------------------------------------+*/
@@ -283,6 +286,7 @@ SPC_Make_Log_Filename(XeString name,
}
/*----------------------------------------------------------------------+*/
int
SPC_Open_Log(XeString filename,
int unique) /* When TRUE, make filename unique */
/*----------------------------------------------------------------------+*/
@@ -308,6 +312,7 @@ SPC_Open_Log(XeString filename,
}
/*----------------------------------------------------------------------+*/
int
SPC_Close_Log(void)
/*----------------------------------------------------------------------+*/
{
@@ -319,7 +324,7 @@ SPC_Close_Log(void)
if (spc_logF) {
fclose(spc_logF);
}
spc_logfd = NULL;
spc_logfd = 0;
spc_logF = NULL;
spc_logging = FALSE;
@@ -328,6 +333,7 @@ SPC_Close_Log(void)
}
/*----------------------------------------------------------------------+*/
int
SPC_Write_Log(XeString str)
/*----------------------------------------------------------------------+*/
{

8
cde/lib/DtSvc/DtEncap/spc-exec.c
View File

@@ -33,6 +33,7 @@
*/
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
#include <ctype.h>
#include <errno.h>
#include <signal.h>
#include <sys/wait.h>
@@ -67,6 +68,9 @@ static int remove_variable(
static void resolve_variable_reference(
char **string );
Boolean _path_search (
XeString path, XeString filename, path_search_predicate p); /* XXX */
/*
* This array contains the process id's of the sub-processes
* started by the daemon. When a sub-process terminates, its
@@ -105,6 +109,7 @@ extern XeString *environ;
*/
/*----------------------------------------------------------------------+*/
int
SPC_Setup_Synchronous_Terminator(void)
/*----------------------------------------------------------------------+*/
{
@@ -167,6 +172,7 @@ void SPC_Close_Unused(void)
}
/*----------------------------------------------------------------------+*/
int
SPC_MakeSystemCommand(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -262,7 +268,7 @@ void SPC_Child_Terminated(int i)
prot->dataptr=pdata;
wait_pid = -1;
while(pid = waitpid(wait_pid, &status, WNOHANG)) {
while((pid = waitpid(wait_pid, &status, WNOHANG))) {
if((pid == -1 && errno == ECHILD) || pid == 0) {
/* no more children. Return */
errno = saved_errno;

4
cde/lib/DtSvc/DtEncap/spc-net.c
View File

@@ -172,6 +172,7 @@ Boolean SPC_Init_Local_Host_Info(void)
*/
/*----------------------------------------------------------------------+*/
int
SPC_Local_Hostname(XeString hostname)
/*----------------------------------------------------------------------+*/
{
@@ -287,6 +288,7 @@ SPC_Connection_Ptr SPC_Open_Connection(XeString hostname)
}
/*----------------------------------------------------------------------+*/
int
SPC_Open_Socket(SPC_Connection_Ptr conn,
int type)
/*----------------------------------------------------------------------+*/
@@ -319,6 +321,7 @@ SPC_Open_Socket(SPC_Connection_Ptr conn,
*/
/*----------------------------------------------------------------------+*/
int
SPC_Contact_Server(SPC_Connection_Ptr connection)
/*----------------------------------------------------------------------+*/
{
@@ -481,6 +484,7 @@ SPC_Connection_Ptr SPC_Standalone_Daemon(SPC_Connection_Ptr conn)
}
/*----------------------------------------------------------------------+*/
int
SPC_Inetd_Daemon(SPC_Connection_Ptr conn)
/*----------------------------------------------------------------------+*/
{

10
cde/lib/DtSvc/DtEncap/spc-obj.c
View File

@@ -120,6 +120,7 @@ static Wire dummy_wire={
};
/*----------------------------------------------------------------------+*/
int
SPC_ResetTerminator(void)
/*----------------------------------------------------------------------+*/
{
@@ -142,6 +143,7 @@ SPC_ResetTerminator(void)
}
/*----------------------------------------------------------------------+*/
int
SPC_Initialize(void)
/*----------------------------------------------------------------------+*/
{
@@ -265,6 +267,7 @@ void SPC_Channel_Terminated(SPC_Channel_Ptr channel)
*/
/*----------------------------------------------------------------------+*/
int
SPC_Check_Style(int iomode)
/*----------------------------------------------------------------------+*/
{
@@ -314,6 +317,7 @@ SPC_Check_Style(int iomode)
*/
/*----------------------------------------------------------------------+*/
int
SPC_Transform_Iomode(int iomode)
/*----------------------------------------------------------------------+*/
{
@@ -342,6 +346,7 @@ SPC_Transform_Iomode(int iomode)
*/
/*----------------------------------------------------------------------+*/
int
SPC_Newline_Filter(SPC_Channel_Ptr channel,
int connector,
XeString buffer,
@@ -399,6 +404,7 @@ SPC_Newline_Filter(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
SPC_Input_Handler(SPC_Channel_Ptr channel,
int connector)
/*----------------------------------------------------------------------+*/
@@ -642,6 +648,7 @@ int exec_proc_channel_object (SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
int
signal_channel_object (SPC_Channel_Ptr UNUSED_PARM(channel),
int UNUSED_PARM(sig))
/*----------------------------------------------------------------------+*/
@@ -659,6 +666,7 @@ int channel_object_wait_for_termination(SPC_Channel_Ptr UNUSED_PARM(channel))
/*----------------------------------------------------------------------+*/
int
attach_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel),
int UNUSED_PARM(pid))
/*----------------------------------------------------------------------+*/
@@ -668,6 +676,7 @@ attach_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel),
/*----------------------------------------------------------------------+*/
int
add_input_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel),
SbInputHandlerProc UNUSED_PARM(handler),
void *UNUSED_PARM(data) )
@@ -678,6 +687,7 @@ add_input_channel_object(SPC_Channel_Ptr UNUSED_PARM(channel),
/*----------------------------------------------------------------------+*/
int
remove_logfile_channel_object(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{

4
cde/lib/DtSvc/DtEncap/spc-proto.c
View File

@@ -586,8 +586,8 @@ void SPC_Flush_Queued_Data(SPC_Channel_Ptr channel)
XeQueue tmpqueue;
protocol_request_ptr prot;
if(tmpqueue=channel->queued_remote_data) {
while(prot=(protocol_request_ptr)Xe_pop_queue(tmpqueue))
if((tmpqueue=channel->queued_remote_data)) {
while((prot=(protocol_request_ptr)Xe_pop_queue(tmpqueue)))
SPC_Free_Protocol_Ptr(prot);
}

5
cde/lib/DtSvc/DtEncap/spc-sm.c
View File

@@ -66,6 +66,7 @@ static int (* spc_state_table[16]) (SPC_Channel_Ptr channel, int connector)= {
};
/*----------------------------------------------------------------------+*/
int
SPC_Change_State(SPC_Channel_Ptr channel,
int connector,
int data_line,
@@ -132,6 +133,7 @@ SPC_Change_State(SPC_Channel_Ptr channel,
error condition in the state table */
/*----------------------------------------------------------------------+*/
int
error_fun(SPC_Channel_Ptr UNUSED_PARM(channel),
int UNUSED_PARM(connector))
/*----------------------------------------------------------------------+*/
@@ -152,6 +154,7 @@ error_fun(SPC_Channel_Ptr UNUSED_PARM(channel),
*/
/*----------------------------------------------------------------------+*/
int
connector_eof(SPC_Channel_Ptr channel,
int connector)
/*----------------------------------------------------------------------+*/
@@ -196,6 +199,7 @@ connector_eof(SPC_Channel_Ptr channel,
/*----------------------------------------------------------------------+*/
int
connector_eof_with_reset(SPC_Channel_Ptr channel,
int connector)
/*----------------------------------------------------------------------+*/
@@ -216,6 +220,7 @@ connector_eof_with_reset(SPC_Channel_Ptr channel,
*/
/*----------------------------------------------------------------------+*/
int
sigcld_with_reset(SPC_Channel_Ptr channel,
int UNUSED_PARM(connector))
/*----------------------------------------------------------------------+*/

192
cde/lib/DtSvc/DtEncap/spc-termio.c
View File

@@ -125,120 +125,120 @@ struct cc_s
#define END_OF_LIST "End_Of_List"
static struct modes_s Input_modes[] = {
"BRKINT", BRKINT,
"ICRNL", ICRNL,
"IGNBRK", IGNBRK,
"IGNCR", IGNCR,
"IGNPAR", IGNPAR,
"INLCR", INLCR,
"INPCK", INPCK,
"ISTRIP", ISTRIP,
"IXOFF", IXOFF,
"IXON", IXON,
"PARMRK", PARMRK,
END_OF_LIST, 0
{ "BRKINT", BRKINT, },
{ "ICRNL", ICRNL, },
{ "IGNBRK", IGNBRK, },
{ "IGNCR", IGNCR, },
{ "IGNPAR", IGNPAR, },
{ "INLCR", INLCR, },
{ "INPCK", INPCK, },
{ "ISTRIP", ISTRIP, },
{ "IXOFF", IXOFF, },
{ "IXON", IXON, },
{ "PARMRK", PARMRK, },
{ END_OF_LIST, 0 },
};
static struct modes_s Output_modes[] = {
"OPOST", OPOST,
"ONLCR", ONLCR,
"OCRNL", OCRNL,
"ONOCR", ONOCR,
"ONLRET", ONLRET,
{ "OPOST", OPOST, },
{ "ONLCR", ONLCR, },
{ "OCRNL", OCRNL, },
{ "ONOCR", ONOCR, },
{ "ONLRET", ONLRET, },
#if !defined(CSRG_BASED)
"OFILL", OFILL,
"OFDEL", OFDEL,
"NLDLY", NLDLY,
"NL0", NL0,
"NL1", NL1,
"CRDLY", CRDLY,
"CR0", CR0,
"CR1", CR1,
"CR2", CR2,
"CR3", CR3,
"TABDLY", TABDLY,
"TAB0", TAB0,
"TAB1", TAB1,
"TAB2", TAB2,
"TAB3", TAB3,
"BSDLY", BSDLY,
"BS0", BS0,
"BS1", BS1,
"VTDLY", VTDLY,
"VT0", VT0,
"VT1", VT1,
"FFDLY", FFDLY,
"FF0", FF0,
"FF1", FF1,
{ "OFILL", OFILL, },
{ "OFDEL", OFDEL, },
{ "NLDLY", NLDLY, },
{ "NL0", NL0, },
{ "NL1", NL1, },
{ "CRDLY", CRDLY, },
{ "CR0", CR0, },
{ "CR1", CR1, },
{ "CR2", CR2, },
{ "CR3", CR3, },
{ "TABDLY", TABDLY, },
{ "TAB0", TAB0, },
{ "TAB1", TAB1, },
{ "TAB2", TAB2, },
{ "TAB3", TAB3, },
{ "BSDLY", BSDLY, },
{ "BS0", BS0, },
{ "BS1", BS1, },
{ "VTDLY", VTDLY, },
{ "VT0", VT0, },
{ "VT1", VT1, },
{ "FFDLY", FFDLY, },
{ "FF0", FF0, },
{ "FF1", FF1, },
#endif
END_OF_LIST, 0
{ END_OF_LIST, 0 },
};
static struct baud_s Baud_rates[] = {
"B0", B0,
"B50", B50,
"B75", B75,
"B110", B110,
"B134", B134,
"B150", B150,
"B200", B200,
"B300", B300,
"B600", B600,
"B1200", B1200,
"B1800", B1800,
"B2400", B2400,
"B4800", B4800,
"B9600", B9600,
"B19200", B19200,
"B38400", B38400,
END_OF_LIST, 0
{ "B0", B0, },
{ "B50", B50, },
{ "B75", B75, },
{ "B110", B110, },
{ "B134", B134, },
{ "B150", B150, },
{ "B200", B200, },
{ "B300", B300, },
{ "B600", B600, },
{ "B1200", B1200, },
{ "B1800", B1800, },
{ "B2400", B2400, },
{ "B4800", B4800, },
{ "B9600", B9600, },
{ "B19200", B19200, },
{ "B38400", B38400, },
{ END_OF_LIST, 0 },
};
static struct modes_s Control_modes[] = {
"CSIZE", CSIZE,
"CS5", CS5,
"CS6", CS6,
"CS7", CS7,
"CS8", CS8,
"CSTOPB", CSTOPB,
"CREAD", CREAD,
"PARENB", PARENB,
"PARODD", PARODD,
"HUPCL", HUPCL,
"CLOCAL", CLOCAL,
END_OF_LIST, 0
{ "CSIZE", CSIZE, },
{ "CS5", CS5, },
{ "CS6", CS6, },
{ "CS7", CS7, },
{ "CS8", CS8, },
{ "CSTOPB", CSTOPB, },
{ "CREAD", CREAD, },
{ "PARENB", PARENB, },
{ "PARODD", PARODD, },
{ "HUPCL", HUPCL, },
{ "CLOCAL", CLOCAL, },
{ END_OF_LIST, 0 },
};
static struct modes_s Local_modes[] = {
"ECHO", ECHO,
"ECHOE", ECHOE,
"ECHOK", ECHOK,
"ECHONL", ECHONL,
"ICANON", ICANON,
"IEXTEN", IEXTEN,
"ISIG", ISIG,
"NOFLSH", NOFLSH,
"TOSTOP", TOSTOP,
END_OF_LIST, 0
{ "ECHO", ECHO, },
{ "ECHOE", ECHOE, },
{ "ECHOK", ECHOK, },
{ "ECHONL", ECHONL, },
{ "ICANON", ICANON, },
{ "IEXTEN", IEXTEN, },
{ "ISIG", ISIG, },
{ "NOFLSH", NOFLSH, },
{ "TOSTOP", TOSTOP, },
{ END_OF_LIST, 0 },
};
static struct cc_s CC_Array[] = {
"VEOF", VEOF,
"VEOL", VEOL,
"VERASE", VERASE,
"VINTR", VINTR,
"VKILL", VKILL,
"VMIN", VMIN,
"VQUIT", VQUIT,
"VSTART", VSTART,
"VSTOP", VSTOP,
"VSUSP", VSUSP,
"VTIME", VTIME,
END_OF_LIST, 0
{ "VEOF", VEOF, },
{ "VEOL", VEOL, },
{ "VERASE", VERASE, },
{ "VINTR", VINTR, },
{ "VKILL", VKILL, },
{ "VMIN", VMIN, },
{ "VQUIT", VQUIT, },
{ "VSTART", VSTART, },
{ "VSTOP", VSTOP, },
{ "VSUSP", VSUSP, },
{ "VTIME", VTIME, },
{ END_OF_LIST, 0 },
};
@@ -291,7 +291,7 @@ static tcflag_t
if (!*buff)
return flag;
while (item = (XeString)STRTOKX(buff, SPC_TCFLAG_SEP))
while ((item = (XeString)STRTOKX(buff, SPC_TCFLAG_SEP)))
{
Boolean found = FALSE;
@@ -433,7 +433,7 @@ static void
if (!*buff) return;
while (cc_name = (XeString)STRTOKX(buff, SPC_TCFLAG_SEP))
while ((cc_name = (XeString)STRTOKX(buff, SPC_TCFLAG_SEP)))
{
Boolean found = FALSE;
@@ -533,7 +533,7 @@ void SPC_Encode_Termios(XeString buff, struct termios *tio)
int item_cnt = 0;
speed_t speed;
while (item = (XeString)STRTOKX(buff, SPC_TERMIO_SEP))
while ((item = (XeString)STRTOKX(buff, SPC_TERMIO_SEP)))
{
/* We can possibly have an all blank field. Walk past them */
/* because the routines we will be calling don't expect any */

3
cde/lib/DtSvc/DtEncap/spc-util.c
View File

@@ -96,6 +96,7 @@ SPC_Channel_Ptr SPC_Find_PID(int pid)
*/
/*----------------------------------------------------------------------+*/
int
spc_close(int fd)
/*----------------------------------------------------------------------+*/
{
@@ -108,6 +109,7 @@ spc_close(int fd)
}
/*----------------------------------------------------------------------+*/
int
spc_dup2(int from, int to)
/*----------------------------------------------------------------------+*/
{
@@ -134,6 +136,7 @@ spc_dup2(int from, int to)
}
/*----------------------------------------------------------------------+*/
int
SPC_fd_to_connector(SPC_Channel_Ptr channel,
int fd)
/*----------------------------------------------------------------------+*/

3
cde/lib/DtSvc/DtEncap/spc-xt.c
View File

@@ -133,7 +133,8 @@ static SbInputId SPC_RemoveInput(int source,
}
/*-----------------------------------------------------------------------+*/
static SPC_Select(void )
static int
SPC_Select(void )
/*-----------------------------------------------------------------------+*/
{
break_on_termination=TRUE;

22
cde/lib/DtSvc/DtEncap/spc.c
View File

@@ -118,6 +118,7 @@ SPC_Channel_Ptr XeSPCOpen(XeString hostname,
}
/*----------------------------------------------------------------------+*/
int
XeSPCClose(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -141,6 +142,7 @@ XeSPCClose(SPC_Channel_Ptr channel)
}
/*----------------------------------------------------------------------+*/
int
XeSPCReset(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -163,6 +165,7 @@ XeSPCReset(SPC_Channel_Ptr channel)
}
/*----------------------------------------------------------------------+*/
int
XeSPCRead(SPC_Channel_Ptr channel,
int connector, /* STDOUT or STDERR */
XeString buffer,
@@ -201,6 +204,7 @@ XeSPCRead(SPC_Channel_Ptr channel,
/*----------------------------------------------------------------------+*/
int
XeSPCWrite(SPC_Channel_Ptr channel,
XeString buffer,
int length)
@@ -230,6 +234,7 @@ XeSPCWrite(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
XeSPCActive(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -244,6 +249,7 @@ XeSPCActive(SPC_Channel_Ptr channel)
}
/*----------------------------------------------------------------------+*/
int
XeSPCData(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -258,6 +264,7 @@ XeSPCData(SPC_Channel_Ptr channel)
}
/*----------------------------------------------------------------------+*/
int
XeSPCExecuteProcess(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -286,6 +293,7 @@ XeSPCExecuteProcess(SPC_Channel_Ptr channel)
}
/*----------------------------------------------------------------------+*/
int
XeSPCSignalProcess(SPC_Channel_Ptr channel,
int sig)
/*----------------------------------------------------------------------+*/
@@ -308,6 +316,7 @@ XeSPCSignalProcess(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
XeSPCAddInput(SPC_Channel_Ptr channel,
SbInputHandlerProc handler,
/*----------------------------------------------------------------------+*/
@@ -332,6 +341,7 @@ XeSPCAddInput(SPC_Channel_Ptr channel,
/*----------------------------------------------------------------------+*/
int
XeSPCRegisterTerminator(SPC_Channel_Ptr channel,
SPC_TerminateHandlerType terminator,
void * client_data)
@@ -371,6 +381,7 @@ XeSPCRegisterTerminator(SPC_Channel_Ptr channel,
/*----------------------------------------------------------------------+*/
int
XeSPCAttach(SPC_Channel_Ptr channel,
int pid)
/*----------------------------------------------------------------------+*/
@@ -385,6 +396,7 @@ XeSPCAttach(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
XeSPCDetach(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -417,6 +429,7 @@ XeSPCDetach(SPC_Channel_Ptr channel)
*/
/*----------------------------------------------------------------------+*/
int
XeSPCSpawn(XeString pathname,
XeString context_dir,
XeString *argv,
@@ -505,6 +518,7 @@ XeSPCKillProcesses(int wait)
}
/*----------------------------------------------------------------------+*/
int
XeSPCKillProcess(SPC_Channel_Ptr channel,
int wait)
/*----------------------------------------------------------------------+*/
@@ -527,6 +541,7 @@ XeSPCKillProcess(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
XeSPCInterruptProcess(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -567,6 +582,7 @@ XeString XeSPCGetDevice(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
XeSPCGetProcessStatus(SPC_Channel_Ptr channel,
int *type,
int *cause)
@@ -609,6 +625,7 @@ XeSPCGetProcessStatus(SPC_Channel_Ptr channel,
}
/*----------------------------------------------------------------------+*/
int
XeSPCGetPID(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -677,6 +694,7 @@ int XeSPCRemoveLogfile(SPC_Channel_Ptr channel)
*/
/*----------------------------------------------------------------------+*/
int
SPC_Process_Single_Prot_Request(protocol_request_ptr req, SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -724,7 +742,7 @@ SPC_Channel_Ptr XeSPCHandleTerminator(int fd)
connection_queue=connection->queued_remote_data;
Xe_push_queue(connection_queue, prot);
while(prot=(protocol_request_ptr)Xe_pop_queue(connection_queue)) {
while((prot=(protocol_request_ptr)Xe_pop_queue(connection_queue))) {
channel=prot->channel;
@@ -755,6 +773,7 @@ SPC_Channel_Ptr XeSPCHandleTerminator(int fd)
*/
/*----------------------------------------------------------------------+*/
int
XeSPCGetChannelSyncFd(SPC_Channel_Ptr channel)
/*----------------------------------------------------------------------+*/
{
@@ -852,6 +871,7 @@ void XeSPCRestartCallbacks(void)
*/
/*----------------------------------------------------------------------+*/
int
XeSetpgrp(int read_current_termio)
/*----------------------------------------------------------------------+*/
{

4
cde/lib/DtSvc/DtEncap/stringbuf.c
View File

@@ -116,7 +116,7 @@ XeAppendToStringBuffer(XeStringBuffer buffer, XeString string)
buffer->last_char = i - 1;
if (-1 == ExpandStringBuffer(buffer)) return(-1);
}
buffer->buffer[i] = (XeChar) NULL;
buffer->buffer[i] = (XeChar)'\0';
buffer->last_char = i;
# if DEBUG >= 5
sprintf(debug_string, "new string is: \"%s\"", buffer->buffer);
@@ -131,7 +131,7 @@ XeClearStringBuffer(XeStringBuffer buffer)
/*------------------------------------------------------------------------+*/
{
XeString string = buffer->buffer;
string[0] = (XeChar) NULL;
string[0] = (XeChar)'\0';
buffer->last_char = 0;
}