correcting overwriting
This commit is contained in:
parent
f6e6bf0680
commit
1db975bcac
14
ft_strncat.c
14
ft_strncat.c
@ -6,18 +6,24 @@
|
|||||||
/* By: tmaze <marvin@42.fr> +#+ +:+ +#+ */
|
/* By: tmaze <marvin@42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2018/04/04 18:29:06 by tmaze #+# #+# */
|
/* Created: 2018/04/04 18:29:06 by tmaze #+# #+# */
|
||||||
/* Updated: 2018/04/08 14:21:53 by tmaze ### ########.fr */
|
/* Updated: 2018/04/10 19:07:13 by tmaze ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
#include "libft.h"
|
#include "libft.h"
|
||||||
|
|
||||||
char *ft_strncat(char *restrict dest, const char *src, size_t n)
|
char *ft_strncat(char *restrict dest, const char *restrict src, size_t n)
|
||||||
{
|
{
|
||||||
int dest_len;
|
int dest_len;
|
||||||
|
size_t i;
|
||||||
|
|
||||||
dest_len = ft_strlen(dest);
|
dest_len = ft_strlen(dest);
|
||||||
ft_strncpy(&dest[dest_len], src, n);
|
i = 0;
|
||||||
dest[dest_len + n] = '\0';
|
while (++i < n && src[i])
|
||||||
|
{
|
||||||
|
dest[dest_len + i] = src[i];
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
dest[dest_len + i] = '\0';
|
||||||
return (dest);
|
return (dest);
|
||||||
}
|
}
|
||||||
|
5
libft.h
5
libft.h
@ -6,7 +6,7 @@
|
|||||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */
|
/* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */
|
||||||
/* Updated: 2018/04/09 18:56:24 by tmaze ### ########.fr */
|
/* Updated: 2018/04/10 19:08:03 by tmaze ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -46,7 +46,8 @@ char *ft_strdup(const char *s);
|
|||||||
char *ft_strcpy(char *dest, const char *src);
|
char *ft_strcpy(char *dest, const char *src);
|
||||||
char *ft_strncpy(char *dest, const char *src, size_t n);
|
char *ft_strncpy(char *dest, const char *src, size_t n);
|
||||||
char *ft_strcat(char *restrict dest, const char *src);
|
char *ft_strcat(char *restrict dest, const char *src);
|
||||||
char *ft_strncat(char *dest, const char *src, size_t n);
|
char *ft_strncat(char *restrict dest, const char *restrict src,\
|
||||||
|
size_t n);
|
||||||
size_t ft_strlcat(char *dst, const char *src, size_t size);
|
size_t ft_strlcat(char *dst, const char *src, size_t size);
|
||||||
char *ft_strchr(const char *s, int c);
|
char *ft_strchr(const char *s, int c);
|
||||||
char *ft_strrchr(const char *s, int c);
|
char *ft_strrchr(const char *s, int c);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user