swrun_*: Simplify commit da00ba1
diff --git a/agent/mibgroup/host/data_access/swrun_cygwin.c b/agent/mibgroup/host/data_access/swrun_cygwin.c
index fcecbe6..a1e1475 100644
--- a/agent/mibgroup/host/data_access/swrun_cygwin.c
+++ b/agent/mibgroup/host/data_access/swrun_cygwin.c
@@ -205,9 +205,10 @@
h = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, n);
if (curproc.ppid) {
- entry->hrSWRunPath_len = snprintf(entry->hrSWRunPath,
- sizeof(entry->hrSWRunPath)-1, "%s",
- cygwin_conv_to_posix_path(curproc.progname));
+ entry->hrSWRunPath_len =
+ sprintf(entry->hrSWRunPath, "%.*s",
+ (int)sizeof(entry->hrSWRunPath) - 1,
+ cygwin_conv_to_posix_path(curproc.progname));
} else if (query == CW_GETPINFO_FULL) {
if (h) {
@@ -216,14 +217,12 @@
n = 0;
if (n && myGetModuleFileNameEx(h, hm[0], string,
sizeof string)) {
- entry->hrSWRunPath_len = snprintf(entry->hrSWRunPath,
- sizeof(entry->hrSWRunPath)-1,
- "%s", string );
+ entry->hrSWRunPath_len =
+ sprintf(entry->hrSWRunPath, "%.*s",
+ (int)sizeof(entry->hrSWRunPath) - 1, string);
}
}
}
- if (entry->hrSWRunPath_len >= sizeof(entry->hrSWRunPath))
- entry->hrSWRunPath_len = sizeof(entry->hrSWRunPath)-1;
/*
* Set hrSWRunName to be the last component of hrSWRunPath,
* but without any file extension
@@ -238,13 +237,12 @@
cp2++; /* Find the final component ... */
else
cp2 = entry->hrSWRunPath; /* ... if any */
- entry->hrSWRunName_len = snprintf(entry->hrSWRunName,
- sizeof(entry->hrSWRunName)-1, "%s", cp2);
+ entry->hrSWRunName_len =
+ sprintf(entry->hrSWRunName, "%.*s",
+ (int)sizeof(entry->hrSWRunName) - 1, cp2);
if ( cp1 )
*cp1 = '.'; /* Restore the file extension */
- if (entry->hrSWRunName_len >= sizeof(entry->hrSWRunName))
- entry->hrSWRunName_len = sizeof(entry->hrSWRunName)-1;
}
/*
diff --git a/agent/mibgroup/host/data_access/swrun_kinfo.c b/agent/mibgroup/host/data_access/swrun_kinfo.c
index 763d815..15f3d00 100644
--- a/agent/mibgroup/host/data_access/swrun_kinfo.c
+++ b/agent/mibgroup/host/data_access/swrun_kinfo.c
@@ -222,20 +222,15 @@
argv = kvm_getargv( kd, &(proc_table[i]), BUFSIZ);
#endif
- entry->hrSWRunName_len = snprintf(entry->hrSWRunName,
- sizeof(entry->hrSWRunName)-1,
- "%s", proc_table[i].SWRUN_K_COMM);
- if (entry->hrSWRunName_len >= sizeof(entry->hrSWRunName))
- entry->hrSWRunName_len = sizeof(entry->hrSWRunName)-1;
+ entry->hrSWRunName_len = sprintf(entry->hrSWRunName, "%.*s",
+ (int)sizeof(entry->hrSWRunName) - 1,
+ proc_table[i].SWRUN_K_COMM);
- if ( argv && *argv) {
- entry->hrSWRunPath_len = snprintf(entry->hrSWRunPath,
- sizeof(entry->hrSWRunPath)-1,
- "%s", argv[0]);
- if (entry->hrSWRunPath_len >= sizeof(entry->hrSWRunPath))
- entry->hrSWRunPath_len = sizeof(entry->hrSWRunPath)-1;
- }
- else {
+ if (argv && *argv) {
+ entry->hrSWRunPath_len = sprintf(entry->hrSWRunPath, "%.*s",
+ (int)sizeof(entry->hrSWRunPath)-1,
+ argv[0]);
+ } else {
memcpy( entry->hrSWRunPath, entry->hrSWRunName,
entry->hrSWRunName_len );
entry->hrSWRunPath_len = entry->hrSWRunName_len;
@@ -263,11 +258,9 @@
}
if (strlen(buf) >= BUFSIZ-10)
snmp_log(LOG_ERR, "params %lu/%d %s\n", strlen(buf), BUFSIZ, buf);
- entry->hrSWRunParameters_len = snprintf(entry->hrSWRunParameters,
- sizeof(entry->hrSWRunParameters),
- "%s", buf+1);
- if (entry->hrSWRunParameters_len >= sizeof(entry->hrSWRunParameters))
- entry->hrSWRunParameters_len = sizeof(entry->hrSWRunParameters)-1;
+ entry->hrSWRunParameters_len =
+ sprintf(entry->hrSWRunParameters, "%.*s",
+ (int)sizeof(entry->hrSWRunParameters) - 1, buf+1);
entry->hrSWRunType = (P_SYSTEM & proc_table[i].SWRUN_K_FLAG)
#ifdef SWRUN_K_CLASS
diff --git a/agent/mibgroup/host/data_access/swrun_kvm_proc.c b/agent/mibgroup/host/data_access/swrun_kvm_proc.c
index e2dc86c..7156cf9 100644
--- a/agent/mibgroup/host/data_access/swrun_kvm_proc.c
+++ b/agent/mibgroup/host/data_access/swrun_kvm_proc.c
@@ -109,11 +109,9 @@
}
rc = CONTAINER_INSERT(container, entry);
- entry->hrSWRunName_len = snprintf(entry->hrSWRunName,
- sizeof(entry->hrSWRunName)-1,
- "%s", proc_buf->p_user.u_comm);
- if (entry->hrSWRunName_len >= sizeof(entry->hrSWRunName))
- entry->hrSWRunName_len = sizeof(entry->hrSWRunName)-1;
+ entry->hrSWRunName_len = sprintf(entry->hrSWRunName, "%.*s",
+ (int)sizeof(entry->hrSWRunName)-1,
+ proc_buf->p_user.u_comm);
/*
* Split u_psargs into two:
* argv[0] is hrSWRunPath
@@ -122,16 +120,12 @@
for ( cp = proc_buf->p_user.u_psargs; ' ' == *cp; cp++ )
;
*cp = '\0'; /* End of argv[0] */
- entry->hrSWRunPath_len = snprintf(entry->hrSWRunPath,
- sizeof(entry->hrSWRunPath)-1,
- "%s", proc_buf->p_user.u_psargs);
- if (entry->hrSWRunPath_len >= sizeof(entry->hrSWRunPath))
- entry->hrSWRunPath_len = sizeof(entry->hrSWRunPath)-1;
- entry->hrSWRunParameters_len = snprintf(entry->hrSWRunParameters,
- sizeof(entry->hrSWRunParameters)-1,
- "%s", cp+1);
- if (entry->hrSWRunParameters_len >= sizeof(entry->hrSWRunParameters))
- entry->hrSWRunParameters_len = sizeof(entry->hrSWRunParameters)-1;
+ entry->hrSWRunPath_len = sprintf(entry->hrSWRunPath, "%.*s",
+ (int)sizeof(entry->hrSWRunPath)-1,
+ proc_buf->p_user.u_psargs);
+ entry->hrSWRunParameters_len =
+ sprintf(entry->hrSWRunParameters, "%.*s",
+ (int)sizeof(entry->hrSWRunParameters) - 1, cp + 1);
*cp = ' '; /* Restore u_psargs value */
/*
diff --git a/agent/mibgroup/host/data_access/swrun_procfs_psinfo.c b/agent/mibgroup/host/data_access/swrun_procfs_psinfo.c
index 6cafd9c..c8124d4 100644
--- a/agent/mibgroup/host/data_access/swrun_procfs_psinfo.c
+++ b/agent/mibgroup/host/data_access/swrun_procfs_psinfo.c
@@ -93,8 +93,6 @@
= sprintf(entry->hrSWRunName, "%.*s",
(int)sizeof(entry->hrSWRunName) - 1,
psinfo.pr_fname);
- if (entry->hrSWRunName_len >= sizeof(entry->hrSWRunName))
- entry->hrSWRunName_len = sizeof(entry->hrSWRunName)-1;
/*
* Split pr_psargs into two:
* argv[0] is hrSWRunPath
@@ -107,14 +105,10 @@
= sprintf(entry->hrSWRunPath, "%.*s",
(int)sizeof(entry->hrSWRunPath) - 1,
psinfo.pr_psargs);
- if (entry->hrSWRunPath_len >= sizeof(entry->hrSWRunPath))
- entry->hrSWRunPath_len = sizeof(entry->hrSWRunPath)-1;
entry->hrSWRunParameters_len
= sprintf(entry->hrSWRunParameters, "%.*s",
(int)sizeof(entry->hrSWRunParameters) - 1, cp+1);
- if (entry->hrSWRunParameters_len >= sizeof(entry->hrSWRunParameters))
- entry->hrSWRunParameters_len = sizeof(entry->hrSWRunParameters)-1;
*cp = ' '; /* Restore pr_psargs value */
/*
