mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-30 18:05:48 +01:00 
			
		
		
		
	lib: string: move strlcpy() to a common place
Move strlcpy() definition from drivers/usb/gadget/ether.c to lib/string.c because it is a very useful function. Let's add the prototype to include/linux/string.h too. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
		
				
					committed by
					
						 Simon Glass
						Simon Glass
					
				
			
			
				
	
			
			
			
						parent
						
							9b416a9f4c
						
					
				
				
					commit
					80d9ef8d40
				
			| @@ -852,30 +852,6 @@ DEFINE_CACHE_ALIGN_BUFFER(u8, control_req, USB_BUFSIZ); | |||||||
| DEFINE_CACHE_ALIGN_BUFFER(u8, status_req, STATUS_BYTECOUNT); | DEFINE_CACHE_ALIGN_BUFFER(u8, status_req, STATUS_BYTECOUNT); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * strlcpy - Copy a %NUL terminated string into a sized buffer |  | ||||||
|  * @dest: Where to copy the string to |  | ||||||
|  * @src: Where to copy the string from |  | ||||||
|  * @size: size of destination buffer |  | ||||||
|  * |  | ||||||
|  * Compatible with *BSD: the result is always a valid |  | ||||||
|  * NUL-terminated string that fits in the buffer (unless, |  | ||||||
|  * of course, the buffer size is zero). It does not pad |  | ||||||
|  * out the result like strncpy() does. |  | ||||||
|  */ |  | ||||||
| size_t strlcpy(char *dest, const char *src, size_t size) |  | ||||||
| { |  | ||||||
| 	size_t ret = strlen(src); |  | ||||||
|  |  | ||||||
| 	if (size) { |  | ||||||
| 		size_t len = (ret >= size) ? size - 1 : ret; |  | ||||||
| 		memcpy(dest, src, len); |  | ||||||
| 		dest[len] = '\0'; |  | ||||||
| 	} |  | ||||||
| 	return ret; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| /*============================================================================*/ | /*============================================================================*/ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|   | |||||||
| @@ -30,6 +30,9 @@ extern char * strcpy(char *,const char *); | |||||||
| #ifndef __HAVE_ARCH_STRNCPY | #ifndef __HAVE_ARCH_STRNCPY | ||||||
| extern char * strncpy(char *,const char *, __kernel_size_t); | extern char * strncpy(char *,const char *, __kernel_size_t); | ||||||
| #endif | #endif | ||||||
|  | #ifndef __HAVE_ARCH_STRLCPY | ||||||
|  | size_t strlcpy(char *, const char *, size_t); | ||||||
|  | #endif | ||||||
| #ifndef __HAVE_ARCH_STRCAT | #ifndef __HAVE_ARCH_STRCAT | ||||||
| extern char * strcat(char *, const char *); | extern char * strcat(char *, const char *); | ||||||
| #endif | #endif | ||||||
|   | |||||||
							
								
								
									
										25
									
								
								lib/string.c
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								lib/string.c
									
									
									
									
									
								
							| @@ -102,6 +102,31 @@ char * strncpy(char * dest,const char *src,size_t count) | |||||||
| } | } | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|  | #ifndef __HAVE_ARCH_STRLCPY | ||||||
|  | /** | ||||||
|  |  * strlcpy - Copy a C-string into a sized buffer | ||||||
|  |  * @dest: Where to copy the string to | ||||||
|  |  * @src: Where to copy the string from | ||||||
|  |  * @size: size of destination buffer | ||||||
|  |  * | ||||||
|  |  * Compatible with *BSD: the result is always a valid | ||||||
|  |  * NUL-terminated string that fits in the buffer (unless, | ||||||
|  |  * of course, the buffer size is zero). It does not pad | ||||||
|  |  * out the result like strncpy() does. | ||||||
|  |  */ | ||||||
|  | size_t strlcpy(char *dest, const char *src, size_t size) | ||||||
|  | { | ||||||
|  | 	size_t ret = strlen(src); | ||||||
|  |  | ||||||
|  | 	if (size) { | ||||||
|  | 		size_t len = (ret >= size) ? size - 1 : ret; | ||||||
|  | 		memcpy(dest, src, len); | ||||||
|  | 		dest[len] = '\0'; | ||||||
|  | 	} | ||||||
|  | 	return ret; | ||||||
|  | } | ||||||
|  | #endif | ||||||
|  |  | ||||||
| #ifndef __HAVE_ARCH_STRCAT | #ifndef __HAVE_ARCH_STRCAT | ||||||
| /** | /** | ||||||
|  * strcat - Append one %NUL-terminated string to another |  * strcat - Append one %NUL-terminated string to another | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user