raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Repushing the correct version

Browse source
This commit is contained in:
EniumRaphael 2024-05-29 15:38:19 +02:00
parent d16b39091a
commit e8a89c456e
3 changed files with 130 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
math/Makefile
View file

@ -6,7 +6,7 @@
# By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2023/11/12 11:05:05 by rparodi #+# #+# #
# Updated: 2024/05/29 14:20:08 by rparodi ### ########.fr #
# Updated: 2024/05/29 15:37:40 by rparodi ### ########.fr #
# #
# **************************************************************************** #
@ -14,7 +14,7 @@
# Variables
# Name
NAME = libmmath.a
NAME = test
LIBDIRNAME = libft
SRCDIRNAME = sources
@ -26,15 +26,17 @@ RM = rm -rf
CFLAGS = -Werror -Wextra -Wall -Wno-unused-command-line-argument -g3 -MMD
# Sources
LIB = ./libft/ft_split.c
LIB =
SRC = ./sources/operation/ft_pow.c \
SRC = ./main.c \
./sources/operation/ft_pow.c \
./sources/operation/ft_add.c \
./sources/utils/ft_init_numbers.c \
./sources/utils/ft_nblen.c \
./sources/comparison/ft_is_less.c \
./sources/comparison/ft_equal.c \
./sources/comparison/ft_is_greater.c
./sources/comparison/ft_is_greater.c \
./sources/ft_split.c
# Objects
OBJDIRNAME = ./objects
@ -83,7 +85,7 @@ $(NAME): $(OBJ) $(LIB_OBJ)
@mkdir -p $(OBJDIRNAME)/$(LIBDIRNAME)
@mkdir -p $(OBJDIRNAME)/$(SRCDIRNAME)
@printf '$(GREY) Creating $(END)$(GREEN)$(OBJDIRNAME)$(END)\n'
@ar rc $(NAME) $(OBJ) $(OBJBonus) 1>/dev/null
@ar rc $(NAME) $(OBJ) $(OBJBonus)
@ranlib $(NAME)
# Creating the objects
$(OBJDIRNAME)/%.o: %.c
@ -125,5 +127,5 @@ footer:
# Phony
.PHONY: all bonus clean fclean re
# -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-include ${OBJ:.o=.d}

37
math/main.c
View file

@ -1,17 +1,36 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* main.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/27 14:41:26 by rparodi #+# #+# */
/* Updated: 2024/05/28 15:48:40 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include <stdio.h>
#include "./includes/ft_math.h"
int main(int argc, char *argv[])
int main(int argc, char *argv[])
{
t_number nb;
t_number nb;
if (argc == 2)
if (argc != 2)
{
ft_init_numbers(argv[1], &nb);
printf("Number: %s\n", nb.number);
printf("Integer: %s\n", nb.int_part);
printf("Float: %s\n", nb.float_part);
printf("Integer size: %zu\n", nb.int_size);
printf("Float size: %zu\n", nb.float_size);
printf("Usage: %s <string>\n", argv[0]);
return 1;
}
else if (argc == 2)
{
if (ft_init_numbers(argv[1], &nb) == ERROR)
{
printf("Error\n");
return 1;
}
else
printf("Number = %s \n(int: %s, %zu) (float: %s, %zu)\n", nb.number, nb.int_part, nb.int_size, nb.float_part, nb.float_size);
}
return (0);
}

93
math/sources/ft_split.c Normal file
View file

@ -0,0 +1,93 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_split.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/09 13:56:02 by rparodi #+# #+# */
/* Updated: 2024/05/28 15:39:50 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "../includes/ft_math.h"
static int count_words(const char *str, char sep)
{
int i;
int count;
i = 0;
count = 0;
while (str[i])
{
while (str[i] == sep && str[i])
i++;
if (str[i] != sep && str[i])
{
while (str[i] != sep && str[i])
i++;
count++;
}
}
return (count);
}
static char *ft_strndup(const char *s, int j)
{
int i;
char *str;
i = 0;
str = (char *)malloc((j + 1));
if (!str)
return (NULL);
while (s[i] && i < j)
{
str[i] = s[i];
i++;
}
str[i] = '\0';
return (str);
}
static char **ext_w(char **words_array, const char *str, char sep, int size)
{
int i;
int j;
i = 0;
j = 0;
while (j < size)
{
while (str[i] == sep && str[i])
i++;
str = str + i;
i = 0;
while (str[i] != sep && str[i])
i++;
words_array[j++] = ft_strndup(str, i);
str = str + i;
i = 0;
}
words_array[j] = 0;
return (words_array);
}
char **ft_split(char const *s, char c)
{
int size;
char **words_array;
size = count_words(s, c);
words_array = (char **)malloc(sizeof(char *) * (size + 1));
if (!words_array)
return (NULL);
if (size == 0)
{
words_array[0] = NULL;
return (words_array);
}
words_array = ext_w(words_array, s, c, size);
return (words_array);
}