Convert package to use jim-subcmd

Also, no need to install tcl extensions
Display any errors from loading static extensions

9 files changed, 716 insertions, 687 deletions

diff --git a/Makefile.in b/Makefile.in
index 4081dc8..2c7adde 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,12 +50,10 @@ $(LIBJIM): $(OBJS) $(EXTENSIONS_OBJS)
 	$(AR) cr $@ $^
 	$(RANLIB) $@
 
-load_extensions.c:
+load_extensions.c: make-load-extensions.sh
 	sh make-load-extensions.sh $@ $(EXTENSIONS)
 
 install:
-	install -d $(DESTDIR)/lib/tcl6
-	install -m 644 array.tcl glob.tcl stdio.tcl tcl6.tcl $(DESTDIR)/lib/tcl6
 
 clean:
 	rm -f *.o lib*.a $(TARGETS) load_extensions.c
diff --git a/glob.tcl b/glob.tcl
index 9529df0..ed96949 100644
--- a/glob.tcl
+++ b/glob.tcl
@@ -32,8 +32,8 @@
 # are those of the authors and should not be interpreted as representing

 # official policies, either expressed or implied, of the Jim Tcl Project.

 

-package provide glob 1.0

-package require readdir 1.0

+package provide glob

+package require readdir

 

 # If $dir is a directory, return a list of all entries

 # it contains which match $pattern

diff --git a/jim-package.c b/jim-package.c
index 3c206df..26e8316 100644
--- a/jim-package.c
+++ b/jim-package.c
@@ -2,16 +2,12 @@
 #include <string.h>
 
 #include <jim.h>
-
-# include <sys/types.h>
-# include <dirent.h>
+#include <jim-subcmd.h>
 
 /* -----------------------------------------------------------------------------
  * Packages handling
  * ---------------------------------------------------------------------------*/
 
-#define JIM_PKG_ANY_VERSION -1
-
 int Jim_PackageProvide(Jim_Interp *interp, const char *name, const char *ver,
         int flags)
 {
@@ -28,24 +24,6 @@ int Jim_PackageProvide(Jim_Interp *interp, const char *name, const char *ver,
     return JIM_OK;
 }
 
-static int Jim_PackageList(Jim_Interp *interp)
-{
-    Jim_HashTableIterator *htiter;
-    Jim_HashEntry *he;
-    Jim_Obj *listObjPtr = Jim_NewListObj(interp, NULL, 0);
-    
-    htiter = Jim_GetHashTableIterator(&interp->packages);
-    while ((he = Jim_NextHashEntry(htiter)) != NULL) {
-        Jim_ListAppendElement(interp, listObjPtr,
-                Jim_NewStringObj(interp, he->key, -1));
-    }
-    Jim_FreeHashTableIterator(htiter);
-
-    Jim_SetResult(interp, listObjPtr);
-
-    return JIM_OK;
-}
-
 static char *JimFindPackage(Jim_Interp *interp, char **prefixes,
         int prefixc, const char *pkgName)
 {
@@ -123,8 +101,7 @@ static int JimLoadPackage(Jim_Interp *interp, const char *name, int flags)
     return retCode;
 }
 
-const char *Jim_PackageRequire(Jim_Interp *interp, const char *name,
-        const char *ver, int flags)
+const char *Jim_PackageRequire(Jim_Interp *interp, const char *name, int flags)
 {
     Jim_HashEntry *he;
 
@@ -139,10 +116,12 @@ const char *Jim_PackageRequire(Jim_Interp *interp, const char *name,
             if (he == NULL) {
                 /* Did not call package provide, so we do it for them */
                 Jim_PackageProvide(interp, name, "1.0", 0);
+
                 return "1.0";
             }
             return he->val;
         }
+
         /* No way... return an error. */
         if (flags & JIM_ERRMSG) {
             int len;
@@ -156,57 +135,111 @@ const char *Jim_PackageRequire(Jim_Interp *interp, const char *name,
     }
 }
 
-/* [package] */
-int Jim_PackageCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+/*
+ *----------------------------------------------------------------------
+ *
+ * package provide name ?version?
+ *
+ *	This procedure is invoked to declare that a particular version
+ *	of a particular package is now present in an interpreter.  There
+ *	must not be any other version of this package already
+ *	provided in the interpreter.
+ *
+ * Results:
+ *	Returns JIM_OK and sets the package version (or 1.0 if not specified).
+ *
+ *----------------------------------------------------------------------
+ */
+static int package_cmd_provide(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-    int option;
-    const char *options[] = {
-        "require", "provide", "list", NULL
-    };
-    enum {OPT_REQUIRE, OPT_PROVIDE, OPT_LIST};
-
-    if (argc < 2) {
-        Jim_WrongNumArgs(interp, 1, argv, "option ?arguments ...?");
-        return JIM_ERR;
+    const char *version = "1.0";
+    
+    if (argc == 2) {
+        version = Jim_GetString(argv[1], NULL);
     }
-    if (Jim_GetEnum(interp, argv[1], options, &option, "option",
-                JIM_ERRMSG) != JIM_OK)
-        return JIM_ERR;
+    return Jim_PackageProvide(interp, Jim_GetString(argv[0], NULL), version, JIM_ERRMSG);
+}
 
-    if (option == OPT_REQUIRE) {
-        int exact = 0;
-        const char *ver;
+/*
+ *----------------------------------------------------------------------
+ *
+ * package require name ?version?
+ *
+ *	This procedure is load a given package.
+ *	Note that the version is ignored.
+ *
+ * Results:
+ *	Returns JIM_OK and sets the package version.
+ *
+ *----------------------------------------------------------------------
+ */
+static int package_cmd_require(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+    const char *ver = Jim_PackageRequire(interp, Jim_GetString(argv[0], NULL), JIM_ERRMSG);
 
-        if (Jim_CompareStringImmediate(interp, argv[2], "-exact")) {
-            exact = 1;
-            argv++;
-            argc--;
-        }
-        if (argc != 3 && argc != 4) {
-            Jim_WrongNumArgs(interp, 2, argv, "?-exact? package ?version?");
-            return JIM_ERR;
-        }
-        ver = Jim_PackageRequire(interp, Jim_GetString(argv[2], NULL),
-                argc == 4 ? Jim_GetString(argv[3], NULL) : "",
-                JIM_ERRMSG);
-        if (ver == NULL)
-            return JIM_ERR_ADDSTACK;
-        Jim_SetResultString(interp, ver, -1);
-    } else if (option == OPT_PROVIDE) {
-        if (argc != 4) {
-            Jim_WrongNumArgs(interp, 2, argv, "package version");
-            return JIM_ERR;
-        }
-        return Jim_PackageProvide(interp, Jim_GetString(argv[2], NULL),
-                    Jim_GetString(argv[3], NULL), JIM_ERRMSG);
-    } else if (option == OPT_LIST) {
-        return Jim_PackageList(interp);
+    if (ver == NULL) {
+        return JIM_ERR_ADDSTACK;
     }
+    Jim_SetResultString(interp, ver, -1);
     return JIM_OK;
 }
 
+/*
+ *----------------------------------------------------------------------
+ *
+ * package list
+ *
+ *	Returns a list of known packages
+ *
+ * Results:
+ *	Returns JIM_OK and sets a list of known packages.
+ *
+ *----------------------------------------------------------------------
+ */
+static int package_cmd_list(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+    Jim_HashTableIterator *htiter;
+    Jim_HashEntry *he;
+    Jim_Obj *listObjPtr = Jim_NewListObj(interp, NULL, 0);
+    
+    htiter = Jim_GetHashTableIterator(&interp->packages);
+    while ((he = Jim_NextHashEntry(htiter)) != NULL) {
+        Jim_ListAppendElement(interp, listObjPtr,
+                Jim_NewStringObj(interp, he->key, -1));
+    }
+    Jim_FreeHashTableIterator(htiter);
+
+    Jim_SetResult(interp, listObjPtr);
+
+    return JIM_OK;
+}
+
+static const jim_subcmd_type command_table[] = {
+    {   .cmd = "provide",
+        .args = "name ?version?",
+        .function = package_cmd_provide,
+        .minargs = 1,
+        .maxargs = 2,
+        .description = "Indicates that the current script provides the given package"
+    },
+    {   .cmd = "require",
+        .args = "name ?version?",
+        .function = package_cmd_require,
+        .minargs = 1,
+        .maxargs = 2,
+        .description = "Loads the given package by looking in standard places"
+    },
+    {   .cmd = "list",
+        .function = package_cmd_list,
+        .minargs = 0,
+        .maxargs = 0,
+        .description = "Lists all known packages"
+    },
+    { 0 }
+};
+
 int Jim_packageInit(Jim_Interp *interp)
 {
-    Jim_CreateCommand(interp, "package", Jim_PackageCoreCommand, NULL, NULL);
+    Jim_CreateCommand(interp, "package", Jim_SubCmdProc, (void *)command_table, NULL);
     return JIM_OK;
 }
diff --git a/jim-readdir.c b/jim-readdir.c
index d0cd876..14ee2ab 100644
--- a/jim-readdir.c
+++ b/jim-readdir.c
@@ -1,121 +1,121 @@
-/*

- * (c) 2008 Steve Bennett <steveb@worware.net.au>

- *

- * Tcl readdir command.

- *

- * The FreeBSD license

- * 

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above

- *    copyright notice, this list of conditions and the following

- *    disclaimer in the documentation and/or other materials

- *    provided with the distribution.

- * 

- * THIS SOFTWARE IS PROVIDED BY THE JIM TCL PROJECT ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

- * JIM TCL PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,

- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- * 

- * The views and conclusions contained in the software and documentation

- * are those of the authors and should not be interpreted as representing

- * official policies, either expressed or implied, of the Jim Tcl Project.

- *

- * Based on original work by:

- *-----------------------------------------------------------------------------

- * Copyright 1991-1994 Karl Lehenbauer and Mark Diekhans.

- *

- * Permission to use, copy, modify, and distribute this software and its

- * documentation for any purpose and without fee is hereby granted, provided

- * that the above copyright notice appear in all copies.  Karl Lehenbauer and

- * Mark Diekhans make no representations about the suitability of this

- * software for any purpose.  It is provided "as is" without express or

- * implied warranty.

- *-----------------------------------------------------------------------------

- */

-

-#include <errno.h>

-#include <stdio.h>

-#include <string.h>

-#include <dirent.h>

-

-#define JIM_EXTENSION

-#include "jim.h"

-

-/*

- *-----------------------------------------------------------------------------

- *

- * Jim_ReaddirCmd --

- *     Implements the rename TCL command:

- *         readdir ?-nocomplain? dirPath

- *

- * Results:

- *      Standard TCL result.

- *-----------------------------------------------------------------------------

- */

-int

-Jim_ReaddirCmd (Jim_Interp *interp, int argc, Jim_Obj *const *argv)

-{

-    const char          *dirPath;

-    DIR           *dirPtr;

-    struct dirent *entryPtr;

-    int nocomplain = 0;

-

-    if (argc == 3 && Jim_CompareStringImmediate(interp, argv[1], "-nocomplain")) {

-        nocomplain = 1;

-    }

-    if (argc != 2 && !nocomplain) {

-        Jim_WrongNumArgs(interp, 1, argv, "?-nocomplain? dirPath");

-        return JIM_ERR;

-    }

-

-    dirPath = Jim_GetString(argv[1 + nocomplain], NULL);

-

-    dirPtr = opendir (dirPath);

-    if (dirPtr == NULL)  {

-        if (nocomplain) {

-            return JIM_OK;

-        }

-        Jim_SetResultString(interp, strerror(errno), -1);

-        return JIM_ERR;

-    }

-    Jim_SetResultString(interp, strerror(errno), -1);

-

-    Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));

-

-    while ((entryPtr = readdir (dirPtr)) != NULL) {

-        if (entryPtr->d_name [0] == '.') {

-            if (entryPtr->d_name [1] == '\0') {

-                continue;

-            }

-            if ((entryPtr->d_name [1] == '.') &&

-                (entryPtr->d_name [2] == '\0'))

-                continue;

-        }

-        Jim_ListAppendElement(interp, Jim_GetResult(interp), Jim_NewStringObj(interp, entryPtr->d_name, -1));

-    }

-    closedir (dirPtr);

-

-    return JIM_OK;

-}

-

-int Jim_readdirInit(Jim_Interp *interp)

-{

-    if (Jim_PackageProvide(interp, "readdir", "1.0", JIM_ERRMSG) != JIM_OK) {

-        return JIM_ERR;

-    }

-    Jim_CreateCommand(interp, "readdir", Jim_ReaddirCmd, NULL, NULL);

-    return JIM_OK;

-}

+/*
+ * (c) 2008 Steve Bennett <steveb@worware.net.au>
+ *
+ * Tcl readdir command.
+ *
+ * The FreeBSD license
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE JIM TCL PROJECT ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * JIM TCL PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * official policies, either expressed or implied, of the Jim Tcl Project.
+ *
+ * Based on original work by:
+ *-----------------------------------------------------------------------------
+ * Copyright 1991-1994 Karl Lehenbauer and Mark Diekhans.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies.  Karl Lehenbauer and
+ * Mark Diekhans make no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or
+ * implied warranty.
+ *-----------------------------------------------------------------------------
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <dirent.h>
+
+#define JIM_EXTENSION
+#include "jim.h"
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * Jim_ReaddirCmd --
+ *     Implements the rename TCL command:
+ *         readdir ?-nocomplain? dirPath
+ *
+ * Results:
+ *      Standard TCL result.
+ *-----------------------------------------------------------------------------
+ */
+int
+Jim_ReaddirCmd (Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+    const char          *dirPath;
+    DIR           *dirPtr;
+    struct dirent *entryPtr;
+    int nocomplain = 0;
+
+    if (argc == 3 && Jim_CompareStringImmediate(interp, argv[1], "-nocomplain")) {
+        nocomplain = 1;
+    }
+    if (argc != 2 && !nocomplain) {
+        Jim_WrongNumArgs(interp, 1, argv, "?-nocomplain? dirPath");
+        return JIM_ERR;
+    }
+
+    dirPath = Jim_GetString(argv[1 + nocomplain], NULL);
+
+    dirPtr = opendir (dirPath);
+    if (dirPtr == NULL)  {
+        if (nocomplain) {
+            return JIM_OK;
+        }
+        Jim_SetResultString(interp, strerror(errno), -1);
+        return JIM_ERR;
+    }
+    Jim_SetResultString(interp, strerror(errno), -1);
+
+    Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
+
+    while ((entryPtr = readdir (dirPtr)) != NULL) {
+        if (entryPtr->d_name [0] == '.') {
+            if (entryPtr->d_name [1] == '\0') {
+                continue;
+            }
+            if ((entryPtr->d_name [1] == '.') &&
+                (entryPtr->d_name [2] == '\0'))
+                continue;
+        }
+        Jim_ListAppendElement(interp, Jim_GetResult(interp), Jim_NewStringObj(interp, entryPtr->d_name, -1));
+    }
+    closedir (dirPtr);
+
+    return JIM_OK;
+}
+
+int Jim_readdirInit(Jim_Interp *interp)
+{
+    if (Jim_PackageProvide(interp, "readdir", "1.0", JIM_ERRMSG) != JIM_OK) {
+        return JIM_ERR;
+    }
+    Jim_CreateCommand(interp, "readdir", Jim_ReaddirCmd, NULL, NULL);
+    return JIM_OK;
+}
diff --git a/jim-regexp.c b/jim-regexp.c
index 051d060..e3c194e 100644
--- a/jim-regexp.c
+++ b/jim-regexp.c
@@ -1,481 +1,481 @@
-/* 

- * (c) 2008 Steve Bennett <steveb@workware.net.au>

- *

- * Implements the regexp and regsub commands for Jim

- *

- * Uses C library regcomp()/regexec() for the matching.

- *

- * The FreeBSD license

- * 

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above

- *    copyright notice, this list of conditions and the following

- *    disclaimer in the documentation and/or other materials

- *    provided with the distribution.

- * 

- * THIS SOFTWARE IS PROVIDED BY THE JIM TCL PROJECT ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

- * JIM TCL PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,

- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- * 

- * The views and conclusions contained in the software and documentation

- * are those of the authors and should not be interpreted as representing

- * official policies, either expressed or implied, of the Jim Tcl Project.

- *

- * Based on code originally from Tcl 6.7:

- *

- * Copyright 1987-1991 Regents of the University of California

- * Permission to use, copy, modify, and distribute this

- * software and its documentation for any purpose and without

- * fee is hereby granted, provided that the above copyright

- * notice appear in all copies.  The University of California

- * makes no representations about the suitability of this

- * software for any purpose.  It is provided "as is" without

- * express or implied warranty.

- */

-

-#include <regex.h>

-#include <string.h>

-

-#define JIM_EXTENSION

-#include "jim.h"

-

-/* REVISIT: Would be useful in jim.h */

-static void Jim_SetIntResult(Jim_Interp *interp, jim_wide wide)

-{

-    Jim_SetResult(interp, Jim_NewIntObj(interp, wide));

-}

-

-/**

- * REVISIT: Should cache a number of compiled regexps for performance reasons.

- */

-static regex_t * 

-compile_regexp(Jim_Interp *interp, const char *pattern, int flags)

-{

-    int ret;

-

-    regex_t *result = (regex_t *)Jim_Alloc(sizeof(*result));

-

-    if ((ret = regcomp(result, pattern, REG_EXTENDED | flags)) != 0) {

-        char buf[100];

-        regerror(ret, result, buf, sizeof(buf));

-        Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));

-        Jim_AppendStrings(interp, Jim_GetResult(interp), "couldn't compile regular expression pattern: ", buf, NULL);

-        Jim_Free(result);

-        return NULL;

-    }

-    return result;

-}

