Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
def231c
[master] modify export_env -> parse_env, list/several .c files regard…
humonnom Feb 22, 2021
61e7f49
[master] modified several files regarding list -> elist file, and co…
humonnom Feb 23, 2021
78e66e2
[master] deleted .o files
humonnom Feb 23, 2021
f2fab17
[master] modify inc_shlvl.c using t_env structure.
Feb 26, 2021
9cdc9f1
[master] modify parse_line with only t_list structure.
Feb 26, 2021
83c7327
[master] modify parse_line and gen_elist return value to t_list.
Feb 26, 2021
ca8c500
[master] modify parse_set.c -> combine with parse_line?.
Feb 26, 2021
dad2935
[master] modify minishell.h, trim_cmd, select_func.
Feb 26, 2021
08e32d0
[modified select_func.c (find builtin function and get path.)]
humonnom Mar 1, 2021
1574b5f
[modified select_func.c (find builtin function and get path.)]
humonnom Mar 1, 2021
fb4ccae
[master] add get_eval function for select_function.
yamkim Mar 3, 2021
74b396a
[master] add path searching alogirhtm for using built_in function.
yamkim Mar 3, 2021
71c32f4
[master] add t_set type instead of alist. add parse_set_arr, print_se…
yamkim Mar 3, 2021
6f497cd
[master] get pk_split_free out and modify as free_darr, add cvt_list_…
yamkim Mar 3, 2021
6239985
[master] delete codes with alist. convert alist to t_set type.
Mar 4, 2021
af751c5
[master] add select_shell_bti.c and categorize_cmd.c and add set->set…
Mar 4, 2021
7c5679a
[master] remove free error, reconnect set->set[0] with set->cmd after…
yamkim Mar 4, 2021
9812b93
[master] add get_env, mod_eval source and modify funcs in inc_shlvl, …
yamkim Mar 5, 2021
e56117e
[master] exception handling about opendir in run_bti.c and modify sel…
Mar 5, 2021
2da1d47
[master] modify trim_cmd to del_quote for general use. add export_env.c
Mar 5, 2021
f0642bc
[master] merge sh_bti_cd and sh_bti_pwd and do modify sh_bti_export, …
Mar 5, 2021
8cac020
[master] add error case many times = using export cmd.
Mar 5, 2021
1ae5031
[master] add error case for export function.
yamkim Mar 5, 2021
01b9812
[master] modifiy export for adding several args, add sh_bti_unset.c. …
yamkim Mar 7, 2021
2d82177
[master] modify export for double quote case and check free key and v…
Mar 8, 2021
f6bd4ab
[master] merge cd, echo, pwd and add get_max_strlen.c get_dollar_eval.c
humonnom Mar 11, 2021
d43f4c6
[master] modified sh_bti_echo.c, get_dollar_eval.c
humonnom Mar 11, 2021
2b52cb0
[master] modify get_dallar_eval for sh_bti_echo and export.
yamkim Mar 11, 2021
97ac5f3
[master] modify sh_bti_echo.c using get_dollar_eval.c and add change_…
yamkim Mar 12, 2021
7667f5c
[modified sh_bti_cd.c, sh_bti_echo.c(handle n-flag) and added is_squo…
humonnom Mar 12, 2021
f0f534d
[modified sh_bti_cd.c, sh_bti_echo.c(handle n-flag) and added is_squo…
humonnom Mar 12, 2021
9319759
[master] add handle_arg.c from sh_bti_echo for using in other sh_bti …
yamkim Mar 13, 2021
49e646e
[master] modified sh_bti_cd.c merge sh_bti_echo.c and handle_arg.
Mar 13, 2021
8c41bd5
[master] modify sh_bti_export.c for using handle_arg. TODO: add print…
yamkim Mar 14, 2021
851029c
[master] add fork functions to use builtin function on child ps. TODO…
yamkim Mar 14, 2021
4f9e052
[master] add doller_ret in info(incs/minishell.h).
Mar 15, 2021
349d8fe
[master] add pipe_test.c to practice using pipe.
yamkim Mar 17, 2021
4e0e296
[master] modify several files regarding memory leaks :sh_bti_echo.c d…
Mar 17, 2021
62eec17
[modify several files regarding memory leaks (inc_shlvl.c free_elist.…
Mar 17, 2021
e204751
[master] backup before adding pipe function.
yamkim Mar 18, 2021
66bcfe9
[master] add srcs for slist. modify srcs names, change many thing..
yamkim Mar 18, 2021
2f8c61a
[master] add pipe algorithm before modifying line count.
yamkim Mar 18, 2021
5dcd6b6
[master] modify parameters for sh_bti. modify line numbers for run_cmd.c
yamkim Mar 19, 2021
e3bcb38
[master] modify ..
yamkim Mar 19, 2021
e08caa3
[master] modified run_cmd.c
Mar 19, 2021
b2c287e
[master] add redo_sh_bti.c and use it after run_cmd_part in run_cmd.c
yamkim Mar 19, 2021
622d236
[master] added handle_sig_init.c, handle_sig_proc.c, display_prompt.c…
Mar 19, 2021
eb85463
[master] modified argument of several functions(select_sh_bti, run_cm…
Mar 19, 2021
6e85e06
[master] modified argument of several functions(select_sh_bti, run_cm…
Mar 19, 2021
6a614e8
Merge branch 'master' of https://github.com/humonnom/shellWeDance
Mar 19, 2021
e3c17c3
[master] modified get_next_line.c regarding signal issue(string + ^D …
Mar 19, 2021
92598df
[master] modified handle_fflush.c
Mar 19, 2021
409e398
[master] modified prompt.
Mar 19, 2021
d1db607
[master] modified handle_eof.c
humonnom Mar 19, 2021
221165e
[master] modified set_list rotating section regarding memory leaks(fi…
humonnom Mar 19, 2021
ce94f06
[master] change backup dir name (conflict with branch name).
humonnom Mar 19, 2021
2650198
[master] add redirection pseudo code.
yamkim Mar 20, 2021
78de413
Merge branch 'master' of github.com:humonnom/shellWeDance
yamkim Mar 20, 2021
b4be154
[backup] added handle_redirect.c
humonnom Mar 20, 2021
607535a
[delete swp file.]
humonnom Mar 21, 2021
e7a45fe
[backup] modified handle_redirect.c
Mar 22, 2021
c1de136
[backup] modified redir files.
Mar 22, 2021
5a4f040
[backup] modified set_redir_info.c(refactoring) and added set bracket…
Mar 23, 2021
23fefac
[backup] add pipe_redir_ex for handling redirection.
yamkim Mar 23, 2021
39bd767
[backup] modify file names. refactorize gen_set.c
Mar 24, 2021
cb15342
[backup] modify functions related with redirect. addgit status open f…
Mar 24, 2021
5708cb8
[backup] modify set_fd.c and add is_valid_fd.c, open_valid_fd.c
Mar 25, 2021
8ec1d89
[backup] modify set_fd using function pointer. TODO: add handle_rest_…
yamkim Mar 25, 2021
6a79c86
[backup] upload termcap test functions for handling terminal and modi…
yamkim Mar 29, 2021
08310a4
[backup] add ft_cursor.c and ft_putchar_tc.c for controlling termcap_…
yamkim Mar 30, 2021
d7b3ba1
[backup] add t_tc type and gen_tc, refactorize ft_cursor functions.
yamkim Mar 31, 2021
2aadb98
[backup]
yamkim Apr 1, 2021
1f4b26c
[backup] add clr_line_end and handle_up_arrow algorithm in termcap_te…
Apr 1, 2021
edf53a3
[backup] modify termcap_test.c to get_next_line_tc.c
Apr 1, 2021
d28c3a5
[backup]
Apr 1, 2021
2c940b6
[backup] add handle_key_arrow algorithm in get_next_line_tc.c, add is…
yamkim Apr 1, 2021
d55f0e8
[backup] add append_history_list.c, modify handle_up_down_arrow algor…
yamkim Apr 2, 2021
dc0a575
[backup] add append_history_list.c, modify handle_up_down_arrow algor…
yamkim Apr 2, 2021
9a2bc8a
[master] before modifying handle_signal.c
yamkim Apr 11, 2021
2271fca
[master] modify something
yamkim Apr 12, 2021
9af7006
[master]
Apr 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"sstream": "c"
}
}
15 changes: 15 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,12 @@ FUNC = main \
calc \
is_key_arrow \
append_history_list \
<<<<<<< HEAD
handle_sig_in_gnl
=======
handle_sig_in_proc \
handle_sig
>>>>>>> df52ce4be677ec57d998a3f41ac1db1c54c05c33

OBJDIR = ./objs
INCDIR = ./incs
Expand All @@ -82,6 +86,16 @@ OBJS = $(addprefix $(OBJDIR)/, $(SRC:.c=.o))
all: $(NAME)

$(NAME): $(OBJS)
<<<<<<< HEAD
$(MAKE) -C $(LIBDIR) all
$(CC) $(CFLAGS) -lcurses -o $(NAME) $(LIBFT) $(OBJS) #2> /dev/null || true
echo "Start Program"

#$(OBJS): $(SRCS)
$(OBJDIR)/%.o: $(SRCDIR)/%.c
mkdir $(OBJDIR) 2> /dev/null || true
$(CC) $(CFLAGS) -I$(INCDIR) -lcurses -o $@ -c $< #2> /dev/null || true
=======
@$(MAKE) -C $(LIBDIR) all
@$(CC) $(CFLAGS) -lcurses -o $(NAME) $(LIBFT) $(OBJS) 2> /dev/null || true
@echo "Start Program"
Expand All @@ -90,6 +104,7 @@ $(NAME): $(OBJS)
$(OBJDIR)/%.o: $(SRCDIR)/%.c
@mkdir $(OBJDIR) 2> /dev/null || true
@$(CC) $(CFLAGS) -I$(INCDIR) -lcurses -o $@ -c $< 2> /dev/null || true
>>>>>>> df52ce4be677ec57d998a3f41ac1db1c54c05c33

clean:
@rm -rf $(OBJDIR)
Expand Down
106 changes: 106 additions & 0 deletions backup/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
NAME = minishell

CC = gcc
#CFLAGS = -Wall -Wextra -Werror
CFLAGS =

FUNC = main \
init_global \
init_minishell \
pk_split \
handle_quote \
handle_bit \
inc_shlvl \
get_next_line \
gen_set_str_list \
gen_set_list \
del_quote \
get_eval \
gen_set \
print_set \
free_set \
set_list_to_darr \
print_darr \
free_darr \
categorize_cmd \
select_sh_bti \
redo_sh_bti \
run_bti \
get_bti_path \
mod_eval \
gen_env \
free_env \
sh_bti_export \
sh_bti_unset \
sh_bti_env \
sh_bti_echo \
sh_bti_cd \
sh_bti_pwd \
sh_bti_exit \
get_max_strlen \
get_dollar_eval \
cvt_char_to_str \
is_squote \
is_dquote \
handle_arg \
exact_strncmp \
gen_elist \
get_elist \
add_elist \
free_elist \
print_elist \
print_slist \
set_darr_to_list \
print_list \
run_cmd \
show_error \
exit_fatal \
exit_shell \
handle_sig_init \
handle_sig_proc \
is_bracket \
set_bracket_type \
set_fd \
is_valid_fd \
open_valid_fd \
get_next_line_tc \
ft_cursor \
ft_cursor2 \
ft_putchar_tc \
calc \
is_key_arrow \
append_history_list \

OBJDIR = ./objs
INCDIR = ./incs
SRCDIR = ./srcs
LIBDIR = ./libft
LIBFT = -L./libft -lft

SRC = $(addsuffix .c, $(FUNC))
SRCS = $(addprefix $(SRCDIR)/, $(SRC))
OBJS = $(addprefix $(OBJDIR)/, $(SRC:.c=.o))

all: $(NAME)

$(NAME): $(OBJS)
@$(MAKE) -C $(LIBDIR) all
@$(CC) $(CFLAGS) -lcurses -o $(NAME) $(LIBFT) $(OBJS) #2> /dev/null || true
@echo "Start Program"

#$(OBJS): $(SRCS)
$(OBJDIR)/%.o: $(SRCDIR)/%.c
@mkdir $(OBJDIR) 2> /dev/null || true
@$(CC) $(CFLAGS) -I$(INCDIR) -lcurses -o $@ -c $< #2> /dev/null || true

clean:
@rm -rf $(OBJDIR)
@$(MAKE) -C $(LIBDIR) clean

fclean: clean
@rm -rf $(NAME)
@$(MAKE) -C $(LIBDIR) fclean

re: fclean all

.PHONY: all clean fclean re
2 changes: 2 additions & 0 deletions backup/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# mongshell
yekim juepark
30 changes: 30 additions & 0 deletions backup/backup_files/categorize_cmd_bak.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#include "../incs/minishell.h"

int categorize_cmd(t_info *info)
{
int ret;
int run_check;
int idx;

ret = 1;
run_check = 0;
if (del_quote(&(info->set->set[0])))
{
printf("ERROR: trim_cmd malloc error\n");
return (1);
}
info->set->cmd = info->set->set[0];
if (!(ret = select_sh_bti(info)))
printf("SHELL BUILTIN CASE\n");
else if (ret && !(ret = run_bti(info)))
printf("BUILTIN CASE\n");

//if(bti_path) -> fork
//else bti_path is NULL -> show error message.
//after using bti function with execve, free path.
//arg_beg = arg_list->next;
//make list to arr function.(arg_beg, env_list)
//after using arg_beg array, env array, free.(pk_split_free)
//strncmp(find one)
return (ret);
}
21 changes: 21 additions & 0 deletions backup/backup_files/check.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#include "../incs/minishell.h"

static int check_dquote_open(char *line)
{
// add single quote case
// ", ' check pair
return (0);
}

int check_dquote(char *line, int flag)
{
int ret;

ret = 0;
if (flag == DQUOTE_OPEN)
ret = check_dquote_open(line);
if (ret == 0 && ...)
ret =

return (ret);
}
54 changes: 54 additions & 0 deletions backup/backup_files/del_quote_bak.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#include "../incs/minishell.h"

static int is_quote(char c)
{
if (c == '\"' || c == '\'')
return (1);
return (0);
}

static int get_cmd_size(char *str)
{
int ret;

ret = 0;
while (*str)
{
if (!is_quote(*str))
++ret;
++str;
}
return (ret);
}

static char *copy_without_quote(char *str)
{
char *ret;
int ret_size;
int str_idx;
int ret_idx;

ret_size = get_cmd_size(str);
if (!(ret = (char *)malloc(sizeof(char) * (ret_size + 1))))
return (NULL);
ret[ret_size] = '\0';
str_idx = -1;
ret_idx = -1;
while (str[++str_idx])
{
if (!is_quote(str[str_idx]))
ret[++ret_idx] = str[str_idx];
}
return (ret);
}

int del_quote(char **str)
{
char *ret;

if (!(ret = copy_without_quote(*str)))
return (1);
free(*str);
*str = ret;
return (0);
}
13 changes: 13 additions & 0 deletions backup/backup_files/free_elist_bak.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include "../../incs/minishell.h"

void free_elist(t_list *list_head)
{
t_list *tmp;
t_env *tmp_env;

tmp = list_head;
tmp_env =(t_env *)(list_head->data);
free_env(tmp_env);
list_head->data = NULL;
ft_lstdelone(tmp, &free);
}
20 changes: 20 additions & 0 deletions backup/backup_files/free_env_bak.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include "../incs/minishell.h"

void free_env(t_env *env)
{
if (env->key)
{
free(env->key);
env->key = NULL;
}
if (env->val)
{
free(env->val);
env->val = NULL;
}
if (env)
{
free(env);
env = NULL;
}
}
16 changes: 16 additions & 0 deletions backup/backup_files/free_list.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#include "../../incs/minishell.h"

void free_list(t_list **list_head)
{
t_list *cur;
t_list *tmp;

cur = *list_head;
while (cur)
{
tmp = cur;
cur = cur->next;
ft_lstdelone(tmp, &free);
}
*list_head = NULL;
}
7 changes: 7 additions & 0 deletions backup/backup_files/free_set_bak.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include "../incs/minishell.h"

void free_set(t_set *set)
{
free_darr(set->set, INF);
free(set);
}
19 changes: 19 additions & 0 deletions backup/backup_files/garage/free_alist.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include "../../incs/minishell.h"

void free_alist(t_list **list_head)
{
t_list *cur;
t_list *tmp;

cur = *list_head;
while (cur)
{
tmp = cur;
tmp_env =(t_env *)(tmp->data);
cur = cur->next;
free(tmp_env->key);
free(tmp_env->val);
ft_lstdelone(tmp, &free);
}
*list_head = NULL;
}
Loading