UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: simplify string handling in elv_iosched_store() 

strlcpy() guarantees the dest buffer is NULL teminated.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Li Zefan 2008-10-14 08:49:56 +02:00 committed by Jens Axboe
parent e6d63840ba
commit ee2e992cc2
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/elevator.c
View File

@ -1166,15 +1166,10 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,
size_t count) size_t count)
{ {
char elevator_name[ELV_NAME_MAX]; char elevator_name[ELV_NAME_MAX];
size_t len;
struct elevator_type *e; struct elevator_type *e;
elevator_name[sizeof(elevator_name) - 1] = '\0'; strlcpy(elevator_name, name, sizeof(elevator_name));
strncpy(elevator_name, name, sizeof(elevator_name) - 1); strstrip(elevator_name);
len = strlen(elevator_name);
if (len && elevator_name[len - 1] == '\n')
elevator_name[len - 1] = '\0';
e = elevator_get(elevator_name); e = elevator_get(elevator_name);
if (!e) { if (!e) {