-

-int Jim_RegexpCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)

-{

-    int opt_indices = 0;

-    int opt_all = 0;

-    int opt_inline = 0;

-    regex_t *regex;

-    int match, i, j;

-    long offset = 0;

-    regmatch_t *pmatch = NULL;

-    int source_len;

-    int result = JIM_OK;

-    const char *pattern;

-    const char *source_str;

-    int num_matches = 0;

-    int num_vars;

-    Jim_Obj *resultListObj = NULL;

-    int regcomp_flags = 0;

-

-    if (argc < 3) {

-        wrongNumArgs:

-        Jim_WrongNumArgs(interp, 1, argv, "?-nocase? ?-line? ?-indices? ?-start offset? ?-all? ?-inline? exp string ?matchVar? ?subMatchVar ...?");

-        return JIM_ERR;

-    }

-

-    for (i = 1; i < argc; i++) {

-        if (Jim_CompareStringImmediate(interp, argv[i], "-indices")) {

-            opt_indices = 1;

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "-nocase")) {

-            regcomp_flags |= REG_ICASE;

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "-line")) {

-            regcomp_flags |= REG_NEWLINE;

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "-all")) {

-            opt_all = 1;

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "-inline")) {

-            opt_inline = 1;

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "-start")) {

-            if (++i == argc) {

-                goto wrongNumArgs;

-            }

-            if (Jim_GetLong(interp, argv[i], &offset) != JIM_OK) {

-                return JIM_ERR;

-            }

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "--")) {

-            i++;

-            break;

-        }

