jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge fix

Browse source
This commit is contained in:
Jack Halford 2017-02-20 16:44:16 +01:00
commit 27758bd345
27 changed files with 266 additions and 279 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libftasm/Makefile
View file

@ -6,7 +6,7 @@
# By: jhalford <jack@crans.org> +#+ +:+ +#+ # # By: jhalford <jack@crans.org> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2017/02/07 16:09:36 by jhalford #+# #+# # # Created: 2017/02/07 16:09:36 by jhalford #+# #+# #
# Updated: 2017/02/19 05:42:56 by jhalford ### ########.fr # # Updated: 2017/02/20 16:44:02 by jhalford ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -16,8 +16,11 @@ CC = gcc
AR = ar -rc AR = ar -rc
MKDIR = mkdir -p MKDIR = mkdir -p
RM = /bin/rm -rf RM = /bin/rm -rf
FLAGS = -Wall -Wextra -Werror
D_FLAGS = -g W_FLAGS = -Wall -Wextra -Werror
D_FLAGS =
V_FLAGS = -fvisibility=hidden
FLAGS = $(W_FLAGS) $(D_FLAGS) $(V_FLAGS)
DELTA = $$(echo "$$(tput cols)-47"|bc) DELTA = $$(echo "$$(tput cols)-47"|bc)
@ -56,7 +59,6 @@ dlst/ft_dlstlast.c\
dlst/ft_dlstnew.c\ dlst/ft_dlstnew.c\
dlst/ft_dlstrtostr.c\ dlst/ft_dlstrtostr.c\
dlst/ft_dlstsize.c\ dlst/ft_dlstsize.c\
env/ft_getenv.c\
ft_printf/ft_conversion.c\ ft_printf/ft_conversion.c\
ft_printf/ft_fmt_simplify.c\ ft_printf/ft_fmt_simplify.c\
ft_printf/ft_fmt_validate_conv.c\ ft_printf/ft_fmt_validate_conv.c\
@ -122,17 +124,11 @@ mem/ft_memdel.c\
mem/ft_memmove.c\ mem/ft_memmove.c\
mem/ft_memset.c\ mem/ft_memset.c\
mem/ft_realloc.c\ mem/ft_realloc.c\
misc/ft_debug.c\
path/ft_path_notdir.c\ path/ft_path_notdir.c\
printing/ft_putaddr.c\
printing/ft_putchar.c\ printing/ft_putchar.c\
printing/ft_putchar_fd.c\
printing/ft_putendl.c\ printing/ft_putendl.c\
printing/ft_putendl_fd.c\
printing/ft_putnbr.c\ printing/ft_putnbr.c\
printing/ft_putnbr_fd.c\
printing/ft_putstr.c\ printing/ft_putstr.c\
printing/ft_putstr_fd.c\
sstr/ft_sstradd.c\ sstr/ft_sstradd.c\
sstr/ft_sstrcat.c\ sstr/ft_sstrcat.c\
sstr/ft_sstrdel.c\ sstr/ft_sstrdel.c\
@ -143,6 +139,7 @@ sstr/ft_sstrprint_fd.c\
sstr/ft_sstrsort.c\ sstr/ft_sstrsort.c\
str/ft_atoi.c\ str/ft_atoi.c\
str/ft_convert_base.c\ str/ft_convert_base.c\
str/ft_putaddr_fd.c\
str/ft_split_whitespaces.c\ str/ft_split_whitespaces.c\
str/ft_str3join.c\ str/ft_str3join.c\
str/ft_strappend.c\ str/ft_strappend.c\
@ -181,11 +178,12 @@ str/ft_strsub.c\
str/ft_strtok.c\ str/ft_strtok.c\
str/ft_strtrim.c\ str/ft_strtrim.c\
sys/dup2_close.c\ sys/dup2_close.c\
sys/ft_getenv.c\
sys/ft_xattr_count.c\
sys/ft_xattr_print.c\
time/ft_mytime_free.c\ time/ft_mytime_free.c\
time/ft_mytime_get.c\ time/ft_mytime_get.c\
time/ft_time_isrecent.c\ time/ft_time_isrecent.c
xattr/ft_xattr_count.c\
xattr/ft_xattr_print.c
SRCS = $(addprefix $(SRC_DIR), $(SRC_BASE)) SRCS = $(addprefix $(SRC_DIR), $(SRC_BASE))
OBJS = $(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o)) OBJS = $(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o))
@ -198,6 +196,7 @@ all:
$(NAME): $(OBJ_DIR) $(OBJS) $(NAME): $(OBJ_DIR) $(OBJS)
@$(AR) $(NAME) $(OBJS) @$(AR) $(NAME) $(OBJS)
@ranlib $(NAME) @ranlib $(NAME)
@strip -x $(NAME)
@printf "\r\e[48;5;15;38;5;25m✅ MAKE $(NAME)\e[0m\e[K\n" @printf "\r\e[48;5;15;38;5;25m✅ MAKE $(NAME)\e[0m\e[K\n"
$(OBJ_DIR)%.o: $(SRC_DIR)%.c | $(OBJ_DIR) $(OBJ_DIR)%.o: $(SRC_DIR)%.c | $(OBJ_DIR)
@ -206,8 +205,7 @@ $(OBJ_DIR)%.o: $(SRC_DIR)%.c | $(OBJ_DIR)
@$(eval COLOR=$(shell echo $$(($(PERCENT)%35+196)))) @$(eval COLOR=$(shell echo $$(($(PERCENT)%35+196))))
@$(eval TO_DO=$(shell echo $$((20-$(INDEX)*20/$(NB))))) @$(eval TO_DO=$(shell echo $$((20-$(INDEX)*20/$(NB)))))
@printf "\r\e[38;5;11m⌛ MAKE %10.10s : %2d%% \e[48;5;%dm%*s\e[0m%*s\e[48;5;255m \e[0m \e[38;5;11m %*s\e[0m\e[K" $(NAME) $(PERCENT) $(COLOR) $(DONE) "" $(TO_DO) "" $(DELTA) "$@" @printf "\r\e[38;5;11m⌛ MAKE %10.10s : %2d%% \e[48;5;%dm%*s\e[0m%*s\e[48;5;255m \e[0m \e[38;5;11m %*s\e[0m\e[K" $(NAME) $(PERCENT) $(COLOR) $(DONE) "" $(TO_DO) "" $(DELTA) "$@"
@$(MKDIR) $(OBJ_DIR) @$(CC) $(FLAGS) -MMD -c $< -o $@\
@$(CC) $(FLAGS) $(D_FLAGS) -MMD -c $< -o $@\
-I $(INC_DIR) -I $(INC_DIR)
@$(eval INDEX=$(shell echo $$(($(INDEX)+1)))) @$(eval INDEX=$(shell echo $$(($(INDEX)+1))))

