tom/ft_ping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tomoron
2025-08-15 02:17:19 +02:00
parent c230dc6d86
commit 01c4d7cc51
6 changed files with 110 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
srcs/parsing.c
View File

@ -6,80 +6,40 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/26 17:01:53 by tomoron #+# #+# */
/* Updated: 2025/06/01 21:37:16 by tomoron ### ########.fr */
/* Updated: 2025/08/15 02:16:12 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
#include "includes/ft_ping.h"
char *get_value_in_arg(char *arg, int end)
int get_set_int(char *arg, t_settings *set)
{
char *res;
res = strstr(arg, "=");
if(res - arg != end)
return (0);
if (!res)
return (0);
res++;
return(res);
}
char *get_setting(int *i, int argc, char **argv, int end, t_settings *set)
{
char *value;
value = 0;
if(argv[*i][0] == '-' && argv[*i][1] == '-')
value = get_value_in_arg(argv[*i], end);
else if((*i) + 1 < argc)
value = argv[++(*i)];
if(!value)
{
fprintf(stderr, "%s: option '%s' requires an option\n", argv[0], argv[*i]);
set->err = 1;
return(0);
}
return(value);
}
int get_set_int(int *i, int argc, char **argv, int end, t_settings *set)
{
char *value;
char *tmp;
value = get_setting(i, argc, argv, end, set);
if(!value)
return(0);
tmp = value;
tmp = arg;
while(*tmp)
{
if(!isdigit(*tmp))
{
fprintf(stderr, "%s: invalid value (`%s' near `%s')\n", argv[0], value, tmp);
fprintf(stderr, "%s: invalid value (`%s' near `%s')\n", set->name, arg, tmp);
set->err = 1;
return(0);
}
tmp++;
}
return(atoi(value));
return(atoi(arg));
}
double get_set_float(int *i, int argc, char **argv, int end, t_settings *set)
double get_set_float(char *arg, t_settings *set)
{
char *value;
char *tmp;
int point;
value = get_setting(i, argc, argv, end, set);
if(!value)
return(0);
tmp = value;
point = 0;
tmp = arg;
while(*tmp)
{
if((!isdigit(*tmp) && *tmp != '.') || (*tmp == '.' && point))
{
fprintf(stderr, "%s: invalid value (`%s' near `%s')\n", argv[0], value, tmp);
fprintf(stderr, "%s: invalid value (`%s' near `%s')\n", set->name, arg, tmp);
set->err = 1;
return(0);
}
@ -87,33 +47,7 @@ double get_set_float(int *i, int argc, char **argv, int end, t_settings *set)
point = 1;
tmp++;
}
return(atof(value));
}
void parse_opt(int *i, t_settings *set, int argc, char **argv)
{
if(!strcmp(argv[*i], "-?") || !strcmp(argv[*i], "--help"))
show_help(set, *argv);
else if(!strcmp(argv[*i], "-c") || !strncmp(argv[*i], "--count", 7))
set->count = get_set_int(i, argc, argv, 7, set);
else if(!strcmp(argv[*i], "-v") || !strncmp(argv[*i], "--verbose", 7))
set->verbose = 1;
else if(!strcmp(argv[*i], "-w") || !strncmp(argv[*i], "--timeout", 9))
set->timeout = get_set_int(i, argc, argv, 9, set);
else if(!strcmp(argv[*i], "-W") || !strncmp(argv[*i], "--linger", 8))
set->linger = get_set_int(i, argc, argv, 8, set);
else if(!strcmp(argv[*i], "-i") || !strncmp(argv[*i], "--interval", 10))
set->interval = get_set_float(i, argc, argv, 10, set);
else if(!strncmp(argv[*i], "--ttl", 5))
{
set->ttl = get_set_int(i, argc, argv, 5, set);
set->setTtl = 1;
}
else
{
fprintf(stderr, "%s: unrecognized option '%s'\n", argv[0], argv[*i]);
set->err = 1;
}
return(atof(arg));
}
int check_values(t_settings *set, char *name)
@ -139,32 +73,81 @@ int check_values(t_settings *set, char *name)
return(1);
}
t_settings parse_args(int argc, char **argv)
void init_settings(t_settings *set)
{
int i;
t_settings res;
i = 1;
bzero(&res, sizeof(t_settings));
res.count = -1;
res.timeout = -1;
res.interval = 1;
res.linger = 10;
while(i < argc)
{
if(*argv[i] == '-')
parse_opt(&i, &res, argc, argv);
else
{
if(!add_host(&res, argv[i]))
{
res.err = 1;
return(res);
}
}
i++;
}
if(!res.err)
res.err = !check_values(&res, argv[0]);
return(res);
char *tmp;
tmp = set->name;
bzero(set, sizeof(t_settings));
set->name = tmp;
set->timeout = -1;
set->interval = 1;
set->socket = -1;
set->linger = 10;
}
int parse_args(int argc, char **argv, t_settings *set)
{
int arg;
struct option opts[] =
{
{"count", required_argument, 0, 'c'},
{"interval", required_argument, 0, 'i'},
{"timeout", required_argument, 0, 'w'},
{"linger", required_argument, 0, 'W'},
{"ttl", required_argument , 0, 1000},
{"verbose", no_argument, &set->verbose, 1},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
unsetenv("POSIXLY_CORRECT");
init_settings(set);
arg = 0;
while (arg != -1)
{
arg = getopt_long(argc, argv, "c:i:w:W:vh", opts, NULL);
switch (arg) {
case 'c':
set->count = get_set_int(optarg, set);
break;
case 'i':
set->interval = get_set_float(optarg, set);
break;
case 'w':
set->timeout = get_set_int(optarg, set);
break;
case 'W':
set->linger = get_set_int(optarg, set);
break;
case 1000:
set->ttl = get_set_int(optarg, set);
break;
case 'h':
case '?':
show_help(set);
return(1);
default :
break;
}
}
while(optind < argc)
{
if(!add_host(set, argv[optind]))
{
set->err = 1;
return (0);
}
optind++;
}
if(!set->hosts)
{
fprintf(stderr, "%s: missing host operand\n", set->name);
set->err = 1;
return(1);
}
if (!set->err)
set->err = !check_values(set, argv[0]);
return (0);
}