Skip to content

Commit

Permalink
[PATCH] strlcat: use for uml umid.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Sep 23, 2005
1 parent 3a02d6c commit a8bfb94
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
4 changes: 3 additions & 1 deletion arch/um/include/user.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ extern void *um_kmalloc_atomic(int size);
extern void kfree(void *ptr);
extern int in_aton(char *str);
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 vfree(void *ptr);

Expand Down
11 changes: 4 additions & 7 deletions arch/um/kernel/umid.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,16 +237,13 @@ static int __init make_uml_dir(void)
strlcpy(dir, home, sizeof(dir));
uml_dir++;
}
strlcat(dir, uml_dir, sizeof(dir));
len = strlen(dir);
strncat(dir, uml_dir, sizeof(dir) - len);
len = strlen(dir);
if((len > 0) && (len < sizeof(dir) - 1) && (dir[len - 1] != '/')){
dir[len] = '/';
dir[len + 1] = '\0';
}
if (len > 0 && dir[len - 1] != '/')
strlcat(dir, "/", sizeof(dir));

uml_dir = malloc(strlen(dir) + 1);
if(uml_dir == NULL){
if (uml_dir == NULL) {
printf("make_uml_dir : malloc failed, errno = %d\n", errno);
exit(1);
}
Expand Down

0 comments on commit a8bfb94

Please sign in to comment.