From 35863078143cfd61d2e6c6647af177eb1f99576c Mon Sep 17 00:00:00 2001 From: Stathis Kamperis Date: Fri, 22 Feb 2008 16:57:52 +0200 Subject: [PATCH] Use strncpy() when possible --- netbsd/cdev/mydev.h | 4 +++- netbsd/cdev/testdev.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/netbsd/cdev/mydev.h b/netbsd/cdev/mydev.h index 58670ab..76b7f00 100644 --- a/netbsd/cdev/mydev.h +++ b/netbsd/cdev/mydev.h @@ -9,10 +9,12 @@ #ifndef MYDEV_H #define MYDEV_H +#define MAX_STR 80 + struct mydev_params { int number; - char string[80]; + char string[MAX_STR]; }; #define MYDEVOLDIOCTL _IOW('M', 0x1, struct mydev_params) diff --git a/netbsd/cdev/testdev.c b/netbsd/cdev/testdev.c index 3196e2e..35c9a9b 100644 --- a/netbsd/cdev/testdev.c +++ b/netbsd/cdev/testdev.c @@ -13,9 +13,6 @@ int main(void) prop_string_t ps; int devfd; - params.number = 42; - strcpy(params.string, "Hello World"); - /* Open device */ if ((devfd = open("/dev/mydev", O_RDONLY, 0)) < 0) { fprintf(stderr, "Failed to open /dev/mydev\n"); @@ -23,6 +20,9 @@ int main(void) } /* Send ioctl request in the traditional way */ + params.number = 42; + strncpy(params.string, "Hello World", MAX_STR); + if (ioctl(devfd, MYDEVTEST, ¶ms) < 0) { close(devfd); err(EXIT_FAILURE, "ioctl()"); -- 2.11.4.GIT