4
libftasm/includes/color.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/25 13:36:48 by jhalford #+# #+# */ /* Created: 2016/11/25 13:36:48 by jhalford #+# #+# */
/* Updated: 2017/02/07 20:09:07 by jhalford ### ########.fr */ /* Updated: 2017/02/18 20:01:33 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -45,7 +45,7 @@ typedef struct s_color t_color;
# define BG_CYAN "\e[46m" # define BG_CYAN "\e[46m"
# define BG_DEFAULT "\e[49m" # define BG_DEFAULT "\e[49m"
# define FBG_DEFAULT "\e[49m\e[20m" # define FBG_DEFAULT FG_DEFAULT BG_DEFAULT
void ft_color_reset(void); void ft_color_reset(void);
void ft_color_set(t_color color); void ft_color_set(t_color color);

9
libftasm/includes/ft_printf.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:22:54 by jhalford #+# #+# */ /* Created: 2016/11/07 13:22:54 by jhalford #+# #+# */
/* Updated: 2016/12/15 15:29:22 by jhalford ### ########.fr */ /* Updated: 2017/02/18 13:21:03 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,6 +14,7 @@
# define FT_PRINTF_H # define FT_PRINTF_H
# include "libft.h" # include "libft.h"
# include <stdarg.h> # include <stdarg.h>
# define ALL_FLAGS "#0- +" # define ALL_FLAGS "#0- +"
# define ALL_CONVERSIONS "sSpdDioOuUxXcCb" # define ALL_CONVERSIONS "sSpdDioOuUxXcCb"
@ -50,12 +51,7 @@ extern t_conv g_convs[];
t_fmt *ft_fmt_init(void); t_fmt *ft_fmt_init(void);
void ft_fmt_print(t_fmt *fmt); void ft_fmt_print(t_fmt *fmt);
void ft_printf_color(int fd, char **final, char **str); void ft_printf_color(int fd, char **final, char **str);
t_fmt *ft_printf_parse(char **format, va_list ap); t_fmt *ft_printf_parse(char **format, va_list ap);
void ft_printf_parse_flags(t_fmt *fmt, char **format);
void ft_printf_parse_width(t_fmt *fmt, char **format, va_list ap);
void ft_printf_parse_precision(t_fmt *fmt, char **format, va_list ap);
void ft_printf_parse_modifiers(t_fmt *fmt, char **format);
char *ft_transform(t_fmt *fmt, va_list ap); char *ft_transform(t_fmt *fmt, va_list ap);
@ -78,4 +74,5 @@ void ft_pad_sharp_o(char *str, t_fmt *fmt);
void ft_pad_sharp_xb(char *str, t_fmt *fmt); void ft_pad_sharp_xb(char *str, t_fmt *fmt);
void ft_pad_left(char *str, t_fmt *fmt); void ft_pad_left(char *str, t_fmt *fmt);
void ft_pad_right(char *str, t_fmt *fmt); void ft_pad_right(char *str, t_fmt *fmt);
#endif #endif

21
libftasm/includes/ft_xattr.h → libftasm/includes/ft_sys.h
View file

@ -1,21 +1,30 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* ftxattr.h :+: :+: :+: */ /* ft_sys.h :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:24:05 by jhalford #+# #+# */ /* Created: 2017/02/18 13:09:02 by jhalford #+# #+# */
/* Updated: 2016/11/07 13:24:05 by jhalford ### ########.fr */ /* Updated: 2017/02/18 13:19:06 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef FT_XATTR_H #ifndef FT_SYS_H
# define FT_XATTR_H # define FT_SYS_H
# define FT_XATTR_SIZE 10000 # define FT_XATTR_SIZE 10000
# define STDIN STDIN_FILENO
# define STDOUT STDOUT_FILENO
# define STDERR STDERR_FILENO
# define STDBUG 3
# include <sys/types.h> # include <sys/types.h>
# include <sys/xattr.h> # include <sys/xattr.h>
int ft_xattr_print(char *path); int ft_xattr_print(char *path);
int ft_xattr_count(char *path); int ft_xattr_count(char *path);
char *ft_getenv(char **env, char *key);
int dup2_close(int fd1, int fd2);
#endif #endif

116
libftasm/includes/libft.h
View file

@ -6,18 +6,13 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */ /* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */
/* Updated: 2017/02/10 00:27:21 by jhalford ### ########.fr */ /* Updated: 2017/02/18 18:48:49 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef LIBFT_H #ifndef LIBFT_H
# define LIBFT_H # define LIBFT_H
# define STDIN STDIN_FILENO
# define STDOUT STDOUT_FILENO
# define STDERR STDERR_FILENO
# define STDBUG 3
# define DG_MSG0 "{inv}{yel}%21s {bol}{blu}%-3d{eoc}" # define DG_MSG0 "{inv}{yel}%21s {bol}{blu}%-3d{eoc}"
# define DG_MSG1 ft_path_notdir(__FILE__), __LINE__ # define DG_MSG1 ft_path_notdir(__FILE__), __LINE__
# define DG(f, ...) ft_dprintf(STDBUG, DG_MSG0 f "{eoc}\n", DG_MSG1, ##__VA_ARGS__) # define DG(f, ...) ft_dprintf(STDBUG, DG_MSG0 f "{eoc}\n", DG_MSG1, ##__VA_ARGS__)
@ -31,20 +26,15 @@
# include <sys/acl.h> # include <sys/acl.h>
# include "lst.h" # include "lst.h"
# include "get_next_line.h"
# include "ft_xattr.h"
# include "mytime.h"
# include "dlst.h" # include "dlst.h"
# include "str.h"
# include "sstr.h"
# include "math.h"
# include "btree.h" # include "btree.h"
# include "mytime.h"
# include "get_next_line.h"
# include "color.h" # include "color.h"
# include "ft_sys.h"
# define FT_WS(x) (x == ' ' || x == '\t' || x == '\n')
# define FT_ABS(x) (((x) < 0) ? -(x) : (x))
# define FT_NEG(x) ((x) < 0)
# define FT_POS(x) ((x) > 0)
# define FT_MIN(a, b) ((a) < (b) ? (a) : (b))
# define FT_MAX(a, b) ((a) > (b) ? (a) : (b))
# define FT_DIST(a, b) FT_ABS((a) - (b))
typedef struct s_stof t_stof; typedef struct s_stof t_stof;
typedef struct s_stos t_stos; typedef struct s_stos t_stos;
@ -61,7 +51,8 @@ struct s_stof
int (*f)(); int (*f)();
}; };
void ft_debug(void); int ft_printf(const char *format, ...);
int ft_dprintf(int fd, const char *format, ...);
void *ft_memset(void *b, int c, size_t len); void *ft_memset(void *b, int c, size_t len);
void ft_bzero(void *s, size_t n); void ft_bzero(void *s, size_t n);
@ -70,96 +61,21 @@ void *ft_memccpy(void *dst, const void *src, int c, size_t n);
void *ft_memmove(void *dst, const void *src, size_t len); void *ft_memmove(void *dst, const void *src, size_t len);
void *ft_memchr(const void *s, int c, size_t n); void *ft_memchr(const void *s, int c, size_t n);
int ft_memcmp(const void *s1, const void *s2, size_t n); int ft_memcmp(const void *s1, const void *s2, size_t n);
size_t ft_strlen(const char *s);
char *ft_strdup(const char *s1);
char *ft_strcpy(char *dst, const char *src);
char *ft_strncpy(char *dst, const char *src, size_t len);
char *ft_strcat(char *s1, const char *s2);
char *ft_strncat(char *s1, const char *s2, size_t n);
size_t ft_strlcat(char *dst, const char *src, size_t size);
char *ft_strchr(const char *s, int c);
char *ft_strrchr(const char *s, int c);
char *ft_strstr(const char *big, const char *little);
char *ft_strnstr(const char *big, const char *little, size_t len);
int ft_strcmp(const char *s1, const char *s2);
int ft_strncmp(const char *s1, const char *s2, size_t n);
int ft_atoi(const char *str);
int ft_isalpha(int c);
int ft_isdigit(int c);
int ft_isalnum(int c);
int ft_isascii(int c);
int ft_isprint(int c);
int ft_toupper(int c);
int ft_tolower(int c);
void *ft_memalloc(size_t size); void *ft_memalloc(size_t size);
void ft_memdel(void **ap); void ft_memdel(void **ap);
char *ft_strnew(size_t size);
void ft_strdel(char **as);
void ft_strclr(char *s);
void ft_striter(char *s, void (*f)(char *));
void ft_striteri(char *s, void (*f)(unsigned int, char *));
char *ft_strmap(char const *s, char (*f)(char));
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
int ft_strequ(char const *s1, char const *s2);
int ft_strnequ(char const *s1, char const *s2, size_t n);
char *ft_strsub(char const *s, unsigned int start, size_t len);
char *ft_strjoin(char const *s1, char const *s2);
char *ft_strtrim(char const *s);
char **ft_strsplit(char const *s, char c);
char *ft_itoa(int n);
int ft_putchar(int c); int ft_putchar(int c);
void ft_putstr(char const *s); void ft_putstr(char const *s);
void ft_putendl(char const *s); void ft_putendl(char const *s);
void ft_putnbr(int n); void ft_putnbr(long n);
void ft_putchar_fd(char c, int fd); void ft_putnbr_hex(long n);
int ft_putchar_fd(int c, int fd);
void ft_putstr_fd(char const *s, int fd); void ft_putstr_fd(char const *s, int fd);
void ft_putendl_fd(char const *s, int fd); void ft_putendl_fd(char const *s, int fd);
void ft_putnbr_fd(int n, int fd); void ft_putnbr_fd(long n, int fd);
void ft_putaddr(void *a); void ft_putnbr_hex_fd(long n, int fd);
char *ft_strrev(char *str);
char **ft_strsplit(char const *s, char c);
char *ft_str3join(char const *s1, char const *s2, char const *s3);
char *ft_strcut(char *str, char *cut);
char **ft_split_whitespaces(char const *str);
char *ft_convert_base(
char *str, char *base_from, char *base_to, char *flags);
char *ft_strcatf(char *s1, const char *s2);
char *ft_strinsert(char *str, char c, int n);
int ft_strappend(char **dst, char *src);
char *ft_strbetween(char *start, char *end);
char *ft_strreplace(char **str, char *start, char *end, char *new);
char *ft_strtok(char *s, const char *delim);
size_t ft_strcspn(char *s, const char *delim);
char *ft_itoa_base(int nbr, char *base, char *flags);
char *ft_lltoa_base(long long nbr, char *base, char *flags);
char *ft_ulltoa_base(unsigned long long nbr, char *base);
char *ft_uitoa_base(unsigned int nbr, char *base);
size_t ft_ilen(int n);
size_t ft_ilen_base(int n, int base);
size_t ft_uilen(unsigned int n);
size_t ft_lllen(long long n);
size_t ft_lllen_base(long long n, int base);
int ft_addrcmp(void *a, void *b);
char **ft_sstradd(char **list, char *new);
void ft_sstrsort(char **list, int (*cmp)());
void ft_sstrprint(char **list, char sep);
void ft_sstrprint_fd(int fd, char **list, char sep);
char **ft_sstrdup(char **list);
void ft_sstrdel(char **sstr, int index);
void ft_sstrfree(char **sstr);
char *ft_sstrcat(char **sstr, char sep);
char *ft_path_notdir(char *path);
int ft_printf(const char *format, ...);
int ft_dprintf(int fd, const char *format, ...);
void *ft_realloc(void *data, int size); void *ft_realloc(void *data, int size);
char *ft_getenv(char **env, char *key);
int dup2_close(int fd1, int fd2);
#endif #endif

37
libftasm/includes/math.h Normal file
View file

@ -0,0 +1,37 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* math.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/18 13:19:12 by jhalford #+# #+# */
/* Updated: 2017/02/18 13:19:57 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef MATH_H
# define MATH_H
# define FT_WS(x) (x == ' ' || x == '\t' || x == '\n')
# define FT_ABS(x) (((x) < 0) ? -(x) : (x))
# define FT_NEG(x) ((x) < 0)
# define FT_POS(x) ((x) > 0)
# define FT_MIN(a, b) ((a) < (b) ? (a) : (b))
# define FT_MAX(a, b) ((a) > (b) ? (a) : (b))
# define FT_DIST(a, b) FT_ABS((a) - (b))
char *ft_itoa(int n);
char *ft_itoa_base(int nbr, char *base, char *flags);
char *ft_lltoa_base(long long nbr, char *base, char *flags);
char *ft_ulltoa_base(unsigned long long nbr, char *base);
char *ft_uitoa_base(unsigned int nbr, char *base);
size_t ft_ilen(int n);
size_t ft_ilen_base(int n, int base);
size_t ft_uilen(unsigned int n);
size_t ft_lllen(long long n);
size_t ft_lllen_base(long long n, int base);
int ft_addrcmp(void *a, void *b);
#endif

2
libftasm/includes/mytime.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/25 11:43:12 by jhalford #+# #+# */ /* Created: 2016/11/25 11:43:12 by jhalford #+# #+# */
/* Updated: 2016/11/25 20:26:20 by jhalford ### ########.fr */ /* Updated: 2017/02/18 13:11:26 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

26
libftasm/src/misc/ft_debug.c → libftasm/includes/sstr.h
View file

@ -1,21 +1,25 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* ft_debug.c :+: :+: :+: */ /* sstr.h :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/04 11:45:16 by jhalford #+# #+# */ /* Created: 2017/02/18 13:16:25 by jhalford #+# #+# */
/* Updated: 2016/12/07 15:22:06 by jhalford ### ########.fr */ /* Updated: 2017/02/18 13:16:48 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libft.h" #ifndef SSTR_H
# define SSTR_H
void ft_debug(void) char **ft_sstradd(char **list, char *new);
{ void ft_sstrsort(char **list, int (*cmp)());
static int n = 0; void ft_sstrprint(char **list, char sep);
void ft_sstrprint_fd(int fd, char **list, char sep);
char **ft_sstrdup(char **list);
void ft_sstrdel(char **sstr, int index);
void ft_sstrfree(char **sstr);
char *ft_sstrcat(char **sstr, char sep);
n++; #endif
ft_dprintf(2, "----------\n check %02i\n----------\n", n);
}

70
libftasm/includes/str.h Normal file
View file

@ -0,0 +1,70 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* str.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/18 13:05:53 by jhalford #+# #+# */
/* Updated: 2017/02/18 18:47:45 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef STR_H
# define STR_H
int ft_isalpha(int c);
int ft_isdigit(int c);
int ft_isalnum(int c);
int ft_isascii(int c);
int ft_isprint(int c);
int ft_toupper(int c);
int ft_tolower(int c);
size_t ft_strlen(const char *s);
char *ft_strdup(const char *s1);
char *ft_strcpy(char *dst, const char *src);
char *ft_strncpy(char *dst, const char *src, size_t len);
char *ft_strcat(char *s1, const char *s2);
char *ft_strncat(char *s1, const char *s2, size_t n);
size_t ft_strlcat(char *dst, const char *src, size_t size);
char *ft_strchr(const char *s, int c);
char *ft_strrchr(const char *s, int c);
char *ft_strstr(const char *big, const char *little);
char *ft_strnstr(const char *big, const char *little, size_t len);
int ft_strcmp(const char *s1, const char *s2);
int ft_strncmp(const char *s1, const char *s2, size_t n);
int ft_atoi(const char *str);
char *ft_strnew(size_t size);
void ft_strdel(char **as);
void ft_strclr(char *s);
void ft_striter(char *s, void (*f)(char *));
void ft_striteri(char *s, void (*f)(unsigned int, char *));
char *ft_strmap(char const *s, char (*f)(char));
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
int ft_strequ(char const *s1, char const *s2);
int ft_strnequ(char const *s1, char const *s2, size_t n);
char *ft_strsub(char const *s, unsigned int start, size_t len);
char *ft_strjoin(char const *s1, char const *s2);
char *ft_strtrim(char const *s);
char **ft_strsplit(char const *s, char c);
char *ft_strrev(char *str);
char **ft_strsplit(char const *s, char c);
char *ft_str3join(char const *s1, char const *s2, char const *s3);
char *ft_strcut(char *str, char *cut);
char **ft_split_whitespaces(char const *str);
char *ft_convert_base(
char *str, char *base_from, char *base_to, char *flags);
char *ft_strcatf(char *s1, const char *s2);
char *ft_strinsert(char *str, char c, int n);
int ft_strappend(char **dst, char *src);
char *ft_strbetween(char *start, char *end);
char *ft_strreplace(char **str, char *start, char *end, char *new);
char *ft_strtok(char *s, const char *delim);
size_t ft_strcspn(char *s, const char *delim);
char *ft_path_notdir(char *path);
#endif

2
libftasm/src/ft_printf/ft_printf.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:33:27 by jhalford #+# #+# */ /* Created: 2016/11/07 13:33:27 by jhalford #+# #+# */
/* Updated: 2017/01/22 16:38:58 by jhalford ### ########.fr */ /* Updated: 2017/02/18 13:05:26 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

47
libftasm/src/ft_printf/ft_printf_parse.c
View file

@ -6,31 +6,13 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:33:24 by jhalford #+# #+# */ /* Created: 2016/11/07 13:33:24 by jhalford #+# #+# */
/* Updated: 2016/12/15 15:30:49 by jhalford ### ########.fr */ /* Updated: 2017/02/18 13:08:53 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ft_printf.h" #include "ft_printf.h"
t_fmt *ft_printf_parse(char **format, va_list ap) static void ft_printf_parse_flags(t_fmt *fmt, char **format)
{
t_fmt *fmt;
fmt = ft_fmt_init();
ft_printf_parse_flags(fmt, format);
ft_printf_parse_width(fmt, format, ap);
ft_printf_parse_precision(fmt, format, ap);
ft_printf_parse_modifiers(fmt, format);
fmt->conversion = **format;
(*format)++;
ft_fmt_validate_mod(fmt);
ft_fmt_validate_flags(fmt);
ft_fmt_simplify(fmt);
fmt->valid = ft_fmt_validate_conv(fmt) ? 0 : 1;
return (fmt);
}
void ft_printf_parse_flags(t_fmt *fmt, char **format)
{ {
int i; int i;
char *str; char *str;
@ -51,7 +33,7 @@ void ft_printf_parse_flags(t_fmt *fmt, char **format)
*format += i; *format += i;
} }
void ft_printf_parse_width(t_fmt *fmt, char **format, va_list ap) static void ft_printf_parse_width(t_fmt *fmt, char **format, va_list ap)
{ {
int i; int i;
char buf[10]; char buf[10];
@ -74,7 +56,7 @@ void ft_printf_parse_width(t_fmt *fmt, char **format, va_list ap)
*format += i; *format += i;
} }
void ft_printf_parse_precision(t_fmt *fmt, char **format, va_list ap) static void ft_printf_parse_precision(t_fmt *fmt, char **format, va_list ap)
{ {
int i; int i;
char buf[10]; char buf[10];
@ -100,7 +82,7 @@ void ft_printf_parse_precision(t_fmt *fmt, char **format, va_list ap)
*format += i; *format += i;
} }
void ft_printf_parse_modifiers(t_fmt *fmt, char **format) static void ft_printf_parse_modifiers(t_fmt *fmt, char **format)
{ {
char *str; char *str;
@ -121,3 +103,22 @@ void ft_printf_parse_modifiers(t_fmt *fmt, char **format)
ft_strcpy(fmt->modifier, ""); ft_strcpy(fmt->modifier, "");
*format += ft_strlen(fmt->modifier); *format += ft_strlen(fmt->modifier);
} }
t_fmt *ft_printf_parse(char **format, va_list ap)
{
t_fmt *fmt;
fmt = ft_fmt_init();
ft_printf_parse_flags(fmt, format);
ft_printf_parse_width(fmt, format, ap);
ft_printf_parse_precision(fmt, format, ap);
ft_printf_parse_modifiers(fmt, format);
fmt->conversion = **format;
(*format)++;
ft_fmt_validate_mod(fmt);
ft_fmt_validate_flags(fmt);
ft_fmt_simplify(fmt);
fmt->valid = ft_fmt_validate_conv(fmt) ? 0 : 1;
return (fmt);
}

2
libftasm/src/ft_printf/lib_pad.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:33:45 by jhalford #+# #+# */ /* Created: 2016/11/07 13:33:45 by jhalford #+# #+# */
/* Updated: 2016/12/09 19:14:58 by jhalford ### ########.fr */ /* Updated: 2017/02/18 13:14:30 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
libftasm/src/math/ft_ilen.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:53:53 by jhalford #+# #+# */ /* Created: 2016/11/07 13:53:53 by jhalford #+# #+# */
/* Updated: 2016/11/07 14:44:35 by jhalford ### ########.fr */ /* Updated: 2017/02/18 15:41:20 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
libftasm/src/math/ft_lltoa_base.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:10:42 by jhalford #+# #+# */ /* Created: 2016/11/07 13:10:42 by jhalford #+# #+# */
/* Updated: 2017/01/22 16:39:08 by jhalford ### ########.fr */ /* Updated: 2017/02/18 15:23:41 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
libftasm/src/math/ft_ulltoa_base.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:07:50 by jhalford #+# #+# */ /* Created: 2016/11/07 13:07:50 by jhalford #+# #+# */
/* Updated: 2016/11/07 13:12:41 by jhalford ### ########.fr */ /* Updated: 2017/02/18 16:07:02 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

6
libftasm/src/printing/ft_putchar.c
View file

@ -12,6 +12,12 @@
#include "libft.h" #include "libft.h"
int ft_putchar_fd(int c, int fd)
{
write(fd, &c, 1);
return (0);
}
int ft_putchar(int c) int ft_putchar(int c)
{ {
write(1, &c, 1); write(1, &c, 1);

18
libftasm/src/printing/ft_putchar_fd.c
View file

@ -1,18 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putchar_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/03 14:57:39 by jhalford #+# #+# */
/* Updated: 2016/11/03 14:57:39 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putchar_fd(char c, int fd)
{
write(fd, &c, 1);
}

22
libftasm/src/printing/ft_putendl_fd.c
View file

@ -1,22 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putendl_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/03 14:57:42 by jhalford #+# #+# */
/* Updated: 2016/11/03 14:57:42 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putendl_fd(char const *s, int fd)
{
char nl;
nl = '\n';
write(fd, s, ft_strlen(s));
write(fd, &nl, 1);
}

40
libftasm/src/printing/ft_putnbr.c
View file

@ -6,25 +6,39 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/08/02 21:25:03 by jhalford #+# #+# */ /* Created: 2016/08/02 21:25:03 by jhalford #+# #+# */
/* Updated: 2016/08/04 21:28:16 by jhalford ### ########.fr */ /* Updated: 2017/02/18 17:47:04 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libft.h" #include "libft.h"
void ft_putnbr(int n) void ft_putnbr_loop(long n, int base, int fd)
{ {
if (n == -2147483648) if (n >= base)
{ ft_putnbr_loop(n / base, base, fd);
ft_putchar('-'); ft_putchar_fd("0123456789abcdef"[n % base], fd);
ft_putchar('2');
ft_putnbr(147483648);
return ;
} }
else if (n < 0)
ft_putchar('-'); void ft_putnbr_hex_fd(long n, int fd)
{
ft_putstr_fd("0x", fd);
ft_putnbr_loop(n, 16, fd);
}
void ft_putnbr_fd(long n, int fd)
{
if (n < 0)
ft_putchar_fd('-', fd);
n = FT_ABS(n); n = FT_ABS(n);
if (n >= 10) ft_putnbr_loop(n, 10, fd);
ft_putnbr(n / 10); }
ft_putchar(n % 10 + '0');
void ft_putnbr_hex(long n)
{
ft_putnbr_hex_fd(n, 1);
}
void ft_putnbr(long n)
{
ft_putnbr_fd(n, 1);
} }

30
libftasm/src/printing/ft_putnbr_fd.c
View file

@ -1,30 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putnbr_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/08/02 21:25:03 by jhalford #+# #+# */
/* Updated: 2016/08/04 21:28:16 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putnbr_fd(int n, int fd)
{
if (n == -2147483648)
{
ft_putchar_fd('-', fd);
ft_putchar_fd('2', fd);
ft_putnbr_fd(147483648, fd);
return ;
}
else if (n < 0)
ft_putchar_fd('-', fd);
n = FT_ABS(n);
if (n >= 10)
ft_putnbr_fd(n / 10, fd);
ft_putchar_fd(n % 10 + '0', fd);
}

5
libftasm/src/printing/ft_putstr.c
View file

@ -12,6 +12,11 @@
#include "libft.h" #include "libft.h"
void ft_putstr_fd(char const *s, int fd)
{
write(fd, s, ft_strlen(s));
}
void ft_putstr(char const *s) void ft_putstr(char const *s)
{ {
write(1, s, ft_strlen(s)); write(1, s, ft_strlen(s));

18
libftasm/src/printing/ft_putstr_fd.c
View file

@ -1,18 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putstr_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/03 14:57:48 by jhalford #+# #+# */
/* Updated: 2016/11/03 14:57:49 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putstr_fd(char const *s, int fd)
{
write(fd, s, ft_strlen(s));
}

28
libftasm/src/printing/ft_putaddr.c → libftasm/src/str/ft_putaddr_fd.c
View file

@ -1,18 +1,36 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* ft_putaddr.c :+: :+: :+: */ /* ft_putaddr_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/21 15:13:34 by jhalford #+# #+# */ /* Created: 2017/02/18 18:47:04 by jhalford #+# #+# */
/* Updated: 2016/11/21 15:13:35 by jhalford ### ########.fr */ /* Updated: 2017/02/18 18:48:58 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libft.h" #include "libft.h"
void ft_putaddr(void *a) void ft_putaddr_fd(void *a, int fd)
{ {
ft_printf("%p", a); char out[19];
unsigned long long addr;
int i;
ft_putnbr((long)a);
ft_putchar('\n');
addr = (unsigned long long)a;
out[18] = 0;
i = 17;
while (addr)
{
ft_putnbr(addr);
ft_putchar('\n');
out[i--] = "0123456789ABCDEF"[addr % 16];
addr /= 16;
}
out[i--] = 'x';
out[i] = '0';
ft_putstr_fd(out + i, fd);
} }

0
libftasm/src/env/ft_getenv.c → libftasm/src/sys/ft_getenv.c
View file

0
libftasm/src/xattr/ft_xattr_count.c → libftasm/src/sys/ft_xattr_count.c
View file

0
libftasm/src/xattr/ft_xattr_print.c → libftasm/src/sys/ft_xattr_print.c
View file

2
libftasm/src/time/ft_mytime_free.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/25 11:45:29 by jhalford #+# #+# */ /* Created: 2016/11/25 11:45:29 by jhalford #+# #+# */
/* Updated: 2016/11/25 11:48:12 by jhalford ### ########.fr */ /* Updated: 2017/02/18 13:11:33 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */