diff mbox

tools/xenstat: handle network interface name in upper case.

Message ID 1457727204-21661-1-git-send-email-zhigang.x.wang@oracle.com (mailing list archive)
State New, archived
Headers show

Commit Message

Zhigang Wang March 11, 2016, 8:13 p.m. UTC 
Oracle-Bug: 22879856

Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
---
 tools/xenstat/libxenstat/src/xenstat_linux.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Zhigang Wang March 11, 2016, 8:21 p.m. UTC | #1 
Sorry I send this mail by mistake. Please ignore it. I send another one with correct commit message.

On 03/11/2016 03:13 PM, Zhigang Wang wrote:
> Oracle-Bug: 22879856
> 
> Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
> ---
>  tools/xenstat/libxenstat/src/xenstat_linux.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/xenstat/libxenstat/src/xenstat_linux.c
> index 931b24e..d33eca1 100644
> --- a/tools/xenstat/libxenstat/src/xenstat_linux.c
> +++ b/tools/xenstat/libxenstat/src/xenstat_linux.c
> @@ -101,6 +101,7 @@ int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsign
>  	/* Temporary/helper variables */
>  	int ret;
>  	char *tmp;
> +	char *tmp2;
>  	int i = 0, x = 0, col = 0;
>  	regex_t r;
>  	regmatch_t matches[19];
> @@ -221,8 +222,11 @@ int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsign
>  				}
>  				else
>  				/* There were errors when parsing this directly in RE. strpbrk() helps */
> -				if (iface != NULL)
> -					strcpy(iface, strpbrk(tmp, "abcdefghijklmnopqrstvuwxyz0123456789"));
> +				if (iface != NULL) {
> +					tmp2 = strpbrk(tmp, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
> +					if (tmp2 != NULL)
> +						strcpy(iface, tmp2);
> +				}
>  
>  				memset(tmp, 0, matches[i].rm_eo - matches[i].rm_so);
>  			}
>
diff mbox

Patch

diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/xenstat/libxenstat/src/xenstat_linux.c
index 931b24e..d33eca1 100644
--- a/tools/xenstat/libxenstat/src/xenstat_linux.c
+++ b/tools/xenstat/libxenstat/src/xenstat_linux.c
@@ -101,6 +101,7 @@  int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsign
 	/* Temporary/helper variables */
 	int ret;
 	char *tmp;
+	char *tmp2;
 	int i = 0, x = 0, col = 0;
 	regex_t r;
 	regmatch_t matches[19];
@@ -221,8 +222,11 @@  int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsign
 				}
 				else
 				/* There were errors when parsing this directly in RE. strpbrk() helps */
-				if (iface != NULL)
-					strcpy(iface, strpbrk(tmp, "abcdefghijklmnopqrstvuwxyz0123456789"));
+				if (iface != NULL) {
+					tmp2 = strpbrk(tmp, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+					if (tmp2 != NULL)
+						strcpy(iface, tmp2);
+				}
 
 				memset(tmp, 0, matches[i].rm_eo - matches[i].rm_so);
 			}