Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minishell ascii art 추가, ascii art 출력함수명 변경, Makefile readline path 수정 #11

Merged
merged 4 commits into from
Jan 4, 2022
Merged

minishell ascii art 추가, ascii art 출력함수명 변경, Makefile readline path 수정 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
427de21
ascii art 진행중
guswns8431 Jan 3, 2022
138efde
ascii art & readline path
guswns8431 Jan 3, 2022
97c67fa
remove object file
guswns8431 Jan 3, 2022
6c01d4f
main.c lion함수명 변경 -> art
guswns8431 Jan 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions circle-03/minishell/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# By: jseo <jseo@student.42seoul.kr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2021/07/13 16:57:22 by jseo #+# #+# #
# Updated: 2022/01/03 19:58:38 by jseo ### ########.fr #
# Updated: 2022/01/03 23:04:22 by hyson ### ########.fr #
# #
# **************************************************************************** #

Expand Down Expand Up @@ -48,15 +48,15 @@ LIB_NAME = readline
ifeq ($(MODE), EVAL)
LIB_HEADER = /Users/jseo/.brew/Cellar/readline/8.1.1/include/
else ifeq ($(MODE), HYSON)
LIB_HEADER = /
LIB_HEADER = /usr/local/Cellar/readline/8.1.1/include/
else ifeq ($(MODE), JSEO)
LIB_HEADER = /usr/local/opt/readline/include/
endif

ifeq ($(MODE), EVAL)
LIB_FOLDER = /Users/jseo/.brew/Cellar/readline/8.1.1/lib/
else ifeq ($(MODE), HYSON)
LIB_FOLDER = /
LIB_FOLDER = /usr/local/Cellar/readline/8.1.1/lib/
else ifeq ($(MODE), JSEO)
LIB_FOLDER = /usr/local/opt/readline/lib/
endif
Expand Down
34 changes: 34 additions & 0 deletions circle-03/minishell/jseohyson.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

;. __ ___ ___
!*=$* __ __ /\ \ /\_ \ /\_ \
!:~~*; ___ ___ /\_\ ___ /\_\ ____\ \ \___ __\//\ \ \//\ \
,....; /' __` __`\/\ \ /' _ `\/\ \ /',__\\ \ _ `\ /'__`\\ \ \ \ \ \
-.-,.,. /\ \/\ \/\ \ \ \/\ \/\ \ \ \/\__, `\\ \ \ \ \/\ __/ \_\ \_ \_\ \_
..~,,! \ \_\ \_\ \_\ \_\ \_\ \_\ \_\/\____/ \ \_\ \_\ \____\/\____\/\____\
..... \/_/\/_/\/_/\/_/\/_/\/_/\/_/\/___/ \/_/\/_/\/____/\/____/\/____/
...,-.
..-,
...,.
.,~,.
:,.,,~
:-!*,,,!:~ ,!. /\ \/\ \ /\ \ /\ \/\ _`\ /\ __`\/\ \/\ \
,:;:::;!=*:;~;- *===! \ \ \_\ \\ `\`\\/'/\ \,\L\_\ \ \/\ \ \ `\\ \
-;:~:---!;,:*!-;~ *:~-:!: \ \ _ \`\ `\ /' \/_\__ \\ \ \ \ \ \ , ` \
:::~-:~;!;;*~~;;;- ~.....~ \ \ \ \ \ `\ \ \ /\ \L\ \ \ \_\ \ \ \`\ \
,:!!;, -!;~-:=!:;: .--.-~. \ \_\ \_\ \ \_\ \ `\____\ \_____\ \_\ \_\
, .;:;;!:--~~;;;;:*:, . ..... \/_/\/_/ \/_/ \/_____/\/_____/\/_/\/_/
:;~~*:;!!;!:!;!=!:*!~ ...,..,
~;;!*!;;!!!*;!;!~-**~ .,.,,
~;!~!**!;:-~!!!*;$*::: ,....
.::;~*!!;~::~;;;!!=*;*;; ,-,-,
-:!;*=;;~~~;*:-:;;!=#**!; :.,--,;
-;!!*=;;;::;::~;;: !=!,...*~-,,,-;:~, _____ ____ ____ _____
--!*=!!!~;!~*!;*;~ ;**-,,,;;*--,:;!;;: /\___ \/\ _`\ /\ _`\ /\ __`\
:~;!!*:~-!:!!***!; ;!,.;!;;~--;!!;!;;~ \/__/\ \ \,\L\_\ \ \L\_\ \ \/\ \
.~:!!!::~;!*!*:::~: *!:;;!!!-*!!;:=!=:*. _\ \ \/_\__ \\ \ _\L\ \ \ \ \
:~;:;!~~!~~*!;~;:: ~*****=$**~$*!!!==!: /\ \_\ \/\ \L\ \ \ \L\ \ \ \_\ \
~:;:;;~!!!!!!****: ~;*=;***;!:!*!***==;~~ \ \____/\ `\____\ \____/\ \_____\
,!;!=;:~!;!!!~~:;; .: :!!*;:-~***;*!!=;:~~ \/___/ \/_____/\/___/ \/_____/
:;;!:;-;~!!!;!**= !. !~...!!!***!!!;$!::!;
;:!!;;:!~!:;~:!;~!!:!:*;,.:*!*:!~!!==!*::

8 changes: 4 additions & 4 deletions circle-03/minishell/srcs/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: jseo <jseo@student.42seoul.kr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/12/22 17:41:44 by jseo #+# #+# */
/* Updated: 2022/01/03 11:38:25 by jseo ### ########.fr */
/* Updated: 2022/01/03 23:10:17 by hyson ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -20,12 +20,12 @@
** line - Content of the File Separated by Newline
*/

static inline void lion(void)
static inline void art(void)
{
int fd;
char *line;

fd = open("lion.txt", O_RDONLY);
fd = open("jseohyson.txt", O_RDONLY);
while (jgnl(fd, &line) >= SUCCESS)
{
jputendl(line, STDERR_FILENO);
Expand Down Expand Up @@ -57,7 +57,7 @@ int main(int argc, char **argv, char **envp)
input = NULL;
chunks = NULL;
syntax = NULL;
lion();
art();
envmap = rb_init(rb_compare);
set_signal(customized, SIG_IGN);
echoctl_off();
Expand Down