Skip to content

Commit

Permalink
working on Norminette
Browse files Browse the repository at this point in the history
  • Loading branch information
¨Roman committed Jun 3, 2024
1 parent 144be92 commit eef06c3
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 126 deletions.
Binary file added minishell
View file
Binary file not shown.
Binary file added src/.main.c.swp
View file
Binary file not shown.
249 changes: 123 additions & 126 deletions src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: dmdemirk <dmdemirk@student.42london.c +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/30 13:05:18 by dmdemirk #+# #+# */
/* Updated: 2024/05/31 21:09:12 by rmikhayl ### ########.fr */
/* Updated: 2024/06/03 17:10:14 by rmikhayl ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -23,126 +23,124 @@ void handle_args(t_token **tokens, char **argv)
i++;
}
}
void handle_quotes(char **tokens, int *pos, char **input)
{
char quote = *(*input)++;
char *start = *input;

while (**input && **input != quote)
(*input)++;

if (**input == '\0')
{
printf("@maxishell: syntax error: unmatched %c\n", quote);
free(tokens);
tokens = NULL;
return;
}

**input = '\0';
tokens[*pos] = strndup(start, *input - start);
(*input)++;

if (strlen(tokens[*pos]) > 0)
(*pos)++;
void handle_quotes(char **tokens, int *pos, char **input)
{
char quote;
char *start;

start = *input;
quote = *(*input)++;
while (**input && **input != quote)
(*input)++;
if (**input == '\0')
{
printf("@maxishell: syntax error: unmatched %c\n", quote);
free(tokens);
tokens = NULL;
return ;
}
**input = '\0';
tokens[*pos] = strndup(start, *input - start);
(*input)++;
if (strlen(tokens[*pos]) > 0)
(*pos)++;
}

void handle_special_chars(char **tokens, int *pos, char **input)
void handle_special_chars(char **tokens, int *pos, char **input)
{
if ((**input == '<' && *(*input + 1) == '<') || (**input == '>' && *(*input + 1) == '>'))
{
tokens[*pos] = strndup(*input, 2);
(*input) += 2;
}
else
{
tokens[*pos] = strndup(*input, 1);
(*input)++;
}
(*pos)++;
if ((**input == '<' && *(*input + 1) == '<') || (**input == '>' && \
*(*input + 1) == '>'))
{
tokens[*pos] = strndup(*input, 2);
(*input) += 2;
}
else
{
tokens[*pos] = strndup(*input, 1);
(*input)++;
}
(*pos)++;
}

void handle_regular_chars(char **tokens, int *pos, char **input, char *delim)
void handle_regular_chars(char **tokens, int *pos, char **input, char *delim)
{
char *start = *input;

while (**input && !strchr(delim, **input) && **input != '|' && **input != '<' && **input != '>' && **input != '\"' && **input != '\'')
(*input)++;

tokens[*pos] = strndup(start, *input - start);
(*pos)++;
char *start;

start = *input;
while (**input && !strchr(delim, **input) && **input != '|' && \
**input != '<' && **input != '>' && \
**input != '\"' && **input != '\'')
(*input)++;
tokens[*pos] = strndup(start, *input - start);
(*pos)++;
}

char **parse_input(char *input)
char **parse_input(char *input)
{
int pos = 0;
int bufsize = 64;
char *delim = " ";
char **tokens = malloc(bufsize * sizeof(char *));
if (!tokens)
{
printf("@maxishell: allocation error\n");
exit(EXIT_FAILURE);
}

while (*input)
{
while (*input && strchr(delim, *input))
input++;

if (*input == '\0')
break;

if (*input == '\'' || *input == '\"')
handle_quotes(tokens, &pos, &input);
else if (*input == '|' || *input == '<' || *input == '>')
handle_special_chars(tokens, &pos, &input);
else
handle_regular_chars(tokens, &pos, &input, delim);

if (tokens == NULL)
return NULL; // Return if there's a syntax error

if (pos >= bufsize)
{
bufsize += 64;
tokens = realloc(tokens, bufsize * sizeof(char *));
if (!tokens)
{
printf("@maxishell: allocation error\n");
exit(EXIT_FAILURE);
}
}
}

tokens[pos] = NULL;
return tokens;
int pos = 0;
int bufsize = 64;
char *delim = " ";
char **tokens = malloc(bufsize * sizeof(char *));
if (!tokens)
{
printf("@maxishell: allocation error\n");
exit(EXIT_FAILURE);
}
while (*input)
{
while (*input && strchr(delim, *input))
input++;
if (*input == '\0')
break ;
if (*input == '\'' || *input == '\"')
handle_quotes(tokens, &pos, &input);
else if (*input == '|' || *input == '<' || *input == '>')
handle_special_chars(tokens, &pos, &input);
else
handle_regular_chars(tokens, &pos, &input, delim);
if (tokens == NULL)
return (NULL);
if (pos >= bufsize)
{
bufsize += 64;
tokens = realloc(tokens, bufsize * sizeof(char *));
if (!tokens)
{
printf("@maxishell: allocation error\n");
exit(EXIT_FAILURE);
}
}
}
tokens[pos] = NULL;
return (tokens);
}
char *generate_prompt()
{
char *user;
char *pwd;
char *prompt;
char *s1;
char *s2;
char *s3;
size_t prompt_len;

user = getenv("LOGNAME");
pwd = getenv("PWD");
s1 = "🌴\e[1m ";
s2 = "@maxishell:~";
s3 = "> \e[m";
prompt_len = strlen(s1) + strlen(user) + strlen(s2) + strlen(pwd) + strlen(s3) + 1;
prompt = (char *)malloc(prompt_len);
if (!prompt)
exit(EXIT_FAILURE);
ft_strcpy(prompt, s1);
ft_strcat(prompt, user);
ft_strcat(prompt, s2);
ft_strcat(prompt, pwd);
ft_strcat(prompt, s3);
return (prompt);
char *generate_prompt()
{
char *user;
char *pwd;
char *prompt;
char *s1;
char *s2;
char *s3;
size_t prompt_len;

user = getenv("LOGNAME");
pwd = getenv("PWD");
s1 = "🌴\e[1m ";
s2 = "@maxishell:~";
s3 = "> \e[m";
prompt_len = strlen(s1) + strlen(user) + strlen(s2) + strlen(pwd) + strlen(s3) + 1;
prompt = (char *)malloc(prompt_len);
if (!prompt)
exit(EXIT_FAILURE);
ft_strcpy(prompt, s1);
ft_strcat(prompt, user);
ft_strcat(prompt, s2);
ft_strcat(prompt, pwd);
ft_strcat(prompt, s3);
return (prompt);
}

int main(void)
Expand All @@ -152,32 +150,31 @@ int main(void)
char **arr;
char **parsed_text;
t_token *tokens;
const char *history_file;
const char *history_file;

history_file = "./utils/.maxishell_history";
history_file = "./utils/.maxishell_history";
read_history(history_file);
repeat = 1;
while (repeat)
{

tokens = NULL;
line = readline(generate_prompt());
tokens = NULL;
line = readline(generate_prompt());
if (!line || ft_strcmp(line, "exit") == 0)
break ;
if (*line)
add_history(line);
write_history(history_file);
if (*line)
add_history(line);
write_history(history_file);
parsed_text = parse_input(line);
if (parsed_text != NULL)
{
printf("\033[31m@maxishell: command not found: %s\033[0m\n", parsed_text[0]);
handle_args(&tokens, parsed_text);
arr = list_to_array(tokens);
print_stack(&tokens);
free_stack(&tokens);
free(line);
free(arr);
}
{
printf("\033[31m@maxishell: command not found: %s\033[0m\n", parsed_text[0]);
handle_args(&tokens, parsed_text);
arr = list_to_array(tokens);
print_stack(&tokens);
free_stack(&tokens);
free(line);
free(arr);
}
}
return (0);
}
10 changes: 10 additions & 0 deletions utils/.maxishell_history
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2596,3 +2596,13 @@ make re
./minishell
make re
./minishell
"test
"test
test"
"test"
ritugh eigh rtyigtr vytg
"tes
test"
xit
"te
te"

0 comments on commit eef06c3

Please sign in to comment.