aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jim-aio.c252
-rw-r--r--jim-clock.c2
-rw-r--r--jim-eventloop.c2
-rw-r--r--jim-exec.c2
-rw-r--r--jim-file.c2
-rw-r--r--jim-posix.c2
-rw-r--r--jim-readdir.c2
-rw-r--r--jim-readline.c2
-rw-r--r--jim-regexp.c2
-rw-r--r--jim-sdl.c3
-rw-r--r--jim-sqlite.c3
-rw-r--r--jim-sqlite3.c4
-rw-r--r--jim-subcmd.c2
13 files changed, 132 insertions, 148 deletions
diff --git a/jim-aio.c b/jim-aio.c
index 1f55441..ae78440 100644
--- a/jim-aio.c
+++ b/jim-aio.c
@@ -3,7 +3,7 @@
* Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
* Copyright 2005 Clemens Hintze <c.hintze@gmx.net>
* Copyright 2005 patthoyts - Pat Thoyts <patthoyts@users.sf.net>
- * Copyright 2008 oharboe - Øyvind Harboe - oyvind.harboe@zylin.com
+ * Copyright 2008 oharboe - o/yvind Harboe - oyvind.harboe@zylin.com
* Copyright 2008 Andrew Lunn <andrew@lunn.ch>
* Copyright 2008 Duane Ellis <openocd@duaneellis.com>
* Copyright 2008 Uwe Klein <uklein@klein-messgeraete.de>
@@ -50,28 +50,14 @@
#include <arpa/inet.h>
#include <netdb.h>
-#ifdef __ECOS
-#include <pkgconf/jimtcl.h>
-#endif
-#ifndef JIM_STATICEXT
-#define JIM_EXTENSION
-#endif
-
/* FIX!!! add #if's to make JIM_SUPPORT_EVENTLOOP enable/disable
* eventloop support compile time! */
#ifndef JIM_SUPPORT_EVENTLOOP
#define JIM_SUPPORT_EVENTLOOP 1
#endif
-#ifdef __ECOS
-#include <cyg/jimtcl/jim.h>
-#include <cyg/jimtcl/jim-eventloop.h>
-#else
#include "jim.h"
#include "jim-eventloop.h"
-#endif
-
-
#define AIO_CMD_LEN 128
@@ -108,9 +94,9 @@ static int JimAioFileEventHandler(Jim_Interp *interp, void *clientData, int mask
Jim_Obj *objPtr = clientData;
Jim_Obj *scrPtr = NULL ;
if ( mask == (JIM_EVENT_READABLE | JIM_EVENT_FEOF)) {
- Jim_ListIndex(interp, objPtr, 1, &scrPtr, 0);
+ Jim_ListIndex(interp, objPtr, 1, &scrPtr, 0);
} else {
- Jim_ListIndex(interp, objPtr, 0, &scrPtr, 0);
+ Jim_ListIndex(interp, objPtr, 0, &scrPtr, 0);
}
Jim_EvalObjBackground(interp, scrPtr);
return 0;
@@ -131,16 +117,16 @@ static void JimAioDelProc(Jim_Interp *interp, void *privData)
if (!af->OpenFlags == AIO_FDOPEN) // fp = fdopen(fd) !!
close(af->fd);
if (af->rEvent) { // remove existing EventHandlers
- Jim_DeleteFileHandler(interp,af->fp);
- Jim_DecrRefCount(interp,af->rEvent);
+ Jim_DeleteFileHandler(interp,af->fp);
+ Jim_DecrRefCount(interp,af->rEvent);
}
if (af->wEvent) {
- Jim_DeleteFileHandler(interp,af->fp);
- Jim_DecrRefCount(interp,af->wEvent);
+ Jim_DeleteFileHandler(interp,af->fp);
+ Jim_DecrRefCount(interp,af->wEvent);
}
if (af->eEvent) {
- Jim_DeleteFileHandler(interp,af->fp);
- Jim_DecrRefCount(interp,af->eEvent);
+ Jim_DeleteFileHandler(interp,af->fp);
+ Jim_DecrRefCount(interp,af->eEvent);
}
Jim_Free(af);
}
@@ -154,21 +140,21 @@ static int JimAioHandlerCommand(Jim_Interp *interp, int argc,
int option;
const char *options[] = {
"close",
- "seek", "tell",
- "gets", "read", "puts",
- "flush", "eof",
- "ndelay",
- "readable", "writable", "onexception",
- "accept",
- NULL
+ "seek", "tell",
+ "gets", "read", "puts",
+ "flush", "eof",
+ "ndelay",
+ "readable", "writable", "onexception",
+ "accept",
+ NULL
};
enum {OPT_CLOSE,
- OPT_SEEK, OPT_TELL,
- OPT_GETS, OPT_READ, OPT_PUTS,
+ OPT_SEEK, OPT_TELL,
+ OPT_GETS, OPT_READ, OPT_PUTS,
OPT_FLUSH, OPT_EOF,
- OPT_NDELAY,
- OPT_READABLE, OPT_WRITABLE, OPT_EXCEPTION,
- OPT_ACCEPT
+ OPT_NDELAY,
+ OPT_READABLE, OPT_WRITABLE, OPT_EXCEPTION,
+ OPT_ACCEPT
};
if (argc < 2) {
@@ -387,87 +373,87 @@ static int JimAioHandlerCommand(Jim_Interp *interp, int argc,
return JIM_OK;
} else if (option == OPT_NDELAY) {
#ifdef O_NDELAY
- int fmode = af->flags;
+ int fmode = af->flags;
if (argc == 3) {
- jim_wide wideValue;
+ jim_wide wideValue;
- if (Jim_GetWide(interp, argv[2], &wideValue) != JIM_OK)
+ if (Jim_GetWide(interp, argv[2], &wideValue) != JIM_OK)
return JIM_ERR;
- switch (wideValue) {
- case 0:
- fmode &= ~O_NDELAY; break ;
- case 1:
- fmode |= O_NDELAY; break ;
- }
- fcntl(af->fd,F_SETFL,fmode);
- af->flags = fmode;
- }
+ switch (wideValue) {
+ case 0:
+ fmode &= ~O_NDELAY; break ;
+ case 1:
+ fmode |= O_NDELAY; break ;
+ }
+ fcntl(af->fd,F_SETFL,fmode);
+ af->flags = fmode;
+ }
Jim_SetResult(interp, Jim_NewIntObj(interp, (fmode & O_NONBLOCK)?1:0));
return JIM_OK;
#else
return JIM_ERR;
#endif
} else if ( (option == OPT_READABLE)
- || (option == OPT_WRITABLE)
- || (option == OPT_EXCEPTION)
+ || (option == OPT_WRITABLE)
+ || (option == OPT_EXCEPTION)
) {
- int mask = 0;
- Jim_Obj **scrListObjpp = NULL;
- Jim_Obj *listObj;
- const char *dummy = NULL;
- int scrlen = 0;
-
- switch (option) {
- case OPT_READABLE: mask = JIM_EVENT_READABLE; scrListObjpp = &af->rEvent;
- if (argc == 4) mask |= JIM_EVENT_FEOF ; break;
- case OPT_WRITABLE: mask = JIM_EVENT_WRITABLE; scrListObjpp = &af->wEvent; break;
- case OPT_EXCEPTION: mask = JIM_EVENT_EXCEPTION; scrListObjpp = &af->eEvent; break;
- }
+ int mask = 0;
+ Jim_Obj **scrListObjpp = NULL;
+ Jim_Obj *listObj;
+ const char *dummy = NULL;
+ int scrlen = 0;
+
+ switch (option) {
+ case OPT_READABLE: mask = JIM_EVENT_READABLE; scrListObjpp = &af->rEvent;
+ if (argc == 4) mask |= JIM_EVENT_FEOF ; break;
+ case OPT_WRITABLE: mask = JIM_EVENT_WRITABLE; scrListObjpp = &af->wEvent; break;
+ case OPT_EXCEPTION: mask = JIM_EVENT_EXCEPTION; scrListObjpp = &af->eEvent; break;
+ }
switch (argc) {
- case 4:
- case 3:
- if (*scrListObjpp) {
- Jim_DeleteFileHandler(interp, af->fp); //,mask);
- Jim_DecrRefCount(interp, *scrListObjpp);
- *scrListObjpp = NULL;
- }
- if ( dummy = Jim_GetString(argv[2],&scrlen),(scrlen == 0)) {
- break;
- } else {
- *scrListObjpp = Jim_NewListObj(interp, NULL, 0);
- Jim_IncrRefCount(*scrListObjpp);
- listObj = argv[2];
- if (Jim_IsShared(listObj))
- listObj = Jim_DuplicateObj(interp, listObj);
- // Jim_IncrRefCount(listObj);
- Jim_ListAppendElement(interp,*scrListObjpp,listObj);
- if (mask & JIM_EVENT_FEOF) {
- listObj = argv[3];
- if (Jim_IsShared(listObj))
- listObj = Jim_DuplicateObj(interp, listObj);
- // Jim_IncrRefCount(listObj);
- Jim_ListAppendElement(interp,*scrListObjpp,listObj);
- }
- Jim_IncrRefCount(*scrListObjpp);
- Jim_CreateFileHandler(interp, af->fp, mask,
- JimAioFileEventHandler,
- *scrListObjpp,
- JimAioFileEventFinalizer);
- }
- break;
- case 2:
- if (*scrListObjpp)
- Jim_SetResult(interp,*scrListObjpp);
- return JIM_OK;
- default:
+ case 4:
+ case 3:
+ if (*scrListObjpp) {
+ Jim_DeleteFileHandler(interp, af->fp); //,mask);
+ Jim_DecrRefCount(interp, *scrListObjpp);
+ *scrListObjpp = NULL;
+ }
+ if ( dummy = Jim_GetString(argv[2],&scrlen),(scrlen == 0)) {
+ break;
+ } else {
+ *scrListObjpp = Jim_NewListObj(interp, NULL, 0);
+ Jim_IncrRefCount(*scrListObjpp);
+ listObj = argv[2];
+ if (Jim_IsShared(listObj))
+ listObj = Jim_DuplicateObj(interp, listObj);
+ // Jim_IncrRefCount(listObj);
+ Jim_ListAppendElement(interp,*scrListObjpp,listObj);
+ if (mask & JIM_EVENT_FEOF) {
+ listObj = argv[3];
+ if (Jim_IsShared(listObj))
+ listObj = Jim_DuplicateObj(interp, listObj);
+ // Jim_IncrRefCount(listObj);
+ Jim_ListAppendElement(interp,*scrListObjpp,listObj);
+ }
+ Jim_IncrRefCount(*scrListObjpp);
+ Jim_CreateFileHandler(interp, af->fp, mask,
+ JimAioFileEventHandler,
+ *scrListObjpp,
+ JimAioFileEventFinalizer);
+ }
+ break;
+ case 2:
+ if (*scrListObjpp)
+ Jim_SetResult(interp,*scrListObjpp);
+ return JIM_OK;
+ default:
Jim_WrongNumArgs(interp, 2, argv, "");
return JIM_ERR;
}
} else if (option == OPT_ACCEPT) {
- int ret;
- ret = JimAioAcceptHelper(interp,af);
- return (ret);
+ int ret;
+ ret = JimAioAcceptHelper(interp,af);
+ return (ret);
}
return JIM_OK;
}
@@ -600,7 +586,7 @@ static int JimAioSockCommand(Jim_Interp *interp, int argc,
return JIM_ERR;
}
if (0 == strncmp(sthost,"ANY",3))
- sthost = "0.0.0.0";
+ sthost = "0.0.0.0";
srcport = atol(stsrcport);
port = atol(stport);
he = gethostbyname(sthost);
@@ -616,41 +602,41 @@ static int JimAioSockCommand(Jim_Interp *interp, int argc,
switch (socktype) {
case SOCK_DGRAM_CL:
hdlfmt = "aio.sockdgram%ld" ;
- break;
- case SOCK_STREAM_CL:
- sa.sin_family= he->h_addrtype;
- bcopy(he->h_addr,(char *)&sa.sin_addr,he->h_length); /* set address */
- sa.sin_port = htons(port);
- res = connect(sock,(struct sockaddr*)&sa,sizeof(sa));
- if (res) {
- close(sock);
- JimAioSetError(interp);
- return JIM_ERR;
- }
- hdlfmt = "aio.sockstrm%ld" ;
- break;
+ break;
+ case SOCK_STREAM_CL:
+ sa.sin_family= he->h_addrtype;
+ bcopy(he->h_addr,(char *)&sa.sin_addr,he->h_length); /* set address */
+ sa.sin_port = htons(port);
+ res = connect(sock,(struct sockaddr*)&sa,sizeof(sa));
+ if (res) {
+ close(sock);
+ JimAioSetError(interp);
+ return JIM_ERR;
+ }
+ hdlfmt = "aio.sockstrm%ld" ;
+ break;
case SOCK_STREAM_SERV:
- sa.sin_family= he->h_addrtype;
- bcopy(he->h_addr,(char *)&sa.sin_addr,he->h_length); /* set address */
- sa.sin_port = htons(port);
- res = bind(sock,(struct sockaddr*)&sa,sizeof(sa));
- if (res) {
- close(sock);
- JimAioSetError(interp);
- return JIM_ERR;
- }
- res = listen(sock,5);
- if (res) {
- close(sock);
- JimAioSetError(interp);
- return JIM_ERR;
- }
- hdlfmt = "aio.socksrv%ld" ;
- break;
+ sa.sin_family= he->h_addrtype;
+ bcopy(he->h_addr,(char *)&sa.sin_addr,he->h_length); /* set address */
+ sa.sin_port = htons(port);
+ res = bind(sock,(struct sockaddr*)&sa,sizeof(sa));
+ if (res) {
+ close(sock);
+ JimAioSetError(interp);
+ return JIM_ERR;
+ }
+ res = listen(sock,5);
+ if (res) {
+ close(sock);
+ JimAioSetError(interp);
+ return JIM_ERR;
+ }
+ hdlfmt = "aio.socksrv%ld" ;
+ break;
}
fp = fdopen(sock, "r+" );
if (fp == NULL) {
- close(sock);
+ close(sock);
JimAioSetError(interp);
return JIM_ERR;
}
@@ -713,7 +699,7 @@ static int JimAioAcceptHelper(Jim_Interp *interp, AioFile *serv_af )
}
int
-Jim_AioInit(Jim_Interp *interp)
+Jim_aioInit(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "aio", "1.0", JIM_ERRMSG) != JIM_OK)
return JIM_ERR;
diff --git a/jim-clock.c b/jim-clock.c
index fb3c433..de0d3eb 100644
--- a/jim-clock.c
+++ b/jim-clock.c
@@ -100,7 +100,7 @@ static const jim_subcmd_type command_table[] = {
{ 0 }
};
-int Jim_ClockInit(Jim_Interp *interp)
+int Jim_clockInit(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "clock", "1.0", JIM_ERRMSG) != JIM_OK) {
return JIM_ERR;
diff --git a/jim-eventloop.c b/jim-eventloop.c
index aafdf2a..8201d73 100644
--- a/jim-eventloop.c
+++ b/jim-eventloop.c
@@ -520,7 +520,7 @@ static int JimELAfterCommand(Jim_Interp *interp, int argc,
return JIM_OK;
}
-int Jim_EventloopInit(Jim_Interp *interp)
+int Jim_eventloopInit(Jim_Interp *interp)
{
Jim_EventLoop *eventLoop;
diff --git a/jim-exec.c b/jim-exec.c
index 4ed70a9..762e593 100644
--- a/jim-exec.c
+++ b/jim-exec.c
@@ -918,7 +918,7 @@ Jim_CleanupChildren(Jim_Interp *interp, int numPids, int *pidPtr, int errorId)
return result;
}
-int Jim_ExecInit(Jim_Interp *interp)
+int Jim_execInit(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "exec", "1.0", JIM_ERRMSG) != JIM_OK) {
return JIM_ERR;
diff --git a/jim-file.c b/jim-file.c
index f3994d7..5600d65 100644
--- a/jim-file.c
+++ b/jim-file.c
@@ -665,7 +665,7 @@ static int Jim_PwdCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
return JIM_OK;
}
-int Jim_FileInit(Jim_Interp *interp)
+int Jim_fileInit(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "file", "1.0", JIM_ERRMSG) != JIM_OK) {
return JIM_ERR;
diff --git a/jim-posix.c b/jim-posix.c
index 5125e16..f280f3e 100644
--- a/jim-posix.c
+++ b/jim-posix.c
@@ -377,7 +377,7 @@ static int Jim_PosixSignalCommand(Jim_Interp *interp, int argc,
// end added
-int Jim_PosixInit(Jim_Interp *interp)
+int Jim_posixInit(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "posix", "1.0", JIM_ERRMSG) != JIM_OK)
return JIM_ERR;
diff --git a/jim-readdir.c b/jim-readdir.c
index 23f7c95..d0cd876 100644
--- a/jim-readdir.c
+++ b/jim-readdir.c
@@ -111,7 +111,7 @@ Jim_ReaddirCmd (Jim_Interp *interp, int argc, Jim_Obj *const *argv)
return JIM_OK;
}
-int Jim_ReaddirInit(Jim_Interp *interp)
+int Jim_readdirInit(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "readdir", "1.0", JIM_ERRMSG) != JIM_OK) {
return JIM_ERR;
diff --git a/jim-readline.c b/jim-readline.c
index 8070d01..ca581c8 100644
--- a/jim-readline.c
+++ b/jim-readline.c
@@ -48,7 +48,7 @@ static int JimRlAddHistoryCommand(Jim_Interp *interp, int argc,
return JIM_OK;
}
-int Jim_ReadlineInit(Jim_Interp *interp)
+int Jim_readlineInit(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "readline", "1.0", JIM_ERRMSG) != JIM_OK)
return JIM_ERR;
diff --git a/jim-regexp.c b/jim-regexp.c
index 32735b7..051d060 100644
--- a/jim-regexp.c
+++ b/jim-regexp.c
@@ -470,7 +470,7 @@ int Jim_RegsubCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
return result;
}
-int Jim_RegexpInit(Jim_Interp *interp)
+int Jim_regexpInit(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "regexp", "1.0", JIM_ERRMSG) != JIM_OK) {
return JIM_ERR;
diff --git a/jim-sdl.c b/jim-sdl.c
index bc8c36d..16d88e5 100644
--- a/jim-sdl.c
+++ b/jim-sdl.c
@@ -220,9 +220,8 @@ static int JimSdlSurfaceCommand(Jim_Interp *interp, int argc,
return JIM_OK;
}
-int Jim_OnLoad(Jim_Interp *interp)
+int Jim_sdlInit(Jim_Interp *interp)
{
- Jim_InitExtension(interp);
if (Jim_PackageProvide(interp, "sdl", "1.0", JIM_ERRMSG) != JIM_OK)
return JIM_ERR;
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
diff --git a/jim-sqlite.c b/jim-sqlite.c
index 779f26a..7eb40a3 100644
--- a/jim-sqlite.c
+++ b/jim-sqlite.c
@@ -271,9 +271,8 @@ static int JimSqliteOpenCommand(Jim_Interp *interp, int argc,
return JIM_OK;
}
-int Jim_OnLoad(Jim_Interp *interp)
+int Jim_sqliteInit(Jim_Interp *interp)
{
- Jim_InitExtension(interp);
if (Jim_PackageProvide(interp, "sqlite", "1.0", JIM_ERRMSG) != JIM_OK)
return JIM_ERR;
Jim_CreateCommand(interp, "sqlite.open", JimSqliteOpenCommand, NULL, NULL);
diff --git a/jim-sqlite3.c b/jim-sqlite3.c
index 5439e89..b32bd48 100644
--- a/jim-sqlite3.c
+++ b/jim-sqlite3.c
@@ -286,8 +286,8 @@ static int JimSqliteOpenCommand(Jim_Interp *interp, int argc,
return JIM_OK;
}
-DLLEXPORT int
-Jim_Sqlite3Init(Jim_Interp *interp)
+int
+Jim_sqlite3Init(Jim_Interp *interp)
{
if (Jim_PackageProvide(interp, "sqlite3", "1.0", JIM_ERRMSG) != JIM_OK)
return JIM_ERR;
diff --git a/jim-subcmd.c b/jim-subcmd.c
index 7c2ce03..044c8c9 100644
--- a/jim-subcmd.c
+++ b/jim-subcmd.c
@@ -149,7 +149,7 @@ Jim_ParseSubCmd(Jim_Interp *interp, const jim_subcmd_type *command_table, int ar
}
if (help) {
- Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
+ Jim_SetResultString(interp, "Usage: ", -1);
add_subcmd_usage(interp, ct, argc, argv);
if (ct->description) {
Jim_AppendStrings(interp, Jim_GetResult(interp), "\n\n", ct->description, 0);
generated by cgit v1.1 at 2024-08-15 18:10:44 +0000