-        else {

-            const char *opt = Jim_GetString(argv[i], NULL);

-            if (*opt == '-') {

-                /* Bad option */

-                goto wrongNumArgs;

-            }

-            break;

-        }

-    }

-    if (argc - i < 2) {

-        goto wrongNumArgs;

-    }

-

-    pattern = Jim_GetString(argv[i], NULL);

-    regex = compile_regexp(interp, pattern, regcomp_flags);

-    if (regex == NULL) {

-        return JIM_ERR;

-    }

-

-    source_str = Jim_GetString(argv[i + 1], &source_len);

-

-    num_vars = argc - i - 2;

-

-    if (opt_inline) {

-        if (num_vars) {

-            Jim_SetResultString(interp, "regexp match variables not allowed when using -inline", -1);

-            result = JIM_ERR;

-            goto done;

-        }

-        /* REVISIT: Ugly! */

-        num_vars = 100;

-    }

-

-    pmatch = Jim_Alloc((num_vars + 1) * sizeof(*pmatch));

-

-    /* If an offset has been specified, adjust for that now.

-     * If it points past the end of the string, point to the terminating null

-     */

-    if (offset) {

-        if (offset > source_len) {

-            source_str += source_len;

-        } else if (offset > 0) {

-            source_str += offset;

-        }

-    }

-

-    if (opt_inline) {

-        resultListObj = Jim_NewListObj(interp, NULL, 0);

-    }

-

-    next_match:

-    match = regexec(regex, source_str, num_vars + 1, pmatch, 0);

-    if (match >= REG_BADPAT) {

-        char buf[100];

-        regerror(match, regex, buf, sizeof(buf));

-        Jim_SetResultString(interp, "", 0);

-        Jim_AppendStrings(interp, Jim_GetResult(interp), "error while matching pattern: ", buf, NULL);

-        result = JIM_ERR;

-        goto done;

-    }

-

-    if (match == REG_NOMATCH) {

-        goto done;

-    }

-

-    num_matches++;

-

-    if (opt_all && !opt_inline) {

-        /* Just count the number of matches, so skip the substitution h*/

-        goto try_next_match;

-    }

-

-    /*

-     * If additional variable names have been specified, return

-     * index information in those variables.

-     */

-

-    //fprintf(stderr, "source_str=%s, [0].rm_eo=%d\n", source_str, pmatch[0].rm_eo);

-

-    j = 0;

-    for (i += 2; opt_inline ? pmatch[j].rm_so != -1 : i < argc; i++, j++) {

-        Jim_Obj *resultObj;

-

-        if (opt_indices) {

-            resultObj = Jim_NewListObj(interp, NULL, 0);

-        }

-        else {

-            resultObj = Jim_NewStringObj(interp, "", 0);

-        }

-

-        if (pmatch[j].rm_so == -1) {

-            if (opt_indices) {

-                Jim_ListAppendElement(interp, resultObj, Jim_NewIntObj(interp, -1));

-                Jim_ListAppendElement(interp, resultObj, Jim_NewIntObj(interp, -1));

-            }

-        } else {

-            int len = pmatch[j].rm_eo - pmatch[j].rm_so;

-            if (opt_indices) {

-                Jim_ListAppendElement(interp, resultObj, Jim_NewIntObj(interp, offset + pmatch[j].rm_so));

-                Jim_ListAppendElement(interp, resultObj, Jim_NewIntObj(interp, offset + pmatch[j].rm_so + len - 1));

-            } else {

-                Jim_AppendString(interp, resultObj, source_str + pmatch[j].rm_so, len);

-            }

-        }

-

-        if (opt_inline) {

-            Jim_ListAppendElement(interp, resultListObj, resultObj);

-        }

-        else {

-            /* And now set the result variable */

-            result = Jim_SetVariable(interp, argv[i], resultObj);

-

-            if (result != JIM_OK) {

-                Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));

-                Jim_AppendStrings(interp, Jim_GetResult(interp), "couldn't set variable \"", Jim_GetString(argv[i], NULL), "\"", NULL);

-                Jim_FreeObj(interp, resultObj);

-                break;

-            }

-        }

-    }

-

-    try_next_match:

-    if (opt_all && pattern[0] != '^' && *source_str) {

-        if (pmatch[0].rm_eo) {

-            source_str += pmatch[0].rm_eo;

-        }

-        else {

-            source_str++;

-        }

-        if (*source_str) {

-            goto next_match;

-        }

-    }

-

-    done:

-    if (result == JIM_OK) {

-        if (opt_inline) {

-            Jim_SetResult(interp, resultListObj);

-        }

-        else {

-            Jim_SetIntResult(interp, num_matches);

-        }

-    }

-

-    Jim_Free(pmatch);

-    regfree(regex);

-    Jim_Free(regex);

-    return result;

-}

-

-#define MAX_SUB_MATCHES 10

-

-int Jim_RegsubCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)

