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

Cleaned. Replaced multiple strcpy/cat by g_strdup_printf. Replaced strncpy

Browse Source 
* gnuslib.c: (connect_to_internet_server): Cleaned.
	* mountlist.c: (glibtop_get_mountlist_s): Replaced multiple strcpy/cat by
	g_strdup_printf. Replaced strncpy by g_strlcpy.
This commit is contained in:
Benoît Dejean
2004-06-06 21:58:51 +00:00
parent 45f2f19c3a
commit d8cb4ccdf7
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sysdeps/common/ChangeLog
View File

@@ -1,3 +1,9 @@
2004-06-06 Benoît Dejean <tazforever@dlfp.org>
* gnuslib.c: (connect_to_internet_server): Cleaned.
* mountlist.c: (glibtop_get_mountlist_s): Replaced multiple strcpy/cat by
g_strdup_printf. Replaced strncpy by g_strlcpy.
2004-03-15 Bastien Nocera <hadess@hadess.net> 2004-03-15 Bastien Nocera <hadess@hadess.net>
* fsusage.c: * fsusage.c:

2
sysdeps/common/gnuslib.c
View File

@@ -241,7 +241,7 @@ connect_to_internet_server (const char *serverhost, u_short port)
char buf[512]; /* temporary buffer */ char buf[512]; /* temporary buffer */
/* clear out address structures */ /* clear out address structures */
memset ((char *) &peeraddr_in, 0, sizeof (struct sockaddr_in)); memset (&peeraddr_in, 0, sizeof (struct sockaddr_in));
/* Set up the peer address to which we will connect. */ /* Set up the peer address to which we will connect. */
peeraddr_in.sin_family = AF_INET; peeraddr_in.sin_family = AF_INET;

24
sysdeps/common/mountlist.c
View File

@@ -439,9 +439,7 @@ read_filesystem_list (need_fs_type, all_fs)
#ifdef GETFSTYP /* SVR3. */ #ifdef GETFSTYP /* SVR3. */
me->me_devname = g_strdup (mnt.mt_dev); me->me_devname = g_strdup (mnt.mt_dev);
#else #else
me->me_devname = g_malloc (strlen (mnt.mt_dev) + 6); me->me_devname = g_strdup_printf("/dev/%s", mnt.mt_dev);
strcpy (me->me_devname, "/dev/");
strcpy (me->me_devname + 5, mnt.mt_dev);
#endif #endif
me->me_mountdir = g_strdup (mnt.mt_filsys); me->me_mountdir = g_strdup (mnt.mt_filsys);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
@@ -546,10 +544,7 @@ read_filesystem_list (need_fs_type, all_fs)
/* Prepend the remote pathname. */ /* Prepend the remote pathname. */
host = thisent + vmp->vmt_data[VMT_HOSTNAME].vmt_off; host = thisent + vmp->vmt_data[VMT_HOSTNAME].vmt_off;
path = thisent + vmp->vmt_data[VMT_OBJECT].vmt_off; path = thisent + vmp->vmt_data[VMT_OBJECT].vmt_off;
me->me_devname = g_malloc (strlen (host) + strlen (path) + 2); me->me_devname = g_strdup_printf("%s:%s", host, path);
strcpy (me->me_devname, host);
strcat (me->me_devname, ":");
strcat (me->me_devname, path);
} }
else else
{ {
@@ -606,24 +601,21 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)
mount_list = g_malloc (buf->total); mount_list = g_malloc (buf->total);
/* Write data into mount_list. */ /* Write data into mount_list and free memory. */
for (count = 0, tmp = me; tmp; count++, tmp = tmp->me_next) { for (count = 0, tmp = me; tmp; count++, tmp = next) {
strncpy (mount_list [count].devname, tmp->me_devname,
g_strlcpy (mount_list [count].devname, tmp->me_devname,
GLIBTOP_MOUNTENTRY_LEN); GLIBTOP_MOUNTENTRY_LEN);
strncpy (mount_list [count].mountdir, tmp->me_mountdir, g_strlcpy (mount_list [count].mountdir, tmp->me_mountdir,
GLIBTOP_MOUNTENTRY_LEN); GLIBTOP_MOUNTENTRY_LEN);
strncpy (mount_list [count].type, tmp->me_type, g_strlcpy (mount_list [count].type, tmp->me_type,
GLIBTOP_MOUNTENTRY_LEN); GLIBTOP_MOUNTENTRY_LEN);
mount_list [count].devname [GLIBTOP_MOUNTENTRY_LEN] = 0; mount_list [count].devname [GLIBTOP_MOUNTENTRY_LEN] = 0;
mount_list [count].mountdir [GLIBTOP_MOUNTENTRY_LEN] = 0; mount_list [count].mountdir [GLIBTOP_MOUNTENTRY_LEN] = 0;
mount_list [count].type [GLIBTOP_MOUNTENTRY_LEN] = 0; mount_list [count].type [GLIBTOP_MOUNTENTRY_LEN] = 0;
mount_list [count].dev = tmp->me_dev; mount_list [count].dev = tmp->me_dev;
}
/* Free memory. */
for (count = 0, tmp = me; tmp; count++, tmp = next) {
next = tmp->me_next; next = tmp->me_next;
g_free (tmp->me_devname); g_free (tmp->me_devname);
g_free (tmp->me_mountdir); g_free (tmp->me_mountdir);