diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-04-15 14:57:58 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-04-15 14:57:58 +0000 |
| commit | 40544fd18f14d62d0b4f14e03dc451a8fb699e08 (patch) | |
| tree | f41feb2fb752c0b62ede9d626be78a4dac10f59d /cpukit | |
| parent | 2003-04-15 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-40544fd18f14d62d0b4f14e03dc451a8fb699e08.tar.bz2 | |
2003-04-15 Joel Sherrill <joel@OARcorp.com>
PR 388/networking
* kern/kern_sysctl.c: Revert previous patch and use strlcpy() now that
it is available. Also fixed some warnings.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/libnetworking/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libnetworking/kern/kern_sysctl.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index 9c7f1afac8..6b65953827 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,9 @@ +2003-04-15 Joel Sherrill <joel@OARcorp.com> + + PR 388/networking + * kern/kern_sysctl.c: Revert previous patch and use strlcpy() now that + it is available. Also fixed some warnings. + 2003-03-27 Joel Sherrill <joel@OARcorp.com> * kern/kern_sysctl.c: Converted from BSP strlcpy() to strncpy(). diff --git a/cpukit/libnetworking/kern/kern_sysctl.c b/cpukit/libnetworking/kern/kern_sysctl.c index 1c641b3a5d..c2bbb4aedd 100644 --- a/cpukit/libnetworking/kern/kern_sysctl.c +++ b/cpukit/libnetworking/kern/kern_sysctl.c @@ -59,6 +59,9 @@ #include <sys/sysproto.h> #else #include <sys/buf.h> + +#include <stdio.h> /* for snprintf() */ +size_t strlcpy(char *, const char *, size_t); #endif #include <vm/vm.h> #include <vm/vm_extern.h> @@ -856,7 +859,7 @@ retry: outlen = strlen((char *)arg1)+1; tmparg = malloc(outlen, M_SYSCTLTMP, M_WAITOK); - if (strncpy(tmparg, (char *)arg1, outlen) >= outlen) { + if (strlcpy(tmparg, (char *)arg1, outlen) >= outlen) { free(tmparg, M_SYSCTLTMP); goto retry; } |