forked from github/server
Fix xml catalog references for E2 and E3.
Fix a bug in the new get_arg function.
This commit is contained in:
parent
ca79c28eaf
commit
bef560d92a
|
@ -2,7 +2,7 @@ local srcpath = config.source_dir
|
|||
local respath = srcpath .. '/res'
|
||||
local paths = {
|
||||
'scripts/?.lua',
|
||||
'eressea/scripts/?.lua',
|
||||
'core/scripts/?.lua',
|
||||
'lunit/?.lua'
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ local srcpath = config.source_dir
|
|||
local respath = srcpath .. '/res'
|
||||
local paths = {
|
||||
'scripts/?.lua',
|
||||
'eressea/scripts/?.lua',
|
||||
'core/scripts/?.lua',
|
||||
'lunit/?.lua'
|
||||
}
|
||||
|
||||
|
|
|
@ -6,5 +6,5 @@
|
|||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<rewriteURI
|
||||
uriStartString="eressea:///core/"
|
||||
rewritePrefix="../eressea/res/" />
|
||||
rewritePrefix="../core/res/" />
|
||||
</catalog>
|
||||
|
|
|
@ -6,5 +6,5 @@
|
|||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<rewriteURI
|
||||
uriStartString="eressea:///core/"
|
||||
rewritePrefix="../eressea/res/" />
|
||||
rewritePrefix="../core/res/" />
|
||||
</catalog>
|
||||
|
|
|
@ -84,7 +84,7 @@ static int get_arg(int argc, char **argv, size_t len, int index, const char **re
|
|||
return index;
|
||||
}
|
||||
if (index+1 < argc) {
|
||||
*result = argv[index];
|
||||
*result = argv[index+1];
|
||||
return index+1;
|
||||
}
|
||||
*result = def;
|
||||
|
|
Loading…
Reference in New Issue