replace parsing to use getopt (safer), change count opt behavior, close socket when needed

This commit is contained in:
2025-08-15 02:17:19 +02:00
parent c230dc6d86
commit 01c4d7cc51
6 changed files with 110 additions and 125 deletions

View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/24 00:03:56 by tomoron #+# #+# */
/* Updated: 2025/08/08 22:30:18 by tomoron ### ########.fr */
/* Updated: 2025/08/15 02:14:40 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,10 +14,10 @@
int g_stop = 0;
void show_help(t_settings *set, char *name)
void show_help(t_settings *set)
{
set->stop = 1;
printf("Usage: %s %s", name, HELP_MESSAGE);
printf("Usage: %s %s", set->name, HELP_MESSAGE);
}
int init_socket(char *name)
@ -58,25 +58,23 @@ int main(int argc, char **argv)
{
t_settings settings;
settings = parse_args(argc, argv);
if(settings.stop)
goto early_stop;
settings.socket = init_socket(argv[0]);
settings.id = get_id();
settings.name = argv[0];
signal(SIGINT, signal_handler);
settings.name = argv[0];
if(parse_args(argc, argv, &settings))
return(1);
settings.id = get_id();
if(!settings.err && !settings.stop)
settings.socket = init_socket(argv[0]);
if(settings.stop || settings.err || settings.socket == -1)
{
early_stop:
if(settings.socket != -1)
close(settings.socket);
free_hosts(settings.hosts);
return((settings.err != 0) * 64);
}
if(!settings.hosts)
{
fprintf(stderr, "%s: missing host operand\n", argv[0]);
return(64);
}
send_pings(&settings);
if(settings.socket != -1)
close(settings.socket);
free_hosts(settings.hosts);
return(0);
}