bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed all error return codes

Browse Source
This commit is contained in:
Michiel Broek
2002-10-20 20:58:55 +00:00
parent 1d819c9201
commit 02a1621f62
73 changed files with 2103 additions and 2022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mbmon/Makefile
View File

@@ -57,7 +57,7 @@ depend:
# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
# Dependencies generated by make depend
mutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h common.h mutil.h
mutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mberrors.h common.h mutil.h
mbmon.o: ../config.h ../lib/libs.h ../lib/memwatch.h common.h mutil.h
common.o: ../config.h ../lib/libs.h ../lib/memwatch.h common.h
common.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mberrors.h common.h
# End of generated dependencies

113
mbmon/common.c
View File

@@ -31,6 +31,7 @@
#include "../config.h"
#include "../lib/libs.h"
#include "../lib/memwatch.h"
#include "../lib/mberrors.h"
#include <sys/un.h>
#include "common.h"
@@ -43,30 +44,30 @@ static int sock = -1; /* TCP/IP socket */
int ttyfd; /* Filedescriptor for raw mode */
struct termios tbufs, tbufsavs; /* Structure for raw mode */
struct sockaddr_un clntaddr; /* Client socket address */
struct sockaddr_un servaddr; /* Server socket address */
struct sockaddr_un from; /* From socket address */
int fromlen;
static char spath[108]; /* Server socket path */
static char cpath[108]; /* Client socket path */
struct sockaddr_un clntaddr; /* Client socket address */
struct sockaddr_un servaddr; /* Server socket address */
struct sockaddr_un from; /* From socket address */
int fromlen;
static char spath[PATH_MAX]; /* Server socket path */
static char cpath[PATH_MAX]; /* Client socket path */
void InitClient(char *user)
{
sprintf(cpath, "%s/tmp/mbmon%d", getenv("MBSE_ROOT"), getpid());
sprintf(spath, "%s/tmp/mbtask", getenv("MBSE_ROOT"));
sprintf(cpath, "%s/tmp/mbmon%d", getenv("MBSE_ROOT"), getpid());
sprintf(spath, "%s/tmp/mbtask", getenv("MBSE_ROOT"));
/*
* Store my pid in case a child process is forked and wants to do
* some communications with the mbsed server.
*/
mypid = getpid();
if (socket_connect(user) == -1) {
printf("PANIC: cannot access socket\n");
exit(1);
}
/*
* Store my pid in case a child process is forked and wants to do
* some communications with the mbsed server.
*/
mypid = getpid();
if (socket_connect(user) == -1) {
printf("PANIC: cannot access socket\n");
exit(MBERR_INIT_ERROR);
}
}
@@ -456,41 +457,31 @@ int rawset = FALSE;
*/
void Setraw()
{
int rc;
int rc;
if ((rc = tcgetattr(ttyfd, &tbufs))) {
perror("");
printf("$tcgetattr(0, save) return %d\n", rc);
exit(1);
}
if ((rc = tcgetattr(ttyfd, &tbufs))) {
perror("");
printf("$tcgetattr(0, save) return %d\n", rc);
exit(MBERR_TTYIO_ERROR);
}
// if (ioctl(ttyfd, TCGETA, &tbuf) == -1) {
// perror("TCGETA Failed");
// exit(1); /* ERROR - could not set get tty ioctl */
// }
tbufsavs = tbufs;
tbufs.c_iflag &= ~(INLCR | ICRNL | ISTRIP | IXON );
/*
* Map CRNL modes strip control characters and flow control
*/
tbufs.c_oflag &= ~OPOST; /* Don't do ouput character translation */
tbufs.c_lflag &= ~(ICANON | ECHO); /* No canonical input and no echo */
tbufs.c_cc[VMIN] = 1; /* Receive 1 character at a time */
tbufs.c_cc[VTIME] = 0; /* No time limit per character */
tbufsavs = tbufs;
tbufs.c_iflag &= ~(INLCR | ICRNL | ISTRIP | IXON );
/*
* Map CRNL modes strip control characters and flow control
*/
tbufs.c_oflag &= ~OPOST; /* Don't do ouput character translation */
tbufs.c_lflag &= ~(ICANON | ECHO); /* No canonical input and no echo */
tbufs.c_cc[VMIN] = 1; /* Receive 1 character at a time */
tbufs.c_cc[VTIME] = 0; /* No time limit per character */
if ((rc = tcsetattr(ttyfd, TCSADRAIN, &tbufs))) {
perror("");
printf("$tcsetattr(%d, TCSADRAIN, raw) return %d\n", ttyfd, rc);
exit(MBERR_TTYIO_ERROR);
}
if ((rc = tcsetattr(ttyfd, TCSADRAIN, &tbufs))) {
perror("");
printf("$tcsetattr(%d, TCSADRAIN, raw) return %d\n", ttyfd, rc);
exit(1);
}
// if (ioctl(ttyfd, TCSETAF, &tbuf) == -1) {
// perror("TCSETAF failed");
// exit(1); /* ERROR - could not set tty ioctl */
// }
rawset = TRUE;
rawset = TRUE;
}
@@ -500,23 +491,19 @@ void Setraw()
*/
void Unsetraw()
{
int rc;
int rc;
/*
* Only unset the mode if it is set to raw mode
*/
if (rawset == TRUE) {
// if (ioctl(ttyfd, TCSETAF, &tbufsav) == -1) {
// perror("TCSETAF Normal Failed");
// exit(1); /* ERROR - could not save original tty ioctl */
// }
if ((rc = tcsetattr(ttyfd, TCSAFLUSH, &tbufsavs))) {
perror("");
printf("$tcsetattr(%d, TCSAFLUSH, save) return %d\n", ttyfd, rc);
exit(1);
}
/*
* Only unset the mode if it is set to raw mode
*/
if (rawset == TRUE) {
if ((rc = tcsetattr(ttyfd, TCSAFLUSH, &tbufsavs))) {
perror("");
printf("$tcsetattr(%d, TCSAFLUSH, save) return %d\n", ttyfd, rc);
exit(MBERR_TTYIO_ERROR);
}
rawset = FALSE;
}
rawset = FALSE;
}

9
mbmon/mutil.c
View File

@@ -31,6 +31,7 @@
#include "../config.h"
#include "../lib/libs.h"
#include "../lib/memwatch.h"
#include "../lib/mberrors.h"
#include "common.h"
#include "mutil.h"
@@ -44,8 +45,8 @@ unsigned char readkey(int y, int x, int fg, int bg)
unsigned char ch = 0;
if ((ttyfd = open("/dev/tty", O_RDWR|O_NONBLOCK)) < 0) {
perror("open 9");
exit(1);
perror("open /dev/tty");
exit(MBERR_TTYIO_ERROR);
}
Setraw();
@@ -87,8 +88,8 @@ unsigned char testkey(int y, int x)
fflush(stdout);
if ((ttyfd = open("/dev/tty", O_RDWR|O_NONBLOCK)) < 0) {
perror("open 9");
exit(1);
perror("open /dev/tty");
exit(MBERR_TTYIO_ERROR);
}
Setraw();