git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules/LVM - Fixed uninitalised value
[tpg/acess2.git]
/
AcessNative
/
ld-acess_src
/
main.c
diff --git
a/AcessNative/ld-acess_src/main.c
b/AcessNative/ld-acess_src/main.c
index
cbe0ac1
..
80c5b7a
100644
(file)
--- a/
AcessNative/ld-acess_src/main.c
+++ b/
AcessNative/ld-acess_src/main.c
@@
-7,8
+7,10
@@
#include <string.h>
// === IMPORTS ===
#include <string.h>
// === IMPORTS ===
+extern int gSocket;
extern int giSyscall_ClientID;
extern void acess__exit(int Status);
extern int giSyscall_ClientID;
extern void acess__exit(int Status);
+extern void Request_Preinit(void);
// === PROTOTYPES ===
void CallUser(void *Entry, int argc, char *argv[], char **envp) __attribute__((noreturn));
// === PROTOTYPES ===
void CallUser(void *Entry, int argc, char *argv[], char **envp) __attribute__((noreturn));
@@
-20,10
+22,12
@@
int main(int argc, char *argv[], char **envp)
int appArgc;
char **appArgv;
char *appPath = NULL;
int appArgc;
char **appArgv;
char *appPath = NULL;
- int (*appMain)(int, char *[], char **)
__attribute__((cdecl))
;
+ int (*appMain)(int, char *[], char **);
void *base;
int rv;
void *base;
int rv;
+ Request_Preinit();
+
// int syscall_handle = -1;
for( i = 1; i < argc; i ++ )
// int syscall_handle = -1;
for( i = 1; i < argc; i ++ )
@@
-32,6
+36,11
@@
int main(int argc, char *argv[], char **envp)
giSyscall_ClientID = atoi(argv[++i]);
continue ;
}
giSyscall_ClientID = atoi(argv[++i]);
continue ;
}
+
+ if(strcmp(argv[i], "--socket") == 0) {
+ gSocket = atoi(argv[++i]);
+ continue ;
+ }
if(strcmp(argv[i], "--binary") == 0) {
appPath = argv[++i];
if(strcmp(argv[i], "--binary") == 0) {
appPath = argv[++i];
@@
-74,7
+83,7
@@
int main(int argc, char *argv[], char **envp)
if( !base ) return 127;
printf("==============================\n");
if( !base ) return 127;
printf("==============================\n");
- printf("[DEBUG %i] %i
%p ", giSyscall_ClientID, appArgc, appArgv
);
+ printf("[DEBUG %i] %i
", giSyscall_ClientID, appArgc
);
for(i = 0; i < appArgc; i ++)
printf("\"%s\" ", appArgv[i]);
printf("\n");
for(i = 0; i < appArgc; i ++)
printf("\"%s\" ", appArgv[i]);
printf("\n");
UCC
git Repository :: git.ucc.asn.au