commit

C_09/git/ex01/Makefile

@@ -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
 

C_09/git/ex01/main.c

@@ -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)
 {

C_09/git/ex01/main.sh

@@ -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

C_09/git/ex02/ft_split.c

@@ -28,19 +28,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)

C_09/git/ex02/main.c

@@ -17,17 +17,20 @@
 
 char	**ft_split(char *str, char *charset);
 
-int	main(void)
+int	main(int argc, char *argv[])
 {
-	char	str[32];
-	char	charset[32];
+	char	*str;
+	char	*charset;
 	char	**strs;
 	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];
 	strs = ft_split(str, charset);
 	printf("str=%s charset=%s (ft_split)\n", str, charset);
 	i = 0;

C_09/git/ex02/main.sh

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