sync
This commit is contained in:
21
C_09/git_old/ex00/ft.h
Normal file
21
C_09/git_old/ex00/ft.h
Normal file
@@ -0,0 +1,21 @@
|
||||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* ft.h :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2021/08/20 10:17:09 by gbaconni #+# #+# */
|
||||
/* Updated: 2021/08/20 12:05:50 by gbaconni ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
#ifndef FT_H
|
||||
# define FT_H
|
||||
|
||||
void ft_putchar(char c);
|
||||
void ft_swap(int *a, int *b);
|
||||
void ft_putstr(char *str);
|
||||
int ft_strlen(char *str);
|
||||
int ft_strcmp(char *s1, char *s2);
|
||||
|
||||
#endif
|
||||
@@ -18,33 +18,33 @@
|
||||
NAME = libft.a
|
||||
|
||||
SRCDIR = srcs
|
||||
SRC = $(SRCDIR)/ft_putchar.c $(SRCDIR)/ft_swap.c $(SRCDIR)/ft_putstr.c $(SRCDIR)/ft_strlen.c $(SRCDIR)/ft_strcmp.c
|
||||
OBJ = ${SRC:.c=.o}
|
||||
|
||||
SRC = ft_putchar.c \
|
||||
ft_swap.c \
|
||||
ft_putstr.c \
|
||||
ft_strlen.c \
|
||||
ft_strcmp.c
|
||||
|
||||
HDR = ft.h
|
||||
|
||||
INCLUDE = includes
|
||||
HDRDIR = includes
|
||||
HDR = $(HDRDIR)/ft.h
|
||||
|
||||
CC = gcc
|
||||
CFLAGS = -Wall -Wextra -Werror
|
||||
AR = ar
|
||||
ARFLAGS = -cq
|
||||
ARFLAGS = -rcs
|
||||
|
||||
RM = rm
|
||||
RMFLAGS = -f
|
||||
|
||||
all: $(NAME)
|
||||
|
||||
$(NAME):
|
||||
cd $(SRCDIR) && $(CC) $(CFLAGS) -I $(INCLUDE) -c $(SRC)
|
||||
$(AR) $(ARFLAGS) $(NAME) $(SRCDIR)/*.o
|
||||
.c.o:
|
||||
$(CC) $(CFLAGS) -I $(HDRDIR) -c $< -o ${<:.c=.o}
|
||||
|
||||
$(NAME): $(OBJ)
|
||||
$(AR) $(ARFLAGS) $@ $^
|
||||
|
||||
clean:
|
||||
@/bin/rm -f **/*.o
|
||||
$(RM) $(RMFLAGS) $(OBJ)
|
||||
|
||||
fclean: clean
|
||||
@/bin/rm -f $(NAME)
|
||||
$(RM) $(RMFLAGS) $(NAME)
|
||||
|
||||
re: fclean all
|
||||
|
||||
|
||||
@@ -14,12 +14,7 @@
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
void ft_putchar(char c);
|
||||
void ft_swap(int *a, int *b);
|
||||
void ft_putstr(char *str);
|
||||
int ft_strlen(char *str);
|
||||
int ft_strcmp(char *s1, char *s2);
|
||||
#include "ft.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
||||
@@ -7,9 +7,9 @@ norminette -R CheckForbiddenSourceHeader {} \;
|
||||
echo
|
||||
make fclean
|
||||
make
|
||||
rm -f *.o
|
||||
echo
|
||||
echo $(basename $PWD):
|
||||
gcc -Wall -Wextra -Werror -o a.out -L. -lft main.c
|
||||
gcc -Wall -Wextra -Werror main.c -I includes -L . -lft -o a.out
|
||||
./a.out "$@"
|
||||
make fclean
|
||||
rm -f a.out
|
||||
|
||||
@@ -6,13 +6,15 @@
|
||||
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2021/08/22 18:14:04 by gbaconni #+# #+# */
|
||||
/* Updated: 2021/08/24 13:00:34 by gbaconni ### ########.fr */
|
||||
/* Updated: 2021/08/26 09:53:30 by gbaconni ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int g_t = 0;
|
||||
|
||||
static char *ft_strncpy(char *dest, char *src, unsigned int n)
|
||||
{
|
||||
unsigned int i;
|
||||
@@ -28,19 +30,22 @@ static char *ft_strncpy(char *dest, char *src, unsigned int n)
|
||||
dest[i] = '\0';
|
||||
i++;
|
||||
}
|
||||
dest[i] = '\0';
|
||||
return (dest);
|
||||
}
|
||||
|
||||
static int ft_is_charset(char c, char *charset)
|
||||
{
|
||||
char *p_charset;
|
||||
int r;
|
||||
int i;
|
||||
|
||||
r = 0;
|
||||
p_charset = charset;
|
||||
while (*p_charset != '\0')
|
||||
r |= (*p_charset++ == c);
|
||||
return (r);
|
||||
i = 0;
|
||||
while (charset[i] != '\0')
|
||||
{
|
||||
if (c == charset[i])
|
||||
return (1);
|
||||
i++;
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int ft_split_len(char *str, char *charset)
|
||||
@@ -49,6 +54,8 @@ static int ft_split_len(char *str, char *charset)
|
||||
int size;
|
||||
|
||||
size = 2;
|
||||
if (str == NULL || charset == NULL)
|
||||
return (size);
|
||||
p_str = str;
|
||||
while (*p_str != '\0')
|
||||
{
|
||||
@@ -63,6 +70,8 @@ char *ft_copy(char *str, int size)
|
||||
char *result;
|
||||
|
||||
result = (char *) malloc((size + 1) * sizeof(char));
|
||||
if (!result)
|
||||
return (NULL);
|
||||
if (size > 0)
|
||||
ft_strncpy(result, str, size);
|
||||
else
|
||||
@@ -74,24 +83,25 @@ char **ft_split(char *str, char *charset)
|
||||
{
|
||||
char **strs;
|
||||
char *start;
|
||||
int size;
|
||||
int i;
|
||||
|
||||
size = ft_split_len(str, charset);
|
||||
strs = malloc((size) * sizeof(strs));
|
||||
strs = malloc(ft_split_len(str, charset) * sizeof(strs));
|
||||
if (strs == NULL || charset == NULL || str == NULL)
|
||||
return (NULL);
|
||||
start = str;
|
||||
i = 0;
|
||||
while (1)
|
||||
{
|
||||
if (ft_is_charset(*str, charset) == 1 || *str == '\0')
|
||||
if (ft_is_charset(*str, charset) == 1 || (*str == '\0' && g_t > 0))
|
||||
{
|
||||
size = str - start;
|
||||
if (size > 0)
|
||||
strs[i++] = ft_copy(start, size);
|
||||
if (str - start > 0)
|
||||
strs[i++] = ft_copy(start, str - start);
|
||||
start = str + 1;
|
||||
if (*str == '\0')
|
||||
break ;
|
||||
}
|
||||
else
|
||||
g_t++;
|
||||
if (*str == '\0')
|
||||
break ;
|
||||
str++;
|
||||
}
|
||||
strs[i] = ft_copy(str, 0);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2021/08/18 10:50:59 by gbaconni #+# #+# */
|
||||
/* Updated: 2021/08/24 11:56:21 by gbaconni ### ########.fr */
|
||||
/* Updated: 2021/08/25 14:11:02 by gbaconni ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -17,24 +17,30 @@
|
||||
|
||||
char **ft_split(char *str, char *charset);
|
||||
|
||||
int main(void)
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
char str[32];
|
||||
char charset[32];
|
||||
char **strs;
|
||||
char *str;
|
||||
char *charset;
|
||||
int i;
|
||||
|
||||
printf("Input String [Max 32]: ");
|
||||
scanf("%s", str);
|
||||
printf("Input Charset [Max 32]: ");
|
||||
scanf("%s", charset);
|
||||
if (argc < 2)
|
||||
{
|
||||
printf("%s <str> <charset>\n", argv[0]);
|
||||
return (1);
|
||||
}
|
||||
str = argv[1];
|
||||
charset = argv[2];
|
||||
if (str[0] == '\0')
|
||||
str = NULL;
|
||||
strs = ft_split(str, charset);
|
||||
printf("str=%s charset=%s (ft_split)\n", str, charset);
|
||||
i = 0;
|
||||
while (strs[i][0] != '\0')
|
||||
while (strs[i])
|
||||
{
|
||||
printf("strs[%d] = %s\n", i, strs[i]);
|
||||
i++;
|
||||
}
|
||||
free(strs);
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,8 @@ set -e
|
||||
rm -f a.out
|
||||
#norminette -R CheckForbiddenSourceHeader ft_*.c
|
||||
norminette -R CheckForbiddenSourceHeader
|
||||
#gcc -Wall -Wextra -Werror -fsanitize=address -g -o a.out *.c
|
||||
gcc -Wall -Wextra -Werror -o a.out *.c
|
||||
echo $(basename $PWD):
|
||||
./a.out
|
||||
./a.out "$@"
|
||||
rm -f a.out
|
||||
|
||||
Reference in New Issue
Block a user