0
0
This commit is contained in:
2021-08-24 20:55:48 +02:00
parent 175220f3f6
commit c629a99412
6 changed files with 39 additions and 38 deletions

View File

@@ -18,33 +18,33 @@
NAME = libft.a NAME = libft.a
SRCDIR = srcs 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 \ HDRDIR = includes
ft_swap.c \ HDR = $(HDRDIR)/ft.h
ft_putstr.c \
ft_strlen.c \
ft_strcmp.c
HDR = ft.h
INCLUDE = includes
CC = gcc CC = gcc
CFLAGS = -Wall -Wextra -Werror CFLAGS = -Wall -Wextra -Werror
AR = ar AR = ar
ARFLAGS = -cq ARFLAGS = -rcs
RM = rm
RMFLAGS = -f
all: $(NAME) all: $(NAME)
$(NAME): .c.o:
cd $(SRCDIR) && $(CC) $(CFLAGS) -I $(INCLUDE) -c $(SRC) $(CC) $(CFLAGS) -I $(HDRDIR) -c $< -o ${<:.c=.o}
$(AR) $(ARFLAGS) $(NAME) $(SRCDIR)/*.o
$(NAME): $(OBJ)
$(AR) $(ARFLAGS) $@ $^
clean: clean:
@/bin/rm -f **/*.o $(RM) $(RMFLAGS) $(OBJ)
fclean: clean fclean: clean
@/bin/rm -f $(NAME) $(RM) $(RMFLAGS) $(NAME)
re: fclean all re: fclean all

View File

@@ -14,12 +14,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "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);
int main(void) int main(void)
{ {

View File

@@ -7,9 +7,9 @@ norminette -R CheckForbiddenSourceHeader {} \;
echo echo
make fclean make fclean
make make
rm -f *.o
echo echo
echo $(basename $PWD): 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 "$@" ./a.out "$@"
make fclean
rm -f a.out rm -f a.out

View File

@@ -28,19 +28,22 @@ static char *ft_strncpy(char *dest, char *src, unsigned int n)
dest[i] = '\0'; dest[i] = '\0';
i++; i++;
} }
dest[i] = '\0';
return (dest); return (dest);
} }
static int ft_is_charset(char c, char *charset) static int ft_is_charset(char c, char *charset)
{ {
char *p_charset; int i;
int r;
r = 0; i = 0;
p_charset = charset; while (charset[i] != '\0')
while (*p_charset != '\0') {
r |= (*p_charset++ == c); if (c == charset[i])
return (r); return (1);
i++;
}
return (0);
} }
static int ft_split_len(char *str, char *charset) static int ft_split_len(char *str, char *charset)

View File

@@ -17,17 +17,20 @@
char **ft_split(char *str, char *charset); char **ft_split(char *str, char *charset);
int main(void) int main(int argc, char *argv[])
{ {
char str[32]; char *str;
char charset[32]; char *charset;
char **strs; char **strs;
int i; int i;
printf("Input String [Max 32]: "); if (argc < 2)
scanf("%s", str); {
printf("Input Charset [Max 32]: "); printf("%s <str> <charset>\n", argv[0]);
scanf("%s", charset); return (1);
}
str = argv[1];
charset = argv[2];
strs = ft_split(str, charset); strs = ft_split(str, charset);
printf("str=%s charset=%s (ft_split)\n", str, charset); printf("str=%s charset=%s (ft_split)\n", str, charset);
i = 0; i = 0;

View File

@@ -5,5 +5,5 @@ rm -f a.out
norminette -R CheckForbiddenSourceHeader norminette -R CheckForbiddenSourceHeader
gcc -Wall -Wextra -Werror -o a.out *.c gcc -Wall -Wextra -Werror -o a.out *.c
echo $(basename $PWD): echo $(basename $PWD):
./a.out ./a.out "$@"
rm -f a.out rm -f a.out