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

s/strncpy/g_strlcpy/.

Browse Source 
* netload.c: (glibtop_get_netload_p):
	* procstate.c: (glibtop_get_proc_state_p):
	* prockernel.c: (glibtop_get_proc_kernel_p): s/strncpy/g_strlcpy/.

	* procargs.c: (glibtop_get_proc_args_p):
	* procmap.c: (glibtop_get_proc_map_p): Cleaned.
This commit is contained in:
Benoît Dejean
2004-06-06 22:03:57 +00:00
parent 31e8abe019
commit 2f87aa4479
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sysdeps/freebsd/ChangeLog
View File

@@ -1,3 +1,13 @@
2004-06-07 Benoît Dejean <tazforever@dlfp.org>
* netload.c: (glibtop_get_netload_p):
* procstate.c: (glibtop_get_proc_state_p):
* prockernel.c: (glibtop_get_proc_kernel_p): s/strncpy/g_strlcpy/.
* procargs.c: (glibtop_get_proc_args_p):
* procmap.c: (glibtop_get_proc_map_p): Cleaned.
2004-05-26 Benoît Dejean <tazforever@dlfp.org> 2004-05-26 Benoît Dejean <tazforever@dlfp.org>
* procdata.c: (glibtop_get_procdata_s): Removed Linux related code. * procdata.c: (glibtop_get_procdata_s): Removed Linux related code.

3
sysdeps/freebsd/netload.c
View File

@@ -118,8 +118,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
strcat(tname, temp); strcat(tname, temp);
tname [15] = 0; tname [15] = 0;
#else #else
strncpy (tname, ifnet.if_xname, 16); g_strlcpy (tname, ifnet.if_xname, sizeof tname);
tname [15] = 0;
#endif #endif
#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000) #if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)

7
sysdeps/freebsd/procargs.c
View File

@@ -50,7 +50,7 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
{ {
struct kinfo_proc *pinfo; struct kinfo_proc *pinfo;
char *retval, **args, **ptr; char *retval, **args, **ptr;
unsigned size = 0, pos = 0; size_t size = 0, pos = 0;
int count; int count;
#ifndef __bsdi__ #ifndef __bsdi__
@@ -93,11 +93,10 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
size += strlen (*ptr)+1; size += strlen (*ptr)+1;
size += 2; size += 2;
retval = g_malloc (size); retval = g_malloc0 (size);
memset (retval, 0, size);
for (ptr = args; *ptr; ptr++) { for (ptr = args; *ptr; ptr++) {
int len = strlen (*ptr)+1; const size_t len = strlen (*ptr)+1;
memcpy (retval+pos, *ptr, len); memcpy (retval+pos, *ptr, len);
pos += len; pos += len;
} }

5
sysdeps/freebsd/prockernel.c
View File

@@ -138,9 +138,8 @@ glibtop_get_proc_kernel_p (glibtop *server,
buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN); buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN);
if (pinfo [0].PROC_WCHAN && pinfo [0].PROC_WMESG) { if (pinfo [0].PROC_WCHAN && pinfo [0].PROC_WMESG) {
strncpy (buf->wchan, pinfo [0].PROC_WMESG, g_strlcpy (buf->wchan, pinfo [0].PROC_WMESG,
sizeof (buf->wchan) - 1); sizeof buf->wchan);
buf->wchan [sizeof (buf->wchan) - 1] = 0;
buf->flags |= (1L << GLIBTOP_PROC_KERNEL_WCHAN); buf->flags |= (1L << GLIBTOP_PROC_KERNEL_WCHAN);
} else { } else {
buf->wchan [0] = 0; buf->wchan [0] = 0;

4
sysdeps/freebsd/procmap.c
View File

@@ -150,9 +150,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
buf->total = buf->number * buf->size; buf->total = buf->number * buf->size;
maps = g_malloc (buf->total); maps = g_malloc0(buf->total);
memset (maps, 0, buf->total);
buf->flags = _glibtop_sysdeps_proc_map; buf->flags = _glibtop_sysdeps_proc_map;

3
sysdeps/freebsd/procstate.c
View File

@@ -90,8 +90,7 @@ glibtop_get_proc_state_p (glibtop *server,
#endif #endif
strncpy (buf->cmd, pinfo [0].PROC_COMM, sizeof (buf->cmd)-1); g_strlcpy (buf->cmd, pinfo [0].PROC_COMM, sizeof buf->cmd);
buf->cmd [sizeof (buf->cmd)-1] = 0;
buf->uid = pinfo [0].PROC_SVUID; buf->uid = pinfo [0].PROC_SVUID;
buf->gid = pinfo [0].PROC_SVGID; buf->gid = pinfo [0].PROC_SVGID;