frzysk/42_minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ADD] parse_command()

Browse source
This commit is contained in:
mcolonna 2024-04-24 14:49:32 +02:00
parent 24d8b38510
commit af6488534b
10 changed files with 225 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/error.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/23 15:51:56 by mcolonna #+# #+# */
/* Updated: 2024/04/24 13:20:31 by mcolonna ### ########.fr */
/* Updated: 2024/04/25 13:41:57 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,3 +20,11 @@ void minishell_error(const char *msg)
print_str(err_remember, 2, msg);
err_get();
}
// TODO adapt for msg == errno
void fatal_error(const char *msg)
{
print_str(err_remember, 2, "Fatal error: ");
print_line(err_remember, 2, msg);
exit(1);
}

8
src/main.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/23 14:33:45 by mcolonna #+# #+# */
/* Updated: 2024/04/24 13:24:10 by mcolonna ### ########.fr */
/* Updated: 2024/04/25 16:54:13 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -62,12 +62,10 @@ int main(const int argc, const char *argv[], const char *envp[])
{
mc = mem_newclass(minishell_error);
command_str = ask_command(mc);
print_str(minishell_error, 1, "command: ");
print_line(minishell_error, 1, command_str);
/*
command = parse_command(command_str);
command = parse_command(mc, command_str);
if (command.error)
continue ;
/*
errorstatus = execute_command(command);
mem_freeall(mc);
*/

132
src/parse_command.c Normal file
View file

@ -0,0 +1,132 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* parse_command.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/24 13:47:40 by mcolonna #+# #+# */
/* Updated: 2024/04/25 16:51:22 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
#include "include.h"
// To call when a parse error occurs (TODO)
static void parse_error(const char *msg)
{
(void)msg;
fatal_error("parse error");
}
// Global variables for all the parsing functions
typedef struct s_parsing_args
{
t_memclass mc;
t_command r;
t_stream stream;
t_list calls;
bool got_first_call; // got at least the first program call?
} t_parsing_args;
// Skip blank characters
static void skip_blank(t_stream *stream)
{
stream_skip(stream, " \r\n\t");
}
// Read the string, stop if the char is in stop_charset
// TODO quotes
static const char *get_string(t_parsing_args *args, const char *stop_charset)
{
const t_memclass mc = mem_subclass(fatal_error, args->mc);
const char *stop_charset_2
= str_join(fatal_error, mc, stop_charset, " \n");
char *str;
char str2[2];
char *str3;
str = str_dup(fatal_error, mc, "");
str2[1] = '\0';
while (stream_read(&args->stream)
&& !char_isin(stream_read(&args->stream), stop_charset_2))
{
str2[0] = stream_pop(&args->stream);
str3 = str;
str = str_join(fatal_error, mc, str, str2);
mem_free(str3);
}
str = str_dup(fatal_error, args->mc, str);
mem_freeall(mc);
return (str);
}
// Get a program call (program names & its arguments) until stop_charset.
static void get_call(t_parsing_args *args, const char *stop_charset)
{
t_call *r;
t_list arguments;
arguments = list_createempty(args->mc);
while (stream_read(&args->stream)
&& !char_isin(stream_read(&args->stream), stop_charset))
{
list_add(fatal_error, &arguments,
(char *)get_string(args, stop_charset));
skip_blank(&args->stream);
}
r = mem_alloc(fatal_error, args->mc, sizeof(t_call));
r->program = (char *)list_get(parse_error, &arguments, 0);
r->argc = list_getsize(&arguments);
r->argv = (const char *const *)list_convert(
fatal_error, args->mc, &arguments);
list_add(fatal_error, &args->calls, (t_call *)r);
args->got_first_call = true;
}
// Read an element (a call to a program, a '< FILE' or a '> FILE')
// (TODO redirections)
static void get_element(t_parsing_args *args)
{
char c;
while (stream_read(&args->stream))
{
c = stream_read(&args->stream);
if (c == '|')
{
if (!args->got_first_call)
parse_error(NULL);
stream_pop(&args->stream);
skip_blank(&args->stream);
get_call(args, "<>|");
}
else if (!args->got_first_call)
get_call(args, "<>|");
else
parse_error(NULL);
skip_blank(&args->stream);
}
}
t_command parse_command(const t_memclass mc, const char *command)
{
t_parsing_args args;
args.mc = mc;
args.r.error = false;
args.r.input_fd = 0;
args.r.output_fd = 1;
args.calls = list_createempty(mc);
args.got_first_call = false;
streamstr_init(&args.stream, command);
skip_blank(&args.stream);
while (stream_read(&args.stream))
{
get_element(&args);
skip_blank(&args.stream);
}
args.r.calls = (t_call *)list_convert_type(
fatal_error, args.mc, &args.calls, sizeof(t_call));
return (args.r);
}