-{

-    int regcomp_flags = 0;

-    int opt_all = 0;

-    long offset = 0;

-    regex_t *regex;

-    const char *p;

-    int result = JIM_ERR;

-    regmatch_t pmatch[MAX_SUB_MATCHES + 1];

-    int num_matches = 0;

-

-    int i;

-    Jim_Obj *varname;

-    Jim_Obj *resultObj;

-    const char *source_str;

-    int source_len;

-    const char *replace_str;

-    const char *pattern;

-

-    if (argc < 5) {

-        wrongNumArgs:

-        Jim_WrongNumArgs(interp, 1, argv, "?-nocase? ?-all? exp string subSpec varName");

-        return JIM_ERR;

-    }

-

-    for (i = 1; i < argc; i++) {

-        if (Jim_CompareStringImmediate(interp, argv[i], "-nocase")) {

-            regcomp_flags |= REG_ICASE;

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "-line")) {

-            regcomp_flags |= REG_NEWLINE;

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "-all")) {

-            opt_all = 1;

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "-start")) {

-            if (++i == argc) {

-                goto wrongNumArgs;

-            }

-            if (Jim_GetLong(interp, argv[i], &offset) != JIM_OK) {

-                return JIM_ERR;

-            }

-        }

-        else if (Jim_CompareStringImmediate(interp, argv[i], "--")) {

-            i++;

-            break;

-        }

-        else {

-            const char *opt = Jim_GetString(argv[i], NULL);

-            if (*opt == '-') {

-                /* Bad option */

-                goto wrongNumArgs;

-            }

-            break;

-        }

-    }

-    if (argc - i != 4) {

-        goto wrongNumArgs;

-    }

-

-    pattern = Jim_GetString(argv[i], NULL);

-    regex = compile_regexp(interp, pattern, regcomp_flags);

-    if (regex == NULL) {

-        return JIM_ERR;

-    }

-

-    source_str = Jim_GetString(argv[i + 1], &source_len);

-    replace_str = Jim_GetString(argv[i + 2], NULL);

-    varname = argv[i + 3];

-

-    /* Create the result string */

-    resultObj = Jim_NewStringObj(interp, "", 0);

-

-    /* If an offset has been specified, adjust for that now.

-     * If it points past the end of the string, point to the terminating null

-     */

-    if (offset) {

-        if (offset > source_len) {

-            offset = source_len;

-        } else if (offset < 0) {

-            offset = 0;

-        }

-    }

-

-    /* Copy the part before -start */

-    Jim_AppendString(interp, resultObj, source_str, offset);

-

-    /*

-     * The following loop is to handle multiple matches within the

-     * same source string;  each iteration handles one match and its

-     * corresponding substitution.  If "-all" hasn't been specified

-     * then the loop body only gets executed once.

-     */

-

-    for (p = source_str + offset; *p != 0; ) {

-        const char *src;

-        int match = regexec(regex, p, MAX_SUB_MATCHES, pmatch, 0);

-        if (match >= REG_BADPAT) {

-            char buf[100];

-            regerror(match, regex, buf, sizeof(buf));

-            Jim_SetResultString(interp, "", 0);

-            Jim_AppendStrings(interp, Jim_GetResult(interp), "error while matching pattern: ", buf, NULL);

-            goto done;

-        }

-        if (match == REG_NOMATCH) {

-            break;

-        }

-

-        num_matches++;

-

-        /*

-         * Copy the portion of the source string before the match to the

-         * result variable.

-         */

-        Jim_AppendString(interp, resultObj, p, pmatch[0].rm_so);

-

-        /*

-         * Append the subSpec (replace_str) argument to the variable, making appropriate

-         * substitutions.  This code is a bit hairy because of the backslash

-         * conventions and because the code saves up ranges of characters in

-         * subSpec to reduce the number of calls to Jim_SetVar.

-         */

-    

-        for (src = replace_str; *src; src++) {

-            int index;

-            int c = *src;

-

-            if (c == '&') {

-                index = 0;

-            }

-            else if (c == '\\') {

-                c = *++src;

-                if ((c >= '0') && (c <= '9')) {

-                    index = c - '0';

-                }

-                else if ((c == '\\') || (c == '&')) {

-                    Jim_AppendString(interp, resultObj, src, 1);

-                    continue;

-                }

-                else {

-                    Jim_AppendString(interp, resultObj, src - 1, 2);

-                    continue;

-                }

-            }

-            else {

-                Jim_AppendString(interp, resultObj, src, 1);

-                continue;

-            }

-            if ((index < MAX_SUB_MATCHES) && pmatch[index].rm_so != -1 && pmatch[index].rm_eo != -1) {

-                Jim_AppendString(interp, resultObj, p + pmatch[index].rm_so, pmatch[index].rm_eo - pmatch[index].rm_so);

-            }

-        }

-

-        p += pmatch[0].rm_eo;

-

-        if (!opt_all || pmatch[0].rm_eo == 0 || pattern[0] == '^') {

-            /* If we are doing a single match, or we haven't moved with this match

-             * or this is an anchored match, we stop */

-            break;

-        }

-    }

-

-    /*

-     * Copy the portion of the string after the last match to the

-     * result variable.

-     */

-    Jim_AppendString(interp, resultObj, p, -1);

-

-    /* And now set the result variable */

-    result = Jim_SetVariable(interp, varname, resultObj);

-

-    if (result == JIM_OK) {

-        Jim_SetIntResult(interp, num_matches);

-    }

-    else {

-        Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));

-        Jim_AppendStrings(interp, Jim_GetResult(interp), "couldn't set variable \"", Jim_GetString(varname, NULL), "\"", NULL);

-        Jim_FreeObj(interp, resultObj);

-    }

-

-    done:

-    regfree(regex);

-    Jim_Free(regex);

-    return result;

-}

-

-int Jim_regexpInit(Jim_Interp *interp)

-{

-        if (Jim_PackageProvide(interp, "regexp", "1.0", JIM_ERRMSG) != JIM_OK) {

-                return JIM_ERR;

-        }

-        Jim_CreateCommand(interp, "regexp", Jim_RegexpCmd, NULL, NULL);

-        Jim_CreateCommand(interp, "regsub", Jim_RegsubCmd, NULL, NULL);

-        return JIM_OK;

-}

