diff options
87 files changed, 3153 insertions, 38 deletions
diff --git a/c09/ex00/ft_strcmp.c b/c09/ex00/ft_strcmp.c index 8870811..18f975a 100644 --- a/c09/ex00/ft_strcmp.c +++ b/c09/ex00/ft_strcmp.c @@ -6,11 +6,11 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/11 16:20:33 by cacharle #+# #+# */ -/* Updated: 2019/07/11 16:21:55 by cacharle ### ########.fr */ +/* Updated: 2019/07/16 09:37:13 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -int ft_strcmp(char *s1, char *s2) +int ft_strcmp(char *s1, char *s2) { while (*s1 == *s2 && *s1 && *s2) { diff --git a/c09/ex00/ft_strlen.c b/c09/ex00/ft_strlen.c index 91e6948..fe5f4b7 100644 --- a/c09/ex00/ft_strlen.c +++ b/c09/ex00/ft_strlen.c @@ -6,11 +6,11 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/11 16:19:43 by cacharle #+# #+# */ -/* Updated: 2019/07/11 16:20:18 by cacharle ### ########.fr */ +/* Updated: 2019/07/16 09:36:56 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -int ft_strlen(char *str) +int ft_strlen(char *str) { int i; @@ -19,4 +19,3 @@ int ft_strlen(char *str) i++; return (i); } - diff --git a/c09/ex00/libft_creator.sh b/c09/ex00/libft_creator.sh index 9c0aefa..796b263 100755 --- a/c09/ex00/libft_creator.sh +++ b/c09/ex00/libft_creator.sh @@ -1,4 +1,4 @@ #!/bin/sh -gcc -c ft_putchar.c ft_swap.c ft_putstr.c ft_strlen.c ft_strcmp.c +gcc -Wall -Wextra -Werror -c ft_putchar.c ft_swap.c ft_putstr.c ft_strlen.c ft_strcmp.c ar -rs libft.a ft_putchar.o ft_swap.o ft_putstr.o ft_strlen.o ft_strcmp.o rm -f ft_putchar.o ft_swap.o ft_putstr.o ft_strlen.o ft_strcmp.o diff --git a/c09/ex01/Makefile b/c09/ex01/Makefile index ba69535..3547e9c 100644 --- a/c09/ex01/Makefile +++ b/c09/ex01/Makefile @@ -1,6 +1,19 @@ +# **************************************************************************** # +# # +# ::: :::::::: # +# Makefile :+: :+: :+: # +# +:+ +:+ +:+ # +# By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ # +# +#+#+#+#+#+ +#+ # +# Created: 2019/07/15 19:27:49 by cacharle #+# #+# # +# Updated: 2019/07/16 07:41:31 by cacharle ### ########.fr # +# # +# **************************************************************************** # + OUT = libft.a CC = gcc CCFLAGS = -Wall -Wextra -Werror +LDFLAGS = -Iincludes OBJ = srcs/ft_putchar.o srcs/ft_swap.o srcs/ft_putstr.o srcs/ft_strlen.o srcs/ft_strcmp.o .PHONY: all @@ -10,19 +23,19 @@ $(OUT): $(OBJ) ar -crs $(OUT) $(OBJ) srcs/ft_putchar.o: srcs/ft_putchar.c includes/ft.h - $(CC) $(CCFLAGS) -c $< -o $@ + $(CC) $(CCFLAGS) $(LDFLAGS) -c $< -o $@ srcs/ft_swap.o: srcs/ft_swap.c includes/ft.h - $(CC) $(CCFLAGS) -c $< -o $@ + $(CC) $(CCFLAGS) $(LDFLAGS) -c $< -o $@ srcs/ft_putstr.o: srcs/ft_putstr.c includes/ft.h - $(CC) $(CCFLAGS) -c $< -o $@ + $(CC) $(CCFLAGS) $(LDFLAGS) -c $< -o $@ srcs/ft_strlen.o: srcs/ft_strlen.c includes/ft.h - $(CC) $(CCFLAGS) -c $< -o $@ + $(CC) $(CCFLAGS) $(LDFLAGS) -c $< -o $@ srcs/ft_strcmp.o: srcs/ft_strcmp.c includes/ft.h - $(CC) $(CCFLAGS) -c $< -o $@ + $(CC) $(CCFLAGS) $(LDFLAGS) -c $< -o $@ .PHONY: clean clean: diff --git a/c09/ex01/srcs/ft_putchar.c b/c09/ex01/srcs/ft_putchar.c index 8a53dc8..51b252e 100644 --- a/c09/ex01/srcs/ft_putchar.c +++ b/c09/ex01/srcs/ft_putchar.c @@ -6,7 +6,7 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/02 22:03:32 by cacharle #+# #+# */ -/* Updated: 2019/07/03 14:21:40 by cacharle ### ########.fr */ +/* Updated: 2019/07/15 13:18:04 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/c09/ex01/srcs/ft_putstr.c b/c09/ex01/srcs/ft_putstr.c index c4f4564..fef1aac 100644 --- a/c09/ex01/srcs/ft_putstr.c +++ b/c09/ex01/srcs/ft_putstr.c @@ -6,11 +6,12 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/11 16:17:16 by cacharle #+# #+# */ -/* Updated: 2019/07/11 16:18:11 by cacharle ### ########.fr */ +/* Updated: 2019/07/16 07:29:45 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include <unistd.h> +#include "ft.h" void ft_putstr(char *str) { diff --git a/c09/ex02/ft_split.c b/c09/ex02/ft_split.c index e1c0186..a11477f 100644 --- a/c09/ex02/ft_split.c +++ b/c09/ex02/ft_split.c @@ -6,7 +6,7 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/08 15:58:03 by cacharle #+# #+# */ -/* Updated: 2019/07/15 09:21:14 by cacharle ### ########.fr */ +/* Updated: 2019/07/16 09:18:23 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -62,7 +62,8 @@ char **heck(char *str, char *charset, char *tmp, int i) while (!in_charset(*str, charset) && *str) tmp[i++] = *str++; tmp[i] = '\0'; - strs[j++] = tmp; + if (i != 0) + strs[j++] = tmp; } strs[j] = 0; return (strs); @@ -70,7 +71,5 @@ char **heck(char *str, char *charset, char *tmp, int i) char **ft_split(char *str, char *charset) { - if (!*str) - return (NULL); return (heck(str, charset, NULL, 0)); } diff --git a/c09/main.c b/c09/main.c new file mode 100644 index 0000000..02c5a61 --- /dev/null +++ b/c09/main.c @@ -0,0 +1,27 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "ex02/ft_split.c" + +int main() +{ + char *const str = "3YaZkAP30iGoBWv L asdf h LbpX8Hx FWHwB2u1FH0S5"; + char *begin = "\n \t hgonjour"; + char *end = "jesuis\n\t hhh"; + char *empty = " h bonjour je suis "; + char *charset = "\n\t"; + char **strs = ft_split(end, charset); + printf("tab start\n"); + for (int i = 0; strs[i] != 0; i++) + { + printf("tab[%d]: %s\n", i, strs[i]); + /*for (int j = 0; j < 10; j++)*/ + /*printf("%d ", strs[i][j]);*/ + } + printf("tab end\n"); + for (int i = 0; strs[i] != 0; i++) + free(strs[i]); + free(strs); + + return 0; +} diff --git a/c10/ex00/Makefile b/c10/ex00/Makefile index e69de29..6ee330b 100644 --- a/c10/ex00/Makefile +++ b/c10/ex00/Makefile @@ -0,0 +1,17 @@ +OUT = ft_display_file +CC = gcc +CCFLAGS = -Wall -Wextra -Werror + +.PHONY: all +all: $(OUT) + +$(OUT): main.c + $(CC) $(CCFLAGS) -o $(OUT) main.c + +.PHONY: clean +clean: + +.PHONY: clean +fclean: clean + rm -f $(OUT) + diff --git a/c10/ex00/bonjour b/c10/ex00/bonjour deleted file mode 100644 index 918a5ef..0000000 --- a/c10/ex00/bonjour +++ /dev/null @@ -1,4 +0,0 @@ -bonjour -je -suis -charles diff --git a/c10/ex00/main.c b/c10/ex00/main.c index 8fee64a..bcf9e68 100644 --- a/c10/ex00/main.c +++ b/c10/ex00/main.c @@ -6,7 +6,7 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/11 18:06:43 by cacharle #+# #+# */ -/* Updated: 2019/07/11 18:45:01 by cacharle ### ########.fr */ +/* Updated: 2019/07/15 13:45:33 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,26 +15,31 @@ #define BUFFER_SIZE 1 #include <stdio.h> -int write_buffer(char *buf) +void read_write_file(int fildes) { int i; + int writing; + char buf[BUFFER_SIZE]; - i = 0; - while (buf[i]) + writing = 1; + while (writing) { - write(STDOUT_FILENO, &buf[i], 1); - /*printf("%d %c\n", buf[i], buf[i]);*/ - if (buf[i] == -1) - return (1); - i++; + if (read(fildes, buf, BUFFER_SIZE) == 0) + break; + i = 0; + while (buf[i]) + { + write(STDOUT_FILENO, &buf[i], 1); + if (buf[i] == -1) + writing = 0; + i++; + } } - return (0); } int main(int argc, char **argv) { int fildes; - char buf[BUFFER_SIZE]; int reading; if (argc == 1) @@ -52,12 +57,7 @@ int main(int argc, char **argv) write(STDERR_FILENO, "Cannot read file.\n", 18); return (1); } - while (1) - { - if (read(fildes, buf, BUFFER_SIZE) == 0) - break; - write_buffer(buf); - } + read_write_file(fildes); close(fildes); return (0); } diff --git a/c10/ex01/Makefile b/c10/ex01/Makefile new file mode 100644 index 0000000..362d434 --- /dev/null +++ b/c10/ex01/Makefile @@ -0,0 +1 @@ +OUT = ft_cat diff --git a/c10/ex01/helper.c b/c10/ex01/helper.c new file mode 100644 index 0000000..8a1c13e --- /dev/null +++ b/c10/ex01/helper.c @@ -0,0 +1,35 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* helper.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <charles. |