--- rpl/src/librpl.c 2010/02/10 10:14:25 1.3 +++ rpl/src/librpl.c 2017/08/03 17:17:50 1.64 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.0.11 - Copyright (C) 1989-2010 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.28 + Copyright (C) 1989-2017 Dr. BERTRAND Joël This file is part of RPL/2. @@ -20,31 +20,51 @@ */ -#include "rpl.conv.h" +#include "rpl-conv.h" unsigned char ** -rpl(unsigned char *script) +rpl(unsigned char *script, unsigned char *parametres, unsigned char *rpl_home) { - char *argv[3]; + char *argv[5]; int argc; int succes; unsigned char **resultats; - argc = 3; + if (parametres == NULL) + { + argc = 3; + + argv[0] = "rpl"; + argv[1] = "-psS"; + + argv[2] = script; + } + else + { + argc = 5; - argv[0] = "rpl"; - argv[1] = "-csS"; + argv[0] = "rpl"; + argv[1] = "-psS"; - argv[2] = script; + argv[2] = script; - if ((resultats = malloc(sizeof(unsigned char **))) == NULL) + argv[3] = "-A"; + argv[4] = parametres; + } + + if ((resultats = sys_malloc(sizeof(unsigned char **))) == NULL) { return(NULL); } - succes = rplinit(argc, argv, &resultats); + if (rpl_home == NULL) + { + rpl_home = getenv("RPL_HOME"); + } + + succes = rplinit(argc, argv, NULL, &resultats, rpl_home); if (succes != EXIT_SUCCESS) {