lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] strlcat: use for uml umid.c

Browse Source 
Simplify the code by using strlcat() instead of strncat() and manual
appending.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Paolo 'Blaisorblade' Giarrusso
2005-09-22 21:44:14 -07:00
committed by Linus Torvalds
parent 3a02d6c051
commit a8bfb94c58
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/include/user.h
View File

@@ -14,7 +14,9 @@ extern void *um_kmalloc_atomic(int size);
extern void kfree(void *ptr); extern void kfree(void *ptr);
extern int in_aton(char *str); extern int in_aton(char *str);
extern int open_gdb_chan(void); extern int open_gdb_chan(void);
extern int strlcpy(char *, const char *, int); /* These use size_t, however unsigned long is correct on both i386 and x86_64. */
extern unsigned long strlcpy(char *, const char *, unsigned long);
extern unsigned long strlcat(char *, const char *, unsigned long);
extern void *um_vmalloc(int size); extern void *um_vmalloc(int size);
extern void vfree(void *ptr); extern void vfree(void *ptr);

9
arch/um/kernel/umid.c
View File

@@ -237,13 +237,10 @@ static int __init make_uml_dir(void)
strlcpy(dir, home, sizeof(dir)); strlcpy(dir, home, sizeof(dir));
uml_dir++; uml_dir++;
} }
strlcat(dir, uml_dir, sizeof(dir));
len = strlen(dir); len = strlen(dir);
strncat(dir, uml_dir, sizeof(dir) - len); if (len > 0 && dir[len - 1] != '/')
len = strlen(dir); strlcat(dir, "/", sizeof(dir));
if((len > 0) && (len < sizeof(dir) - 1) && (dir[len - 1] != '/')){
dir[len] = '/';
dir[len + 1] = '\0';
}
uml_dir = malloc(strlen(dir) + 1); uml_dir = malloc(strlen(dir) + 1);
if (uml_dir == NULL) { if (uml_dir == NULL) {