+/* 
+ * (c) 2008 Steve Bennett <steveb@workware.net.au>
+ *
+ * Implements the regexp and regsub commands for Jim
+ *
+ * Uses C library regcomp()/regexec() for the matching.
+ *
+ * The FreeBSD license
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE JIM TCL PROJECT ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * JIM TCL PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * official policies, either expressed or implied, of the Jim Tcl Project.
+ *
+ * Based on code originally from Tcl 6.7:
+ *
+ * Copyright 1987-1991 Regents of the University of California
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies.  The University of California
+ * makes no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without
+ * express or implied warranty.
+ */
+
+#include <regex.h>
+#include <string.h>
+
+#define JIM_EXTENSION
+#include "jim.h"
+
+/* REVISIT: Would be useful in jim.h */
+static void Jim_SetIntResult(Jim_Interp *interp, jim_wide wide)
+{
+    Jim_SetResult(interp, Jim_NewIntObj(interp, wide));
+}
+
+/**
+ * REVISIT: Should cache a number of compiled regexps for performance reasons.
+ */
+static regex_t * 
+compile_regexp(Jim_Interp *interp, const char *pattern, int flags)
+{
+    int ret;
+
+    regex_t *result = (regex_t *)Jim_Alloc(sizeof(*result));
+
+    if ((ret = regcomp(result, pattern, REG_EXTENDED | flags)) != 0) {
+        char buf[100];
+        regerror(ret, result, buf, sizeof(buf));
+        Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
+        Jim_AppendStrings(interp, Jim_GetResult(interp), "couldn't compile regular expression pattern: ", buf, NULL);
+        Jim_Free(result);
+        return NULL;
+    }
+    return result;
+}
+
+int Jim_RegexpCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+    int opt_indices = 0;
+    int opt_all = 0;
+    int opt_inline = 0;
+    regex_t *regex;
+    int match, i, j;
+    long offset = 0;
+    regmatch_t *pmatch = NULL;
+    int source_len;
+    int result = JIM_OK;
+    const char *pattern;
+    const char *source_str;
+    int num_matches = 0;
+    int num_vars;
+    Jim_Obj *resultListObj = NULL;
+    int regcomp_flags = 0;
+
+    if (argc < 3) {
+        wrongNumArgs:
+        Jim_WrongNumArgs(interp, 1, argv, "?-nocase? ?-line? ?-indices? ?-start offset? ?-all? ?-inline? exp string ?matchVar? ?subMatchVar ...?");
+        return JIM_ERR;
+    }
+
+    for (i = 1; i < argc; i++) {
+        if (Jim_CompareStringImmediate(interp, argv[i], "-indices")) {
+            opt_indices = 1;
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "-nocase")) {
+            regcomp_flags |= REG_ICASE;
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "-line")) {
+            regcomp_flags |= REG_NEWLINE;
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "-all")) {
+            opt_all = 1;
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "-inline")) {
+            opt_inline = 1;
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "-start")) {
+            if (++i == argc) {
+                goto wrongNumArgs;
+            }
+            if (Jim_GetLong(interp, argv[i], &offset) != JIM_OK) {
+                return JIM_ERR;
+            }
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "--")) {
+            i++;
+            break;
+        }
+        else {
+            const char *opt = Jim_GetString(argv[i], NULL);
+            if (*opt == '-') {
+                /* Bad option */
+                goto wrongNumArgs;
+            }
+            break;
+        }
+    }
+    if (argc - i < 2) {
+        goto wrongNumArgs;
+    }
+
+    pattern = Jim_GetString(argv[i], NULL);
+    regex = compile_regexp(interp, pattern, regcomp_flags);
+    if (regex == NULL) {
+        return JIM_ERR;
+    }
+
+    source_str = Jim_GetString(argv[i + 1], &source_len);
+
+    num_vars = argc - i - 2;
+
+    if (opt_inline) {
+        if (num_vars) {
+            Jim_SetResultString(interp, "regexp match variables not allowed when using -inline", -1);
+            result = JIM_ERR;
+            goto done;
+        }
+        /* REVISIT: Ugly! */
+        num_vars = 100;
+    }
+
+    pmatch = Jim_Alloc((num_vars + 1) * sizeof(*pmatch));
+
+    /* If an offset has been specified, adjust for that now.
+     * If it points past the end of the string, point to the terminating null
+     */
+    if (offset) {
+        if (offset > source_len) {
+            source_str += source_len;
+        } else if (offset > 0) {
+            source_str += offset;
+        }
+    }
+
+    if (opt_inline) {
+        resultListObj = Jim_NewListObj(interp, NULL, 0);
+    }
+
+    next_match:
+    match = regexec(regex, source_str, num_vars + 1, pmatch, 0);
+    if (match >= REG_BADPAT) {
+        char buf[100];
+        regerror(match, regex, buf, sizeof(buf));
+        Jim_SetResultString(interp, "", 0);
+        Jim_AppendStrings(interp, Jim_GetResult(interp), "error while matching pattern: ", buf, NULL);
+        result = JIM_ERR;
+        goto done;
+    }
+
+    if (match == REG_NOMATCH) {
+        goto done;
+    }
+
+    num_matches++;
+
+    if (opt_all && !opt_inline) {
+        /* Just count the number of matches, so skip the substitution h*/
+        goto try_next_match;
+    }
+
+    /*
+     * If additional variable names have been specified, return
+     * index information in those variables.
+     */
+
+    //fprintf(stderr, "source_str=%s, [0].rm_eo=%d\n", source_str, pmatch[0].rm_eo);
+
+    j = 0;
+    for (i += 2; opt_inline ? pmatch[j].rm_so != -1 : i < argc; i++, j++) {
+        Jim_Obj *resultObj;
+
+        if (opt_indices) {
+            resultObj = Jim_NewListObj(interp, NULL, 0);
+        }
+        else {
+            resultObj = Jim_NewStringObj(interp, "", 0);
+        }
+
+        if (pmatch[j].rm_so == -1) {
+            if (opt_indices) {
+                Jim_ListAppendElement(interp, resultObj, Jim_NewIntObj(interp, -1));
+                Jim_ListAppendElement(interp, resultObj, Jim_NewIntObj(interp, -1));
+            }
+        } else {
+            int len = pmatch[j].rm_eo - pmatch[j].rm_so;
+            if (opt_indices) {
+                Jim_ListAppendElement(interp, resultObj, Jim_NewIntObj(interp, offset + pmatch[j].rm_so));
+                Jim_ListAppendElement(interp, resultObj, Jim_NewIntObj(interp, offset + pmatch[j].rm_so + len - 1));
+            } else {
+                Jim_AppendString(interp, resultObj, source_str + pmatch[j].rm_so, len);
+            }
+        }
+
+        if (opt_inline) {
+            Jim_ListAppendElement(interp, resultListObj, resultObj);
+        }
+        else {
+            /* And now set the result variable */
+            result = Jim_SetVariable(interp, argv[i], resultObj);
+
+            if (result != JIM_OK) {
+                Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
+                Jim_AppendStrings(interp, Jim_GetResult(interp), "couldn't set variable \"", Jim_GetString(argv[i], NULL), "\"", NULL);
+                Jim_FreeObj(interp, resultObj);
+                break;
+            }
+        }
+    }
+
+    try_next_match:
+    if (opt_all && pattern[0] != '^' && *source_str) {
+        if (pmatch[0].rm_eo) {
+            source_str += pmatch[0].rm_eo;
+        }
+        else {
+            source_str++;
+        }
+        if (*source_str) {
+            goto next_match;
+        }
+    }
+
+    done:
+    if (result == JIM_OK) {
+        if (opt_inline) {
+            Jim_SetResult(interp, resultListObj);
+        }
+        else {
+            Jim_SetIntResult(interp, num_matches);
+        }
+    }
+
+    Jim_Free(pmatch);
+    regfree(regex);
+    Jim_Free(regex);
+    return result;
+}
+
+#define MAX_SUB_MATCHES 10
+
+int Jim_RegsubCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+{
+    int regcomp_flags = 0;
+    int opt_all = 0;
+    long offset = 0;
+    regex_t *regex;
+    const char *p;
+    int result = JIM_ERR;
+    regmatch_t pmatch[MAX_SUB_MATCHES + 1];
+    int num_matches = 0;
+
+    int i;
+    Jim_Obj *varname;
+    Jim_Obj *resultObj;
+    const char *source_str;
+    int source_len;
+    const char *replace_str;
+    const char *pattern;
+
+    if (argc < 5) {
+        wrongNumArgs:
+        Jim_WrongNumArgs(interp, 1, argv, "?-nocase? ?-all? exp string subSpec varName");
+        return JIM_ERR;
+    }
+
+    for (i = 1; i < argc; i++) {
+        if (Jim_CompareStringImmediate(interp, argv[i], "-nocase")) {
+            regcomp_flags |= REG_ICASE;
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "-line")) {
+            regcomp_flags |= REG_NEWLINE;
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "-all")) {
+            opt_all = 1;
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "-start")) {
+            if (++i == argc) {
+                goto wrongNumArgs;
+            }
+            if (Jim_GetLong(interp, argv[i], &offset) != JIM_OK) {
+                return JIM_ERR;
+            }
+        }
+        else if (Jim_CompareStringImmediate(interp, argv[i], "--")) {
+            i++;
+            break;
+        }
+        else {
+            const char *opt = Jim_GetString(argv[i], NULL);
+            if (*opt == '-') {
+                /* Bad option */
+                goto wrongNumArgs;
+            }
+            break;
+        }
+    }
+    if (argc - i != 4) {
+        goto wrongNumArgs;
+    }
+
+    pattern = Jim_GetString(argv[i], NULL);
+    regex = compile_regexp(interp, pattern, regcomp_flags);
+    if (regex == NULL) {
+        return JIM_ERR;
+    }
+
+    source_str = Jim_GetString(argv[i + 1], &source_len);
+    replace_str = Jim_GetString(argv[i + 2], NULL);
+    varname = argv[i + 3];
+
+    /* Create the result string */
+    resultObj = Jim_NewStringObj(interp, "", 0);
+
+    /* If an offset has been specified, adjust for that now.
+     * If it points past the end of the string, point to the terminating null
+     */
+    if (offset) {
+        if (offset > source_len) {
+            offset = source_len;
+        } else if (offset < 0) {
+            offset = 0;
+        }
+    }
+
+    /* Copy the part before -start */
+    Jim_AppendString(interp, resultObj, source_str, offset);
+
+    /*
+     * The following loop is to handle multiple matches within the
+     * same source string;  each iteration handles one match and its
+     * corresponding substitution.  If "-all" hasn't been specified
+     * then the loop body only gets executed once.
+     */
+
+    for (p = source_str + offset; *p != 0; ) {
+        const char *src;
+        int match = regexec(regex, p, MAX_SUB_MATCHES, pmatch, 0);
+        if (match >= REG_BADPAT) {
+            char buf[100];
+            regerror(match, regex, buf, sizeof(buf));
+            Jim_SetResultString(interp, "", 0);
+            Jim_AppendStrings(interp, Jim_GetResult(interp), "error while matching pattern: ", buf, NULL);
+            goto done;
+        }
+        if (match == REG_NOMATCH) {
+            break;
+        }
+
+        num_matches++;
+
+        /*
+         * Copy the portion of the source string before the match to the
+         * result variable.
+         */
+        Jim_AppendString(interp, resultObj, p, pmatch[0].rm_so);
+
+        /*
+         * Append the subSpec (replace_str) argument to the variable, making appropriate
+         * substitutions.  This code is a bit hairy because of the backslash
+         * conventions and because the code saves up ranges of characters in
+         * subSpec to reduce the number of calls to Jim_SetVar.
+         */
+    
+        for (src = replace_str; *src; src++) {
+            int index;
+            int c = *src;
+
+            if (c == '&') {
+                index = 0;
+            }
+            else if (c == '\\') {
+                c = *++src;
+                if ((c >= '0') && (c <= '9')) {
+                    index = c - '0';
+                }
+                else if ((c == '\\') || (c == '&')) {
+                    Jim_AppendString(interp, resultObj, src, 1);
+                    continue;
+                }
+                else {
+                    Jim_AppendString(interp, resultObj, src - 1, 2);
+                    continue;
+                }
+            }
+            else {
+                Jim_AppendString(interp, resultObj, src, 1);
+                continue;
+            }
+            if ((index < MAX_SUB_MATCHES) && pmatch[index].rm_so != -1 && pmatch[index].rm_eo != -1) {
+                Jim_AppendString(interp, resultObj, p + pmatch[index].rm_so, pmatch[index].rm_eo - pmatch[index].rm_so);
+            }
+        }
+
+        p += pmatch[0].rm_eo;
+
+        if (!opt_all || pmatch[0].rm_eo == 0 || pattern[0] == '^') {
+            /* If we are doing a single match, or we haven't moved with this match
+             * or this is an anchored match, we stop */
+            break;
+        }
+    }
+
+    /*
+     * Copy the portion of the string after the last match to the
+     * result variable.
+     */
+    Jim_AppendString(interp, resultObj, p, -1);
+
+    /* And now set the result variable */
+    result = Jim_SetVariable(interp, varname, resultObj);
+
+    if (result == JIM_OK) {
+        Jim_SetIntResult(interp, num_matches);
+    }
+    else {
+        Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
+        Jim_AppendStrings(interp, Jim_GetResult(interp), "couldn't set variable \"", Jim_GetString(varname, NULL), "\"", NULL);
+        Jim_FreeObj(interp, resultObj);
+    }
+
+    done:
+    regfree(regex);
+    Jim_Free(regex);
+    return result;
+}
+
+int Jim_regexpInit(Jim_Interp *interp)
+{
+        if (Jim_PackageProvide(interp, "regexp", "1.0", JIM_ERRMSG) != JIM_OK) {
+                return JIM_ERR;
+        }
+        Jim_CreateCommand(interp, "regexp", Jim_RegexpCmd, NULL, NULL);
+        Jim_CreateCommand(interp, "regsub", Jim_RegsubCmd, NULL, NULL);
+        return JIM_OK;
+}
diff --git a/jim.h b/jim.h
index c6d7fa3..014100c 100644
--- a/jim.h
+++ b/jim.h
@@ -813,7 +813,7 @@ JIM_EXPORT int Jim_DeleteAssocData(Jim_Interp *interp, const char *key);
 JIM_EXPORT int Jim_PackageProvide (Jim_Interp *interp,
         const char *name, const char *ver, int flags);
 JIM_EXPORT const char * Jim_PackageRequire (Jim_Interp *interp,
-        const char *name, const char *ver, int flags);
+        const char *name, int flags);
 
 /* error messages */
 JIM_EXPORT void Jim_PrintErrorMessage (Jim_Interp *interp);
