Added prototype. Added cast to const void *' in calls to
write' and
1998-08-25 Martin Baulig <martin@home-of-linux.org> * daemon.h (handle_parent_connection): Added prototype. * write.c, io.c: Added cast to `const void *' in calls to `write' and `send' to avoid compiler warnings. * gnuserv.c (handle_signal): Declared static. (main): Casting return value of `getuid' to `int' in debugging statement. * ChangeLog: New file.
This commit is contained in:
committed by
Martin Baulig
parent
9049a19434
commit
f66f7fde8c
11
src/daemon/ChangeLog
Normal file
11
src/daemon/ChangeLog
Normal file
@@ -0,0 +1,11 @@
|
||||
1998-08-25 Martin Baulig <martin@home-of-linux.org>
|
||||
|
||||
* daemon.h (handle_parent_connection): Added prototype.
|
||||
* write.c, io.c: Added cast to `const void *' in calls to
|
||||
`write' and `send' to avoid compiler warnings.
|
||||
* gnuserv.c (handle_signal): Declared static.
|
||||
(main): Casting return value of `getuid' to `int' in
|
||||
debugging statement.
|
||||
|
||||
* ChangeLog: New file.
|
||||
|
@@ -50,6 +50,7 @@ __BEGIN_DECLS
|
||||
#define MSG_BUFSZ sizeof (struct _glibtop_ipc_message)
|
||||
#define MSG_MSGSZ (MSG_BUFSZ - sizeof (long))
|
||||
|
||||
extern void handle_parent_connection __P((int));
|
||||
extern void handle_slave_connection __P((int, int));
|
||||
extern void handle_slave_command __P((glibtop_command *, glibtop_response *, const void *));
|
||||
|
||||
|
@@ -43,6 +43,7 @@
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#ifdef AIX
|
||||
#include <sys/select.h>
|
||||
@@ -480,7 +481,7 @@ handle_unix_request (int ls)
|
||||
|
||||
#endif /* UNIX_DOMAIN_SOCKETS */
|
||||
|
||||
void
|
||||
static void
|
||||
handle_signal (int sig)
|
||||
{
|
||||
fprintf (stderr, "Catched signal %d.\n", sig);
|
||||
@@ -521,8 +522,11 @@ main (int argc, char *argv [])
|
||||
|
||||
/* Temporarily drop our priviledges. */
|
||||
|
||||
#ifdef DEBUG
|
||||
fprintf (stderr, "Child ID: (%d, %d) - (%d, %d)\n",
|
||||
getuid (), geteuid (), getgid (), getegid ());
|
||||
(int) getuid (), (int) geteuid (),
|
||||
(int) getgid (), (int) getegid ());
|
||||
#endif
|
||||
|
||||
if (setreuid (geteuid (), getuid ()))
|
||||
glibtop_error_io ("setreuid (euid <-> uid)");
|
||||
@@ -530,8 +534,11 @@ main (int argc, char *argv [])
|
||||
if (setregid (getegid (), getgid ()))
|
||||
glibtop_error_io ("setregid (egid <-> gid)");
|
||||
|
||||
#ifdef DEBUG
|
||||
fprintf (stderr, "Child ID: (%d, %d) - (%d, %d)\n",
|
||||
getuid (), geteuid (), getgid (), getegid ());
|
||||
(int) getuid (), (int) geteuid (),
|
||||
(int) getgid (), (int) getegid ());
|
||||
#endif
|
||||
|
||||
#ifdef UNIX_DOMAIN_SOCKETS
|
||||
/* get a unix domain socket to listen on. */
|
||||
|
@@ -34,10 +34,10 @@ do_output (int s, glibtop_response *resp, off_t offset,
|
||||
resp->data_size = data_size;
|
||||
|
||||
if (s == 0) {
|
||||
if (write (1, resp, sizeof (glibtop_response)) < 0)
|
||||
if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0)
|
||||
glibtop_warn_io ("write");
|
||||
} else {
|
||||
if (send (s, resp, sizeof (glibtop_response), 0) < 0)
|
||||
if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
|
||||
glibtop_warn_io ("send");
|
||||
}
|
||||
|
||||
|
@@ -41,18 +41,18 @@ glibtop_send_version (glibtop *server, int fd)
|
||||
fprintf (stderr, "SERVER ID: |%s|\n", buffer);
|
||||
|
||||
if (fd == 0) {
|
||||
if (write (1, &size, sizeof (size)) < 0)
|
||||
if (write (1, (const void *) &size, sizeof (size)) < 0)
|
||||
glibtop_warn_io_r (server, "write");
|
||||
} else {
|
||||
if (send (fd, &size, sizeof (size), 0) < 0)
|
||||
if (send (fd, (const void *) &size, sizeof (size), 0) < 0)
|
||||
glibtop_warn_io_r (server, "send");
|
||||
}
|
||||
|
||||
if (fd == 0) {
|
||||
if (write (1, buffer, size) < 0)
|
||||
if (write (1, (const void *) buffer, size) < 0)
|
||||
glibtop_warn_io_r (server, "write");
|
||||
} else {
|
||||
if (send (fd, buffer, size, 0) < 0)
|
||||
if (send (fd, (const void *) buffer, size, 0) < 0)
|
||||
glibtop_warn_io_r (server, "send");
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user