Merge Fix #19

include/ft_vm.h

@@ -6,7 +6,7 @@
 /*   By: rnugroho <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/04/19 21:39:11 by rnugroho          #+#    #+#             */
-/*   Updated: 2018/04/24 23:14:52 by rnugroho         ###   ########.fr       */
+/*   Updated: 2018/04/25 00:49:42 by rnugroho         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -111,6 +111,7 @@ void			vm_and_print(t_process p);
 void			vm_live_print(t_process p);
 void			vm_zjump_print(t_process p);
 
+int				vm_valid_arg(char *arg);
 int				vm_valid_verbosity_lvl(int lvl);
 int				vm_lvl_to_index(int index);
 int				ft_isnumber(char *str);

src/ft_vm/vm_helper_1.c

@@ -6,12 +6,27 @@
 /*   By: rnugroho <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/04/20 14:58:02 by fpetras           #+#    #+#             */
-/*   Updated: 2018/04/24 17:21:17 by rnugroho         ###   ########.fr       */
+/*   Updated: 2018/04/24 22:43:11 by fpetras          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "ft_vm.h"
 
+int			vm_valid_arg(char *arg)
+{
+	if (!ft_strcmp(arg, "-dump") || !ft_strcmp(arg, "-v") || !ft_strcmp(arg, "-n"))
+		return (1);
+	else if ((!ft_strncmp(arg, "-v", 2) || !ft_strncmp(arg, "-n", 2)) &&
+		ft_isnumber(&arg[2]))
+		return (1);
+	else if (ft_isnumber(arg))
+		return (1);
+	else if (!ft_strcmp(&arg[ft_strlen(arg) - 4], ".cor"))
+		return (1);
+	else
+		return (0);
+}
+
 int		vm_valid_verbosity_lvl(int v)
 {
 	return (v == 0 || v == 1 || v == 2 || v == 4 || v == 8 || v == 16);

src/ft_vm/vm_options.c

@@ -6,7 +6,7 @@
 /*   By: rnugroho <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/04/20 15:11:44 by fpetras           #+#    #+#             */
-/*   Updated: 2018/04/25 00:46:54 by rnugroho         ###   ########.fr       */
+/*   Updated: 2018/04/25 00:50:04 by rnugroho         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -129,6 +129,8 @@ int			vm_options(char **av, t_vm *vm)
 			return (-1);
 		else if (vm_option_v(i, av, vm) == -1)
 			return (-1);
+		if (!vm_valid_arg(av[i]))
+			return (-1);
 	}
 	return (0);
 }