@@ -822,16 +822,15 @@ JIM_EXPORT void Jim_PrintErrorMessage (Jim_Interp *interp);
 JIM_EXPORT int Jim_InteractivePrompt (Jim_Interp *interp);
 
 /* Misc */
-void Jim_InitStaticExtensions(Jim_Interp *interp);
+JIM_EXPORT int Jim_InitStaticExtensions(Jim_Interp *interp);
 JIM_EXPORT void Jim_Panic (Jim_Interp *interp, const char *fmt, ...);
-int Jim_StringToWide(const char *str, jim_wide *widePtr, int base);
+JIM_EXPORT int Jim_StringToWide(const char *str, jim_wide *widePtr, int base);
 
 /* jim-load.c */
-int Jim_LoadLibrary(Jim_Interp *interp, const char *pathName);
-
+JIM_EXPORT int Jim_LoadLibrary(Jim_Interp *interp, const char *pathName);
 
 /* jim-aio.c */
-FILE *Jim_AioFilehandle(Jim_Interp *interp, Jim_Obj *command);
+JIM_EXPORT FILE *Jim_AioFilehandle(Jim_Interp *interp, Jim_Obj *command);
 
 #ifdef __cplusplus
 }
diff --git a/jimsh.c b/jimsh.c
index 9ce4e7f..eb63706 100644
--- a/jimsh.c
+++ b/jimsh.c
@@ -130,7 +130,9 @@ int main(int argc, char *const argv[])
     Jim_RegisterCoreCommands(interp);
 
     /* Register static extensions */
