From 37f4fea6f45101f9926f2e9f55571acc51be47a8 Mon Sep 17 00:00:00 2001 From: zolliker Date: Wed, 14 Apr 2010 08:55:55 +0000 Subject: [PATCH] - replaced strlcat by strlcpy at places where it made sense --- haakedriv.c | 2 +- linadriv.c | 2 +- lscsupport.c | 2 +- oxinst.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/haakedriv.c b/haakedriv.c index e38ebfe..4d28ffc 100644 --- a/haakedriv.c +++ b/haakedriv.c @@ -113,7 +113,7 @@ int HaakeHandler(void *object) if (strcmp(eab->ans, eab->version) == 0) { /* we are still connected with the same device */ } else if (*eab->version == '\0') { - strlcat(eab->version, eab->ans, sizeof(eab->version) - 1); + strlcpy(eab->version, eab->ans, sizeof(eab->version)); } else { /* version (and therefore device) changed */ eab->errCode = EASE_DEV_CHANGED; eab->state = EASE_idle; diff --git a/linadriv.c b/linadriv.c index 65502fd..3bcd0b4 100644 --- a/linadriv.c +++ b/linadriv.c @@ -72,7 +72,7 @@ int LinaHandler(void *object) if (strcmp(eab->ans, eab->version) == 0) { /* we are still connected with the same device */ } else if (*eab->version == '\0' && strcmp(eab->ans, "7265") == 0) { - strlcat(eab->version, eab->ans, sizeof(eab->version) - 1); + strlcpy(eab->version, eab->ans, sizeof(eab->version)); } else { /* version (and therefore device) changed */ eab->errCode = EASE_DEV_CHANGED; eab->state = EASE_idle; diff --git a/lscsupport.c b/lscsupport.c index b12f044..4d1d8f7 100644 --- a/lscsupport.c +++ b/lscsupport.c @@ -47,7 +47,7 @@ int LscHandler(void *object) if (strcmp(eab->ans, eab->version) == 0) { /* we are still connected with the same device */ } else if (*eab->version == '\0') { - strlcat(eab->version, eab->ans, sizeof(eab->version) - 1); + strlcpy(eab->version, eab->ans, sizeof(eab->version)); } else { /* version (and therefore device) changed */ eab->errCode = EASE_DEV_CHANGED; eab->state = EASE_idle; diff --git a/oxinst.c b/oxinst.c index df96a1a..a130a22 100644 --- a/oxinst.c +++ b/oxinst.c @@ -90,7 +90,7 @@ int OxiHandler(void *object) if (strcmp(eab->ans, eab->version) == 0) { /* we are still connected with the same device */ } else if (*eab->version == '\0') { - strlcat(eab->version, eab->ans, sizeof(eab->version) - 1); + strlcpy(eab->version, eab->ans, sizeof(eab->version)); } else { /* version (and therefore device) changed */ eab->errCode = EASE_DEV_CHANGED; eab->state = EASE_idle;