luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.OPTION]

Browse source 
* BUG: The component is now compatible with the new way of arguments 
  handling, and does not crash anymore.


git-svn-id: svn://localhost/gambas/trunk@4890 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-07-03 17:32:39 +00:00
parent bbe2044823
commit ddff42d95b
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
main/lib/option/main.c
View file

@ -32,13 +32,12 @@
#include "main.h" #include "main.h"
typedef void (*type_hook_old)(int*,char**); static void *_old_hook_main;
static type_hook_old old_hook;
char** cmd_arg; char** cmd_arg;
int arg_count; int arg_count;
GB_INTERFACE GB EXPORT; GB_INTERFACE GB EXPORT;
@ -48,33 +47,30 @@ GB_DESC *GB_CLASSES[] EXPORT =
GetOptionsDesc, GetOptionsDesc,
NULL NULL
}; };
void hook_main(int *argc,char ** argv)
static void hook_main(int *argc, char ***argv)
{ {
int i; int i;
char **tmp; char **tmp;
if(old_hook!=NULL) CALL_HOOK_MAIN(_old_hook_main, argc, argv);
{
old_hook(argc,argv);
}
arg_count=*argc; arg_count = *argc;
GB.NewArray((void*)(&cmd_arg),sizeof(*cmd_arg),0); GB.NewArray(POINTER(&cmd_arg), sizeof(*cmd_arg), 0);
for(i=0;i<*argc;i++) for(i=0; i<*argc; i++)
{ {
tmp=(char **)GB.Add((void*)(&cmd_arg)); tmp = (char **)GB.Add((void*)(&cmd_arg));
*tmp = GB.NewZeroString(argv[i]); *tmp = GB.NewZeroString((*argv)[i]);
} }
*argc=1;
return; *argc = 1;
} }
int EXPORT GB_INIT(void) int EXPORT GB_INIT(void)
{ {
old_hook= (type_hook_old) GB.Hook ( GB_HOOK_MAIN, (void *)hook_main ); _old_hook_main = GB.Hook(GB_HOOK_MAIN, (void *)hook_main);
return 0; return 0;
} }