-    Jim_InitStaticExtensions(interp);
+    if (Jim_InitStaticExtensions(interp) != JIM_OK) {
+        Jim_PrintErrorMessage(interp);
+    }
 
     /* Append the path where the executed Jim binary is contained
      * in the jim_libpath list. */
diff --git a/make-c-ext b/make-c-ext
index 80a14b2..4d3ae31 100644
--- a/make-c-ext
+++ b/make-c-ext
@@ -22,9 +22,6 @@ foreach file $argv {
 	set rootname [file rootname $tmp]
 	set outfile jim-$rootname.c
 	puts "$file -> $outfile"
-	if {[file exists $outfile]} {
-		error "Already exists: $outfile"
-	}
 	set f [open $file]
 	set str [read $f]
 	close $f
diff --git a/make-load-extensions.sh b/make-load-extensions.sh
index a03a472..3ad0934 100644
--- a/make-load-extensions.sh
+++ b/make-load-extensions.sh
@@ -7,11 +7,11 @@ shift
 echo '#include "jim.h"'
 for i in "$@"; do
 	name=`echo $i | sed -e 's@.*/\(.*\).c@\1@'`
-	echo "extern void Jim_${name}Init(Jim_Interp *interp);"
+	echo "extern int Jim_${name}Init(Jim_Interp *interp);"
 done
-echo "void Jim_InitStaticExtensions(Jim_Interp *interp) {"
+echo "int Jim_InitStaticExtensions(Jim_Interp *interp) {"
 for i in "$@"; do
 	name=`echo $i | sed -e 's@.*/\(.*\).c@\1@'`
-	echo "Jim_${name}Init(interp);"
+	echo "if (Jim_${name}Init(interp) != JIM_OK) return JIM_ERR;"
 done
 echo "}"