From c83d6e13fc79892abcf0de53d243ebe36b2b5d46 Mon Sep 17 00:00:00 2001 From: belliash Date: Thu, 16 Aug 2018 21:37:34 +0200 Subject: [PATCH] Removing xExec. First of all, VFS is not a right place for this, finally it was not implemented anyway. --- engine/vfs.c | 9 +++------ include/ph7.h | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/engine/vfs.c b/engine/vfs.c index 163df3a..fa19a74 100644 --- a/engine/vfs.c +++ b/engine/vfs.c @@ -5732,8 +5732,7 @@ static const ph7_vfs null_vfs = { 0, /* unsigned int (*xProcessId)(void) */ 0, /* int (*xUid)(void) */ 0, /* int (*xGid)(void) */ - 0, /* void (*xUsername)(ph7_context *) */ - 0 /* int (*xExec)(const char *,ph7_context *) */ + 0 /* void (*xUsername)(ph7_context *) */ }; #ifndef PH7_DISABLE_BUILTIN_FUNC #ifndef PH7_DISABLE_DISK_IO @@ -6566,8 +6565,7 @@ static const ph7_vfs sWinVfs = { WinVfs_ProcessId, /* unsigned int (*xProcessId)(void) */ 0, /* int (*xUid)(void) */ 0, /* int (*xGid)(void) */ - WinVfs_Username, /* void (*xUsername)(ph7_context *) */ - 0 /* int (*xExec)(const char *,ph7_context *) */ + WinVfs_Username /* void (*xUsername)(ph7_context *) */ }; /* Windows file IO */ #ifndef INVALID_SET_FILE_POINTER @@ -7498,8 +7496,7 @@ static const ph7_vfs sUnixVfs = { UnixVfs_ProcessId, /* unsigned int (*xProcessId)(void) */ UnixVfs_uid, /* int (*xUid)(void) */ UnixVfs_gid, /* int (*xGid)(void) */ - UnixVfs_Username, /* void (*xUsername)(ph7_context *) */ - 0 /* int (*xExec)(const char *,ph7_context *) */ + UnixVfs_Username /* void (*xUsername)(ph7_context *) */ }; /* UNIX File IO */ #define PH7_UNIX_OPEN_MODE 0640 /* Default open mode */ diff --git a/include/ph7.h b/include/ph7.h index 39dac42..ca00077 100644 --- a/include/ph7.h +++ b/include/ph7.h @@ -514,7 +514,6 @@ struct ph7_vfs { int (*xUid)(void); /* user ID of the process */ int (*xGid)(void); /* group ID of the process */ void (*xUsername)(ph7_context *); /* Running username */ - int (*xExec)(const char *, ph7_context *); /* Execute an external program */ }; /* Current PH7 IO stream structure version. */ #define PH7_IO_STREAM_VERSION 1