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

Replaced glibtop_init_r' with glibtop_init_s'.

Browse Source 
1998-07-24  Martin Baulig  <martin@home-of-linux.org>

	* sysdeps/{kernel, linux}/*.c: Replaced `glibtop_init_r' with
	`glibtop_init_s'.

	* sysdeps/sun4/open.c (glibtop_init_p): Removed `program_name'
	parameter.

	* sysdeps/osf1/glibtop_suid.h: New file.

	* sysdeps/osf1/glibtop_server.h: Now correctly using
	`(1 << GLIBTOP_SYSDEPS_*)' instead of `GLIBTOP_SYSDEPS_*'.

	* sysdeps/osf1/open_suid.c (glibtop_init_p): New function.

	* sysdeps/osf1/proc*.c: Done some more work here.
This commit is contained in:
Martin Baulig
1998-07-24 10:26:42 +00:00
committed by Martin Baulig
parent 51c5c3ac22
commit f3f051ecba
46 changed files with 380 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sysdeps/osf1/proclist.c
View File

@@ -24,6 +24,8 @@
#include <glibtop/xmalloc.h>
#include <glibtop/proclist.h>
#include <glibtop_suid.h>
static const unsigned long _glibtop_sysdeps_proclist =
(1 << GLIBTOP_PROCLIST_TOTAL) + (1 << GLIBTOP_PROCLIST_NUMBER) +
(1 << GLIBTOP_PROCLIST_SIZE);
@@ -62,24 +64,24 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf)
struct tbl_procinfo procinfo [8];
int entry, max_elements, k;
glibtop_open_p (server, 0, 0);
glibtop_init_p (server, 0, 0);
memset (buf, 0, sizeof (glibtop_proclist));
for (entry = 0; entry < server->machine.proctable_entries;
entry += ELEMENTS_PER_ENTRY)
{
/* !!! THE FOLLOWING CODE RUNS SUID ROOT -
* CHANGE WITH CAUTION !!! */
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
setreuid (server->machine.uid, server->machine.euid);
max_elements = table (TBL_PROCINFO, entry, (char *) &procinfo,
ELEMENTS_PER_ENTRY, sizeof (struct tbl_procinfo));
glibtop_suid_enter (server);
max_elements = table
(TBL_PROCINFO, entry, (char *) &procinfo,
ELEMENTS_PER_ENTRY, sizeof (struct tbl_procinfo));
glibtop_suid_leave (server);
if (setreuid (server->machine.euid, server->machine.uid))
_exit (1);
/* !!! END OF SUID ROOT PART !!! */
for (k = 0; k < max_elements; k++)
@@ -89,46 +91,50 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf)
if (procinfo [k].pi_status == 0)
continue;
/* The following code is copied from the Linux implementation.
* It's safe since we are no longer root at this point here. */
/* Fine. Now we first try to store it in pids. If this buffer is
* full, we copy it to the pids_chain. */
/* Fine. Now we first try to store it in pids.
* If this buffer is full, we copy it to the
* pids_chain. */
if (count >= BLOCK_COUNT) {
/* The following call to glibtop_realloc will be equivalent to
* glibtop_malloc if pids_chain is NULL. We just calculate the
* new size and copy pids to the beginning of the newly allocated
* block. */
/* The following call to glibtop_realloc ()
* will be equivalent to glibtop_malloc ()
* if `pids_chain' is NULL. We just calculate
* the new size and copy `pids' to the
* beginning of the newly allocated block. */
new_size = pids_size + BLOCK_SIZE;
pids_chain = glibtop_realloc_r (server, pids_chain, new_size);
pids_chain = glibtop_realloc_r
(server, pids_chain, new_size);
memcpy (pids_chain + pids_offset, pids, BLOCK_SIZE);
memcpy (pids_chain + pids_offset,
pids, BLOCK_SIZE);
pids_size = new_size;
pids_offset += BLOCK_COUNT;
count = 0;
}
/* pids is now big enough to hold at least one single pid. */
/* pids is now big enough to hold at least
* one single pid. */
pids [count++] = procinfo [k].pi_pid;
total++;
}
}
/* count is only zero if an error occured (eg. the server is not suid root). */
/* count is only zero if an error occured
* (eg. the server is not suid root). */
if (!count) return NULL;
/* The following call to glibtop_realloc will be equivalent to
* glibtop_malloc if pids_chain is NULL. We just calculate the
* new size and copy pids to the beginning of the newly allocated
/* The following call to glibtop_realloc () will be equivalent to
* glibtop_malloc () if `pids_chain' is NULL. We just calculate the
* new size and copy `pids' to the beginning of the newly allocated
* block. */
new_size = pids_size + count * sizeof (unsigned);
@@ -141,8 +147,8 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf)
pids_offset += BLOCK_COUNT;
/* Since everything is ok now, we can set buf->flags, fill in the remaining fields
and return pids_chain. */
/* Since everything is ok now, we can set buf->flags, fill in the
* remaining fields and return `pids_chain'. */
buf->flags = _glibtop_sysdeps_proclist;