diff --git a/42sh/Makefile b/42sh/Makefile index 0b60f83d..4b179c9a 100644 --- a/42sh/Makefile +++ b/42sh/Makefile @@ -145,7 +145,6 @@ line-editing/builtin_history.c\ line-editing/check_backslash.c\ line-editing/control_c_and_d.c\ line-editing/copy_cut_paste.c\ -line-editing/ft_split_whitespaces.c\ line-editing/get_touch.c\ line-editing/get_touch_toolz.c\ line-editing/get_touch_toolz_2.c\ diff --git a/42sh/includes/btree.h b/42sh/includes/btree.h deleted file mode 100644 index 5839155c..00000000 --- a/42sh/includes/btree.h +++ /dev/null @@ -1,54 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* btree.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/16 11:13:15 by jhalford #+# #+# */ -/* Updated: 2016/12/05 11:53:30 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef BTREE_H -# define BTREE_H - -# include "libft.h" - -struct s_btree -{ - void *item; - size_t content_size; - struct s_btree *left; - struct s_btree *right; -}; - -struct s_printdata -{ - int is_left; - int offset; - int depth; - int left; - int right; -}; - -typedef struct s_btree t_btree; -typedef struct s_printdata t_printdata; - -t_btree *btree_create_node(void const *item, size_t content_size); -void btree_insert_data( - t_btree **root, - void *item, - size_t content_size, - int (*cmpf)(void *, void *)); -void *btree_search_item(t_btree *root, - void *data_ref, int (*cmpf)(void *, void *)); -int btree_level_count(t_btree *root); -void btree_apply_prefix(t_btree *root, void (*applyf)(void *)); -void btree_apply_infix(t_btree *root, void (*applyf)(void *)); -void btree_apply_suffix(t_btree *root, void (*applyf)(void *)); -void btree_print(int fd, t_btree *tree, char *(*printer)(void *)); -void btree_del(t_btree **root, void (*del)(void *, size_t)); -void btree_delone(t_btree **root, void (*del)(void *, size_t)); - -#endif diff --git a/42sh/includes/builtin_read.h b/42sh/includes/builtin_read.h index 177f9176..bb8256a8 100644 --- a/42sh/includes/builtin_read.h +++ b/42sh/includes/builtin_read.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/20 15:02:39 by jhalford #+# #+# */ -/* Updated: 2017/01/27 18:56:58 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:59:15 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,6 @@ # define BUILTIN_READ_H # include "types.h" -# include "libft.h" # include "builtin.h" # include "minishell.h" diff --git a/42sh/includes/color.h b/42sh/includes/color.h deleted file mode 100644 index 96eea18e..00000000 --- a/42sh/includes/color.h +++ /dev/null @@ -1,56 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* color.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/25 13:36:48 by jhalford #+# #+# */ -/* Updated: 2016/12/09 22:09:24 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef COLOR_H -# define COLOR_H -# include "libft.h" - -struct s_color -{ - char fg[7]; - char bg[7]; -}; - -typedef struct s_color t_color; - -# define FG_DEFAULT "\x1b[0m" -# define ON_BOLD "\x1b[1m" - -# define ON_UNDERLINED "\x1b[4m" -# define ON_INVERTED "\x1b[7m" - -# define FG_BLACK "\x1b[30m" -# define FG_RED "\x1b[31m" -# define FG_GREEN "\x1b[32m" -# define FG_YELLOW "\x1b[33m" -# define FG_BLUE "\x1b[34m" -# define FG_MAGENTA "\x1b[35m" -# define FG_CYAN "\x1b[36m" - -# define BG_BLACK "\x1b[40m" -# define BG_RED "\x1b[41m" -# define BG_GREEN "\x1b[42m" -# define BG_YELLOW "\x1b[43m" -# define BG_BLUE "\x1b[44m" -# define BG_MAGENTA "\x1b[45m" -# define BG_CYAN "\x1b[46m" -# define BG_DEFAULT "\x1b[49m" - -# define FBG_DEFAULT "\x1b[49m\x1b[20m" - -void ft_color_reset(void); -void ft_color_set(t_color color); - -void ft_color_mk(t_color *color, char fg[7], char bg[7]); -void ft_color_mkif(t_color *color, int cond, char fg[7], char bg[7]); - -#endif diff --git a/42sh/includes/dlst.h b/42sh/includes/dlst.h deleted file mode 100644 index 42d73729..00000000 --- a/42sh/includes/dlst.h +++ /dev/null @@ -1,35 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* dlst.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/07 13:21:04 by jhalford #+# #+# */ -/* Updated: 2016/11/07 13:21:52 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef DLST_H -# define DLST_H - -struct s_dlist -{ - void *content; - size_t content_size; - struct s_dlist *next; - struct s_dlist *prev; -}; - -typedef struct s_dlist t_dlist; - -void ft_dlstadd_after(t_dlist **alst, t_dlist *new); -void ft_dlstadd_before(t_dlist **alst, t_dlist *new); -void ft_dlstdel(t_dlist **alst, void (*del)(void *, size_t)); -void ft_dlstdelone(t_dlist **alst, void (*del)(void *, size_t)); -int ft_dlstsize(t_dlist *list); -t_dlist *ft_dlstnew(void const *content, size_t content_size); -t_dlist *ft_dlstlast(t_dlist *list); -char *ft_dlsttostr(t_dlist *list); - -#endif diff --git a/42sh/includes/ft_curs.h b/42sh/includes/ft_curs.h deleted file mode 100644 index 02f3f314..00000000 --- a/42sh/includes/ft_curs.h +++ /dev/null @@ -1,83 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_curs.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: sbenning +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/12/08 16:34:51 by sbenning #+# #+# */ -/* Updated: 2016/12/09 17:08:52 by sbenning ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef FT_CURS_H -# define FT_CURS_H - -# include "libft.h" - -# include -# include -# include -# include -# include - -typedef struct s_curs t_curs; - -/* - * Cursor data : cursor's coordonate and windows size -*/ - -struct s_curs -{ - int co; - int li; - int win_co; - int win_li; -}; - -/* - * Cursor reference singleton -*/ - -t_curs *curs_single(t_curs *curs, int set); - -/* - * Cursor setup -*/ - -int curs_li_ask(void); -int curs_co_ask(void); - -int curs_term_setup(void); -void curs_win_setup(t_curs *curs); -int curs_coo_setup(t_curs *curs); -int curs_setup(t_curs *curs); - -/* - * Cursor cleanup -*/ - -int curs_term_cleanup(void); -int curs_cleanup(t_curs *curs); - -/* - * Cursor's data reset -*/ - -void curs_reset(int sig); - -/* - * Cursor manipulation function -*/ - -void curs_clear(t_curs *curs); -void curs_clear_post(t_curs *curs); -void curs_goto(t_curs *curs, int li, int co); -void curs_forward(t_curs *curs, int offset); -void curs_backward(t_curs *curs, int offset); -void curs_write(t_curs *curs, char *str, size_t len); -void curs_write_static(t_curs *curs, char *str, size_t len); -void curs_video_write(t_curs *curs, char *str, size_t len); -void curs_video_write_static(t_curs *curs, char *str, size_t len); - -#endif diff --git a/42sh/includes/ft_printf.h b/42sh/includes/ft_printf.h deleted file mode 100644 index 6db739f4..00000000 --- a/42sh/includes/ft_printf.h +++ /dev/null @@ -1,81 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ftprintf.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/07 13:22:54 by jhalford #+# #+# */ -/* Updated: 2016/12/15 15:29:22 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef FT_PRINTF_H -# define FT_PRINTF_H -# include "libft.h" -# include -# define ALL_FLAGS "#0- +" -# define ALL_CONVERSIONS "sSpdDioOuUxXcCb" - -typedef struct s_fmt t_fmt; -typedef struct s_conv t_conv; -typedef char *(t_converter)(t_fmt *fmt, va_list ap); -typedef void (t_pad_func)(char *str, t_fmt *fmt); - -struct s_conv -{ - char id; - char allowed_flags[6]; - char base[20]; - t_converter *converter; - t_pad_func *sharp_func; -}; - -struct s_fmt -{ - char flags[6]; - int width; - int precision; - char modifier[3]; - char conversion; - int valid; - t_conv conv; -}; - -int ft_vdprintf(int fd, const char *format, va_list ap); -int ft_fmtcalc(char **final, char **str, va_list ap); - -extern t_conv g_convs[]; - -t_fmt *ft_fmt_init(void); -void ft_fmt_print(t_fmt *fmt); -void ft_printf_color(int fd, char **final, char **str); - -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); - -void ft_fmt_error_conv(char conv); -void ft_fmt_error_mod_conv(char *mod, char conv); -void ft_fmt_error_flag_conv(char flag, char conv); -void ft_fmt_error_flag_flag(char flag1, char flag2); - -void ft_fmt_simplify(t_fmt *fmt); -int ft_fmt_validate_conv(t_fmt *fmt); -void ft_fmt_validate_flags(t_fmt *fmt); -void ft_fmt_validate_mod(t_fmt *fmt); - -char *ft_signed_conversion(t_fmt *fmt, va_list ap); -char *ft_unsigned_conversion(t_fmt *fmt, va_list ap); -char *ft_str_conversion(t_fmt *fmt, va_list ap); -char *ft_char_conversion(t_fmt *fmt, va_list ap); - -void ft_pad_sharp_o(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_right(char *str, t_fmt *fmt); -#endif diff --git a/42sh/includes/ft_xattr.h b/42sh/includes/ft_xattr.h deleted file mode 100644 index 9afadc18..00000000 --- a/42sh/includes/ft_xattr.h +++ /dev/null @@ -1,21 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ftxattr.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/07 13:24:05 by jhalford #+# #+# */ -/* Updated: 2016/11/07 13:24:05 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef FT_XATTR_H -# define FT_XATTR_H -# define FT_XATTR_SIZE 10000 -# include -# include - -int ft_xattr_print(char *path); -int ft_xattr_count(char *path); -#endif diff --git a/42sh/includes/get_next_line.h b/42sh/includes/get_next_line.h deleted file mode 100644 index b63d0ac2..00000000 --- a/42sh/includes/get_next_line.h +++ /dev/null @@ -1,31 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* get_next_line.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/05 12:21:36 by jhalford #+# #+# */ -/* Updated: 2016/12/15 13:07:58 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef GET_NEXT_LINE_H -# define GET_NEXT_LINE_H -# define BUFF_SIZE 32 - -# include "libft.h" -# include -# include - -typedef struct s_save t_save; - -struct s_save -{ - int fd; - char *str; -}; - -int get_next_line(int const fd, char **line); - -#endif diff --git a/42sh/includes/lexer.h b/42sh/includes/lexer.h index b23aa027..8e111ad3 100644 --- a/42sh/includes/lexer.h +++ b/42sh/includes/lexer.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/01 12:15:50 by jhalford #+# #+# */ -/* Updated: 2017/02/03 15:06:59 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:35:01 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/libft.h b/42sh/includes/libft.h deleted file mode 100644 index ecbe6bb5..00000000 --- a/42sh/includes/libft.h +++ /dev/null @@ -1,162 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */ -/* Updated: 2017/01/19 16:13:05 by gwojda ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_H -# define LIBFT_H - -# define STDIN 0 -# define STDOUT 1 -# define STDERR 2 -# define STDBUG 3 - -# define DG_MSG0 "{inv}{yel}%21s {bol}{blu}%-3d{eoc}" -# define DG_MSG1 ft_path_notdir(__FILE__), __LINE__ -# define DG(f, ...) ft_dprintf(STDBUG, DG_MSG0 f "{eoc}\n", DG_MSG1, ##__VA_ARGS__) - -# include "get_next_line.h" -# include "ft_xattr.h" -# include "mytime.h" -# include "lst.h" -# include "dlst.h" -# include "btree.h" -# include "color.h" - -# include -# include -# include -# include -# include -# include -# include - -# define FT_WS(x) (x == ' ' || x == '\t' || x == '\n') -# define FT_ABS(x) (((x) < 0) ? -(x) : (x)) -# define FT_NEG(x) (((x) < 0) ? 1 : 0) -# define FT_POS(x) (((x) > 0) ? 1 : 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_stos t_stos; - -struct s_stos -{ - char *key; - char *val; -}; - -struct s_stof -{ - char *name; - int (*f)(); -}; - -void ft_debug(void); - -void *ft_memset(void *b, int c, size_t len); -void ft_bzero(void *s, size_t n); -void *ft_memcpy(void *dst, const void *src, size_t n); -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_memchr(const void *s, int c, 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_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); -void ft_putstr(char const *s); -void ft_putendl(char const *s); -void ft_putnbr(int n); -void ft_putchar_fd(char c, int fd); -void ft_putstr_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_putaddr(void *a); - -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_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, ...); - -char *ft_getenv(char **env, char *key); - -void *ft_realloc(void *data, int size); -#endif diff --git a/42sh/includes/mytime.h b/42sh/includes/mytime.h deleted file mode 100644 index 140e1100..00000000 --- a/42sh/includes/mytime.h +++ /dev/null @@ -1,34 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* mytime.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/25 11:43:12 by jhalford #+# #+# */ -/* Updated: 2016/11/25 20:26:20 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef MYTIME_H -# define MYTIME_H -# include "libft.h" - -struct s_mytime -{ - char *year; - char *month; - char *day; - char *hour; - char *min; - char *sec; -}; - -typedef struct s_mytime t_mytime; - -int ft_time_isrecent(time_t event); - -t_mytime *ft_mytime_get(time_t epoch); -void ft_mytime_free(t_mytime **time); - -#endif diff --git a/42sh/libft b/42sh/libft index fa4a21e3..92902c1c 160000 --- a/42sh/libft +++ b/42sh/libft @@ -1 +1 @@ -Subproject commit fa4a21e3d0d0545831d661df1863a399e9154218 +Subproject commit 92902c1c6539152d9daadaf2a018b2d344f1224e diff --git a/42sh/src/builtin/bt_read_get.c b/42sh/src/builtin/bt_read_get.c index a7364b71..62700b5a 100644 --- a/42sh/src/builtin/bt_read_get.c +++ b/42sh/src/builtin/bt_read_get.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/21 18:00:03 by jhalford #+# #+# */ -/* Updated: 2017/01/22 16:24:55 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:58:41 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/exec/exec_command.c b/42sh/src/exec/exec_command.c index b9db339a..54693a6a 100644 --- a/42sh/src/exec/exec_command.c +++ b/42sh/src/exec/exec_command.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/14 17:28:14 by jhalford #+# #+# */ -/* Updated: 2017/02/03 13:45:08 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:47:38 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/job-control/do_job_notification.c b/42sh/src/job-control/do_job_notification.c index b47b83b0..74eff978 100644 --- a/42sh/src/job-control/do_job_notification.c +++ b/42sh/src/job-control/do_job_notification.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/15 13:01:19 by jhalford #+# #+# */ -/* Updated: 2017/01/31 15:06:05 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:47:44 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/job-control/job_update_status.c b/42sh/src/job-control/job_update_status.c index e9f9a24e..1fa30cd5 100644 --- a/42sh/src/job-control/job_update_status.c +++ b/42sh/src/job-control/job_update_status.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/15 12:56:11 by jhalford #+# #+# */ -/* Updated: 2017/01/31 15:07:51 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:50:30 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/job-control/process_mark_status.c b/42sh/src/job-control/process_mark_status.c index e071c53f..fd285c0b 100644 --- a/42sh/src/job-control/process_mark_status.c +++ b/42sh/src/job-control/process_mark_status.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:41:11 by jhalford #+# #+# */ -/* Updated: 2017/01/31 15:10:04 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:50:29 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/ft_lexer.c b/42sh/src/lexer/ft_lexer.c index 78a67328..69c40fee 100644 --- a/42sh/src/lexer/ft_lexer.c +++ b/42sh/src/lexer/ft_lexer.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/02 15:30:59 by jhalford #+# #+# */ -/* Updated: 2017/02/03 15:15:13 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:40:34 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,20 +15,11 @@ int ft_lexer(t_list **alst, char **command) { int ret; - char *str; - ret = 0; if (!*command) return (1); - str = *command; - while (ft_is_delim(*str)) - str++; - str = ft_strdup(str); - ft_strdel(command); - *command = str; - if (!*str) - ret = 1; - else if (ft_tokenize(alst, *command, DEFAULT)) + ret = 0; + if (ft_tokenize(alst, *command, DEFAULT)) ret = 1; else if (ft_post_tokenize(alst, command)) ret = 1; diff --git a/42sh/src/lexer/ft_post_tokenize.c b/42sh/src/lexer/ft_post_tokenize.c index f88d45b5..619289ae 100644 --- a/42sh/src/lexer/ft_post_tokenize.c +++ b/42sh/src/lexer/ft_post_tokenize.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 16:11:11 by jhalford #+# #+# */ -/* Updated: 2017/02/02 15:29:57 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:46:19 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/ft_tokenize.c b/42sh/src/lexer/ft_tokenize.c index 9da0c518..3fe3504c 100644 --- a/42sh/src/lexer/ft_tokenize.c +++ b/42sh/src/lexer/ft_tokenize.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/10 13:37:11 by jhalford #+# #+# */ -/* Updated: 2017/02/03 15:06:52 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:39:53 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/lexer_delim.c b/42sh/src/lexer/lexer_delim.c index e941277f..8c785ce2 100644 --- a/42sh/src/lexer/lexer_delim.c +++ b/42sh/src/lexer/lexer_delim.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/03 11:58:44 by jhalford #+# #+# */ -/* Updated: 2017/02/03 15:15:14 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:40:29 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,11 +16,15 @@ int lexer_delim(t_list **alst, char *str) { t_token *token; - token = *alst ? (*alst)->content : NULL; + token = (*alst)->content; while (ft_is_delim(*str)) str++; if (token->type) return (ft_tokenize(&(*alst)->next, str, DEFAULT)); else + { + if (!*str) + ft_lst_delif(alst, (*alst)->content, &ft_addrcmp, &token_free); return (ft_tokenize(alst, str, DEFAULT)); + } } diff --git a/42sh/src/lexer/reduce_bquotes.c b/42sh/src/lexer/reduce_bquotes.c index 418edde5..4e293684 100644 --- a/42sh/src/lexer/reduce_bquotes.c +++ b/42sh/src/lexer/reduce_bquotes.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 16:46:27 by jhalford #+# #+# */ -/* Updated: 2017/02/02 15:16:24 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:40:36 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,10 +24,8 @@ int reduce_bquotes(t_list **alst, char **str) char *bq_end; tk = TK_BQUOTE; - DG("check 0"); if ((start = ft_lst_find(*alst, &tk, token_cmp_type))) { - DG("check 1"); end = &start->next; while (end && *end) { @@ -37,10 +35,7 @@ int reduce_bquotes(t_list **alst, char **str) end = &(*end)->next; } if (!*end) - { - DG("check 42"); return (-1); - } bq_start = ((t_token*)start->content)->data; bq_end = ((t_token*)(*end)->content)->data; ft_lstdel(end, token_free); diff --git a/42sh/src/line-editing/ft_split_whitespaces.c b/42sh/src/line-editing/ft_split_whitespaces.c deleted file mode 100644 index 05506cfb..00000000 --- a/42sh/src/line-editing/ft_split_whitespaces.c +++ /dev/null @@ -1,79 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_split_whitespaces.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: gwojda +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2016/11/02 17:52:52 by gwojda #+# #+# */ -/* Updated: 2017/01/25 15:49:21 by gwojda ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "minishell.h" - -char *ft_strdupi_w(char const *s) -{ - int i; - char *str; - - i = 0; - while (s[i] && s[i] != ' ' && s[i] != '\t') - i++; - str = (char *)malloc(sizeof(char) * (i + 1)); - if (str) - { - str[i--] = '\0'; - while (i >= 0) - { - str[i] = s[i]; - i--; - } - } - return (str); -} - -static int ft_len_words(char const *s) -{ - int i; - int len; - - i = 0; - len = 0; - while (s[i]) - { - if ((i == 0 && s[i] != ' ' && s[i] != '\t') || ((s[i] != ' ' - && s[i] != '\t') && (s[i - 1] == ' ' || s[i - 1] == '\t'))) - len++; - i++; - } - return (len); -} - -char **ft_split_whitespaces(char const *s) -{ - int i; - char **str; - int j; - - str = NULL; - if (!(s)) - return (str); - str = (char **)malloc(sizeof(char *) * (ft_len_words(s) + 1)); - i = 0; - j = 0; - if (!(str)) - return (str); - while (s[i]) - { - if ((i == 0 && s[i] != ' ' && s[i] != '\t') || ((s[i] != ' ' - && s[i] != '\t') && (s[i - 1] == ' ' || s[i - 1] == '\t'))) - { - str[j] = ft_strdupi_w((s + i)); - j++; - } - i++; - } - str[j] = NULL; - return (str); -} diff --git a/42sh/src/line-editing/prompt.c b/42sh/src/line-editing/prompt.c index 94482a27..f322c9a5 100644 --- a/42sh/src/line-editing/prompt.c +++ b/42sh/src/line-editing/prompt.c @@ -6,7 +6,7 @@ /* By: gwojda +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/13 13:51:33 by gwojda #+# #+# */ -/* Updated: 2017/01/25 16:31:24 by gwojda ### ########.fr */ +/* Updated: 2017/02/03 15:52:53 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -54,6 +54,10 @@ void ft_prompt(void) { int ret; + do_job_notification(); + // yo gwojda enlève pas ca, je fait des notif de + // job control juste avant que tu mette ton prompt. + ft_get_date(); ft_putstr("\033[22;36m"); ret = ft_currend_dir(); diff --git a/42sh/src/line-editing/readline.c b/42sh/src/line-editing/readline.c index f48668b4..cebb2bc5 100644 --- a/42sh/src/line-editing/readline.c +++ b/42sh/src/line-editing/readline.c @@ -6,7 +6,7 @@ /* By: gwojda +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/15 14:19:48 by gwojda #+# #+# */ -/* Updated: 2017/02/02 18:03:23 by gwojda ### ########.fr */ +/* Updated: 2017/02/03 15:57:35 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c index 931f4a63..17f8fbba 100644 --- a/42sh/src/main/main.c +++ b/42sh/src/main/main.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/06 18:40:58 by jhalford #+# #+# */ -/* Updated: 2017/02/02 18:57:56 by jhalford ### ########.fr */ +/* Updated: 2017/02/03 15:17:56 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */