.github/workflows/deploy.yml

@@ -1,34 +0,0 @@
-name: Deploy
-
-on: [ push, workflow_dispatch ]
-
-jobs:
-
-  affected:
-    uses: lunarmodules/.github/.github/workflows/list_affected_rockspecs.yml@main
-
-  build:
-    needs: affected
-    if: ${{ needs.affected.outputs.rockspecs }}
-    uses: lunarmodules/.github/.github/workflows/test_build_rock.yml@main
-    with:
-      rockspecs: ${{ needs.affected.outputs.rockspecs }}
-
-  upload:
-    needs: [ affected, build ]
-    # Only run upload if:
-    # 1. We are on the canonical repository (no uploads from forks)
-    # 2. The current commit is either tagged or on the default branch (the workflow will upload dev/scm rockspecs any
-    #    time they are touched, tagged ones whenever the edited rockspec and tag match)
-    # 3. Some rockspecs were changed — this implies the commit changing the rockspec is the same one that gets tagged
-    if: >-
-      ${{
-        github.repository == 'lunarmodules/lua-iconv' &&
-        ( github.ref_name == 'master' || startsWith(github.ref, 'refs/tags/') ) &&
-        needs.affected.outputs.rockspecs
-      }}
-    uses: lunarmodules/.github/.github/workflows/upload_to_luarocks.yml@main
-    with:
-      rockspecs: ${{ needs.affected.outputs.rockspecs }}
-    secrets:
-      apikey: ${{ secrets.LUAROCKS_APIKEY }}

.github/workflows/luacheck.yml

@@ -1,13 +0,0 @@
-name: Luacheck
-
-on: [push, pull_request]
-
-jobs:
-
-  luacheck:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Luacheck
-        uses: lunarmodules/luacheck@v1

.gitignore

@@ -1,4 +0,0 @@
-*.lo
-*.o
-*.so
-*.tar.gz

CHANGELOG.md

@@ -1,13 +0,0 @@
-# Changelog
-
-### 7.1.0 released 30-Oct-2023
-
-* fix: rockspecs for MacOS
-
-* feat: `iconv.new` now returns a second value in case of errors
-
----
-
-### 7.0.0 released 17-Oct-2023
-
-* First release from its new Lunar Modules home

COPYING

@@ -1,4 +1,4 @@
-Lua-iconv is (c) 2005-10 Alexandre Erwin Ittner <alexandre@ittner.com.br>
+Lua-iconv is (c) 2005-06 Alexandre Erwin Ittner <aittner@gmail.com>
 
 Lua-iconv is copyrighted free software: it can be used for both academic
 and commercial purposes at absolutely no cost. There are no royalties

Makefile

@@ -1,5 +1,5 @@
 # luaiconv - Performs character set conversions in Lua
-# (c) 2005-10 Alexandre Erwin Ittner <alexandre@ittner.com.br>
+# (c) 2005-08 Alexandre Erwin Ittner <aittner@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -28,28 +28,21 @@
 
 # Gives a nice speedup, but also spoils debugging on x86. Comment out this
 # line when debugging.
-OMIT_FRAME_PTR = -fomit-frame-pointer
+OMIT_FRAME_POINTER = -fomit-frame-pointer
 
-LUABIN = lua
+# Name of .pc file. "lua5.1" on Debian/Ubuntu
-LUAPKG = lua5.2
+LUAPKG = lua5.1
-CFLAGS = `pkg-config $(LUAPKG) --cflags` -fPIC -O3 -Wall $(OMIT_FRAME_PTR)
+CFLAGS = `pkg-config $(LUAPKG) --cflags` -O3 -Wall
-LFLAGS = -shared
+LFLAGS = -shared $(OMIT_FRAME_POINTER)
+INSTALL_PATH = `pkg-config $(LUAPKG) --variable=INSTALL_CMOD`
 
-INSTALL_PATH = `$(LUABIN) -e'                           \
+## If your system doesn't have pkg-config, comment out the previous lines and
-    for dir in package.cpath:gmatch("(/[^?;]+)?") do    \
+## uncomment and change the following ones according to your building
-        io.write(dir)                                   \
+## enviroment.
-        os.exit(0)                                      \
-    end                                                 \
-    os.exit(1)                                          \
-'`
 
-## If your system doesn't have pkg-config or if you do not want to get the
+#CFLAGS = -I/usr/include/lua5.1/ -O3 -Wall
-## install path from Lua, comment out the previous lines and uncomment and
+#LFLAGS = -shared $(OMIT_FRAME_POINTER)
-## change the following ones according to your building environment.
+#INSTALL_PATH = /usr/lib/lua/5.1
-
-#CFLAGS = -I/usr/local/include/ -fPIC -O3 -Wall $(OMIT_FRAME_PTR)
-#LFLAGS = -shared
-#INSTALL_PATH = /usr/local/lib/lua/5.2/
 
 
 all: iconv.so
@@ -62,11 +55,11 @@ iconv.so: iconv.lo
 
 install: iconv.so
 	make test
-	install -D -s iconv.so $(DESTDIR)/$(INSTALL_PATH)/iconv.so
+	install -D -s iconv.so $(INSTALL_PATH)/iconv.so
 
 clean:
 	$(RM) iconv.so iconv.lo
 
 test: iconv.so test_iconv.lua
-	$(LUABIN) test_iconv.lua
+	lua test_iconv.lua
 

README

@@ -0,0 +1,127 @@
+
+        Lua-iconv: performs character set conversions in Lua
+     (c) 2005-08 Alexandre Erwin Ittner <aittner@gmail.com>
+           Project page: http://lua-iconv.luaforge.net/
+
+
+=== INTRODUCTION ===
+
+Lua-iconv is POSIX 'iconv' binding for the Lua Programming Language. The
+iconv library converts a sequence of characters from one codeset into a
+sequence of corresponding characters in another codeset. The codesets
+are those specified in the iconv.new() call that returned the conversion
+descriptor, cd.
+
+Lua-iconv r4 *requires* Lua 5.1. If you are using Lua 5.0, please use the
+first release (lua-iconv-r1).
+
+Details regarding iconv may be obtained from:
+http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html
+
+
+
+=== LICENSE ===
+
+Lua-iconv is (c) 2005-08 Alexandre Erwin Ittner <aittner@gmail.com>
+
+Lua-iconv is copyrighted free software: it can be used for both academic
+and commercial purposes at absolutely no cost. There are no royalties
+or GNU-like "copyleft" restrictions. The legal details are below:
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject
+   to the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL THE AUTHOR OR COPYRIGHT HOLDER BE LIABLE FOR ANY
+   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   If you use this package in a product, an acknowledgment in the product
+   documentation would be greatly appreciated (but it is not required).
+
+
+
+=== DOWNLOAD, COMPILATION AND INSTALLATION ===
+
+Lua-iconv can be obtained from its LuaForge project page:
+http://lua-iconv.luaforge.net/
+
+Lua-iconv must be compiled as a shared object and loaded by the Lua
+interpreter using the new module system in Lua 5.1. 
+
+If you are using a system with pkg-config (as many Linux distributions and
+Unix flavors) just fire up your favourite shell, untar the distribution
+package and type, as root, within the program directory:
+
+    make install
+
+The library will be compiled and installed on the in the correct path (that
+is defined in lua5.1.pc.
+
+Compiling on systems without pkg-config requires manual changes on the
+Makefile.
+
+
+
+=== LOADING AND INITIALIZATION ===
+
+Lua-iconv is a shared library that exports a single function called
+luaopen_iconv that must be called by the Lua interpreter. Lua 5.1
+uses the new package system, so you can simply do a
+
+    require "iconv"
+
+call to load up the library (that, of course, must be installed in a
+directory from package.cpath).
+
+
+
+=== USAGE ===
+
+cd = iconv.new(to, from)
+cd = iconv.open(to, from)
+
+    Opens a new conversion descriptor, from the 'from' charset to the
+    'to' charset. Concatenating "//TRANSLIT" to the first argument will
+    enable character transliteration and concatenating "//IGNORE" to
+    the first argument will cause iconv to ignore any invalid characters
+    found in the input string.
+
+    This function returns a new converter or nil on error.
+
+
+nstr, err = cd:iconv(str)
+
+    Converts the 'str' string to the desired charset. This method always
+    returns two arguments: the converted string and an error code, which
+    may have any of the following values:
+
+    nil
+        No error. Conversion was succeful.
+
+    iconv.ERROR_NO_MEMORY
+        Failed to allocate enough memory in the conversion process.
+
+    iconv.ERROR_INVALID
+        An invalid character was found in the input sequence.
+
+    iconv.ERROR_INCOMPLETE
+        An incomplete character was found in the input sequence.
+        
+    iconv.ERROR_UNKNOWN
+        There was an unknown error.
+
+
+=== EOF ===
+

README.md

@@ -1,145 +0,0 @@
-# Lua-iconv
-
-Perform character set conversions in Lua
-
-(c) 2005-11 Alexandre Erwin Ittner <alexandre@ittner.com.br>
-
-
-## Introduction
-
-Lua-iconv provides POSIX 'iconv' bindings for the Lua Programming Language.
-The iconv library converts a sequence of characters from one codeset into a sequence of corresponding characters in another codeset.
-The codesets are those specified in the `iconv.new()` call that returned the conversion descriptor, `cd`.
-
-Lua-iconv 7 *requires* Lua 5.1 or Lua 5.2. For Lua 5.0, use the first release (lua-iconv-r1).
-
-Details on iconv may be obtained in the [Open Group's interface definition](http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html).
-
-
-## Download and installation
-
-Lua-iconv can be obtained from [its GitHub project page](https://github.com/lunarmodules/lua-iconv), from a LuaRocks server, or from some Linux distributions which already provide it (eg. Debian).
-
-Unless you downloaded a compiled package, you must build the library for your system.
-If you have LuaRocks installed, all the process is automatic; just fire up your favourite shell and type, as root:
-
-```console
-luarocks install lua-iconv
-```
-
-and the package will be downloaded from a rock server, installed and configured.
-Otherwise, you must compile and install the package.
-In a system with pkg-config (as many Linux distributions and Unix flavors) open a shell, untar the distribution package and, within the program directory, type:
-
-```console
-make install
-```
-
-as root.
-The library will be compiled and installed on the in the correct path (which is defined in lua5.x.pc).
-Compiling on systems without pkg-config requires manual changes in the Makefile (this includes Windows).
-
-
-## Loading and initialization
-
-Lua-iconv is a shared library that must be loaded in the Lua interpreter before use.
-You can simply do a
-
-```lua
-local iconv = require("iconv")
-```
-
-call to load up the library (that, of course, must be installed in a directory from `package.cpath`).
-
-
-## API documentation
-
-```lua
-cd, err = iconv.new(to, from)
-cd, err = iconv.open(to, from)
-```
-
-Opens a new conversion descriptor, from the 'from' charset to the 'to' charset.
-Concatenating "//TRANSLIT" to the first argument will enable character transliteration and concatenating "//IGNORE" to the first argument will cause iconv to ignore any invalid characters found in the input string.
-
-The error code, may have any of the following values:
-
-* `nil`
-
-    No error. Creation was successful.
-
-* `iconv.ERROR_INVALID`
-
-    The conversion from `from` to `to` is not supported by the implementation.
-
-* `iconv.ERROR_UNKNOWN`
-
-    There was an unknown error.
-
-
-This function returns a new converter or nil+err on error.
-
-
-```lua
-nstr, err = cd:iconv(str)
-```
-
-Converts the 'str' string to the desired charset.
-This method always returns two arguments: the converted string and an error code, which may have any of the following values:
-
-* `nil`
-
-    No error. Conversion was successful.
-
-* `iconv.ERROR_NO_MEMORY`
-
-    Failed to allocate enough memory in the conversion process.
-
-* `iconv.ERROR_INVALID`
-
-    An invalid character was found in the input sequence.
-
-* `iconv.ERROR_INCOMPLETE`
-
-    An incomplete character was found in the input sequence.
-
-* `iconv.ERROR_FINALIZED`
-
-    Trying to use an already-finalized converter. This usually means
-    that the user was tweaking the garbage collector private methods.
-
-* `iconv.ERROR_UNKNOWN`
-
-    There was an unknown error.
-
-
-## License
-
-Lua-iconv is copyrighted free software: it can be used for both academic
-and commercial purposes at absolutely no cost. There are no royalties
-or GNU-like "copyleft" restrictions. The legal details are below:
-
-   Lua-iconv is (c) 2005-11 Alexandre Erwin Ittner
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject
-   to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-   IN NO EVENT SHALL THE AUTHOR OR COPYRIGHT HOLDER BE LIABLE FOR ANY
-   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-   If you use this package in a product, an acknowledgment in the product
-   documentation would be greatly appreciated (but it is not required).
-

debian/Makefile.Debian.conf

@@ -0,0 +1,34 @@
+PKG_NAME=iconv
+
+### things relative to the C library part
+CLIB_CFLAGS=
+CLIB_LDFLAGS=
+CLIB_OBJS=luaiconv.lo
+VERSION_INFO=0:0:0
+
+### things relative to the lua library part
+LUA_HEADER=
+LUA_SOURCES=
+LUA_MODNAME=iconv
+LUA_TEST=test_iconv.lua
+
+### this part is relative to pkg-config
+PKG_VERSION=$(shell dpkg-parsechangelog|grep ^Ver|cut -d ' ' -f 2|cut -d '-' -f 1)
+PKG_LIBS_PRIVATE=
+PKG_URL=http://lua-iconv.luaforge.net/
+PKG_REQUIRES=
+PKG_CONFLICTS=
+
+### In addition, to gather flexibility, you can set these hooks
+### (called in this order)
+pre-all-hook::
+post-all-hook::
+pre-test-hook::
+pre-lua-dynamic-test-hook::
+pre-dynamic-link-hook::
+pre-app-dynamic-test-hook::
+pre-static-link-hook::
+pre-app-static-test-hook::
+post-test-hook::
+pre-install-hook::
+post-install-hook::

debian/changelog

@@ -1,28 +1,13 @@
-lua-iconv (7-1) unstable; urgency=low
+lua-iconv (0.r4-1) unstable; urgency=low
 
-  * Update package for lua-iconv 7 + Lua-5.2
+  * New Debian packages according to the Debian Lua policy.
 
- -- Alexandre Erwin Ittner <alexandre@ittner.com.br>  Sun, 06 May 2012 22:35:22 -0300
+ -- Alexandre Erwin Ittner <aittner@gmail.com>  Sun, 11 May 2008 12:30:00 -0300
 
-lua-iconv (6-3) unstable; urgency=low
 
-  * debian/control: Conflicts, Provides, and Replaces lua-iconv
+lua-iconv (0.r3-1) unstable; urgency=low
-    (Closes: #557052)
 
- -- Jon Bernard <jbernard@debian.org>  Fri, 20 Nov 2009 18:58:12 -0600
+  * First release in .deb format.
 
-lua-iconv (6-2) unstable; urgency=low
+ -- Alexandre Erwin Ittner <aittner@netuno.com.br>  Wed,  3 Feb 2007 00:20:09 -0200
 
-  * debian/control: update package name to conform to lua standard
-    (Closes: #544958)
-  * debian/control: add Vcs fields
-  * debian/control: update package description
-  * debian/watch: look for new upstream releases on luaforge (Closes: #544960)
-
- -- Jon Bernard <jbernard@debian.org>  Wed, 28 Oct 2009 11:58:00 -0400
-
-lua-iconv (6-1) unstable; urgency=low
-
-  * Initial release (Closes: #540298)
-
- -- Jon Bernard <jbernard@debian.org>  Sun, 02 Aug 2009 13:50:50 -0400

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,21 +1,26 @@
 Source: lua-iconv
 Section: interpreters
 Priority: optional
-Maintainer: Jon Bernard <jbernard@debian.org>
+Maintainer: Alexandre Erwin Ittner <aittner@gmail.com>
-Build-Depends: debhelper (>= 7), liblua5.2-dev, lua5.2, pkg-config
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, lua5.1-policy-dev (>= 8)
-Standards-Version: 3.8.2
+Standards-Version: 3.7.2
-Vcs-Git: https://github.com/ittner/lua-iconv.git
+XS-X-Vcs-svn: svn://svn.debian.org/pkg-lua/packages/lua-iconv
-Vcs-Browser: https://github.com/ittner/lua-iconv.git
-Homepage: http://ittner.github.com/lua-iconv/
 
-Package: liblua5.2-iconv0
+Package: liblua5.1-iconv
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
-Recommends: lua5.2
+Description: iconv bindings for the Lua Programming Language
-Conflicts: lua-iconv
+  Lua-iconv is POSIX 'iconv' binding for the Lua Programming Language. It
-Provides: lua-iconv
+  converts a sequence of characters from one codeset into a sequence of
-Replaces: lua-iconv
-Description: iconv bindings for the Lua programming language
- This package provides POSIX 'iconv' bindings for the Lua programming language.
- It converts a sequence of characters from one codeset into a sequence of
   corresponding characters in another codeset.
+  Homepage: <http://lua-iconv.luaforge.net/>
+
+Package: liblua5.1-iconv-dev
+Architecture: any
+Depends: liblua5.1-iconv (= ${Source-Version})
+Description: iconv development files for the lua language version 5.1
+ This package contains the development files of the iconv lua5.1 bindings,
+ useful to create a statically linked binary (like a C application or a
+ standalone lua interpreter).
+ Documentation is also shipped within this package.
+ Homepage: <http://lua-iconv.luaforge.net/>

debian/copyright

@@ -1,42 +1,23 @@
-This package was debianized by Jon Bernard <jbernard@debian.org> on
+lua-iconv (c) 2005-2007 Alexandre Erwin Ittner
-Sun, 02 Aug 2009 13:50:50 -0400.
 
-It was downloaded from http://luaforge.net/frs/?group_id=131&release_id=1440
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-Upstream Author:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-    Alexandre Erwin Ittner <alexandre@ittner.com.br>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-Copyright:
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-
+IN NO EVENT SHALL THE AUTHOR OR COPYRIGHT HOLDER BE LIABLE FOR ANY
-    Copyright (C) 2005-09 Alexandre Erwin Ittner
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-License:
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHOR OR COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
 
 If you use this package in a product, an acknowledgment in the product
 documentation would be greatly appreciated (but it is not required).
-
-The Debian packaging is:
-
-    Copyright (C) 2009 Jon Bernard <jbernard@debian.org>
-
-and is licensed under the GPL version 3,
-see `/usr/share/common-licenses/GPL-3'.

debian/examples

@@ -1 +0,0 @@
-test_iconv.lua

debian/rules

@@ -1,3 +1,15 @@
 #!/usr/bin/make -f
-%:
+
-	dh $@
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
+DEB_MAKE_BUILD_TARGET := all -f Makefile.Debian
+DEB_MAKE_TEST_TARGET := test -f Makefile.Debian
+DEB_MAKE_CLEAN_TARGET := clean -f Makefile.Debian
+DEB_MAKE_INSTALL_TARGET := install -f Makefile.Debian DESTDIR=$(DEB_DESTDIR)
+DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
+pre-build::
+	lua5.1-policy-apply
+clean::
+	lua5.1-policy-apply --reverse

debian/watch

@@ -0,0 +1,5 @@
+# test this watch file using:
+# uscan --watchfile debian/watch --upstream-version 0.0.1 --package lua-iconv
+#
+version=3
+http://luaforge.net/frs/download.php/\d+/lua-iconv-([\d\.]*).tar.gz

lua-iconv-dev-1.rockspec

@@ -1,62 +0,0 @@
-local package_name = "lua-iconv"
-local package_version = "dev"
-local rockspec_revision = "1"
-local github_account_name = "lunarmodules"
-local github_repo_name = package_name
-
-package = package_name
-version = package_version.."-"..rockspec_revision
-
-source = {
-   url = "git+https://github.com/"..github_account_name.."/"..github_repo_name..".git",
-   branch = (package_version == "dev") and "master" or nil,
-   tag = (package_version ~= "dev") and ("v" .. package_version) or nil,
-}
-
-description = {
-   summary = "Lua binding to the iconv",
-   detailed = [[
-      Lua binding to the POSIX 'iconv' library, which converts a sequence of
-      characters from one codeset into a sequence of corresponding characters
-      in another codeset.
-      ]],
-   license = "MIT/X11",
-   homepage = "https://github.com/"..github_account_name.."/"..github_repo_name,
-}
-
-dependencies = {
-   "lua >= 5.1",
-}
-
-external_dependencies = {
-   ICONV = {
-      header = "iconv.h"
-   }
-}
-
-build = {
-   type = "builtin",
-   modules = {
-      iconv = {
-          sources = {"luaiconv.c"},
-          incdirs = {"$(ICONV_INCDIR)"},
-          libdirs = {"$(ICONV_LIBDIR)"}
-      }
-   },
-   platforms = {
-      cygwin = {
-         modules = {
-            iconv = {
-               libraries = {"iconv"}
-            }
-         }
-      },
-      macosx = {
-         modules = {
-           iconv = {
-              libraries = {"iconv"}
-           }
-        }
-     },
-   }
-}

lua-iconv-r5-1.rockspec

@@ -3,11 +3,10 @@
 -- rockspec based uppon the file provided by DarkGod <darkgod at net-core.org>
 
 package = "lua-iconv"
-version = "6-1"
+version = "r5-1"
 
 source = {
-  url = "http://luaforge.net/frs/download.php/4181/lua-iconv-6.tar.gz",
+  url = "http://luaforge.net/frs/download.php/3374/lua-iconv-r4.tar.gz",
-  md5 = "2cec334c5786d7c420a53003d6cb93d4"
 }
 
 description = {
@@ -32,21 +31,12 @@ external_dependencies = {
 }
 
 build = {
-   type = "builtin",
+   type = "make",
-   modules = {
+   variables = {
-      iconv = {
+      CFLAGS = "-I$(LUA_INCDIR) -O3 -Wall",
-          sources = {"luaiconv.c"},
+      LFLAGS = "$(LIBFLAG)",
-          incdirs = {"$(ICONV_INCDIR)"},
+      LIBS = "",
-          libdirs = {"$(ICONV_LIBDIR)"}
+      INSTALL_PATH = "$(LIBDIR)"
-      }
-   },
-   platforms = {
-      cygwin = {
-         modules = {
-            iconv = {
-               libraries = {"iconv"}
-            }
-         }
-      }
    }
 }
+

luaiconv.c

@@ -1,6 +1,6 @@
 /*
  * luaiconv - Performs character set conversions in Lua
- * (c) 2005-11 Alexandre Erwin Ittner <alexandre@ittner.com.br>
+ * (c) 2005-08 Alexandre Erwin Ittner <aittner@gmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -24,6 +24,7 @@
  * If you use this package in a product, an acknowledgment in the product
  * documentation would be greatly appreciated (but it is not required).
  *
+ * $Id$
  *
  */
 
@@ -36,143 +37,125 @@
 #include <errno.h>
 
 #define LIB_NAME                "iconv"
-#define LIB_VERSION             LIB_NAME " 7"
+#define LIB_VERSION             LIB_NAME " r5"
 #define ICONV_TYPENAME          "iconv_t"
 
-#ifdef _WIN32
-#define LUAEXPORT __declspec(dllexport)
-#else
-#define LUAEXPORT __attribute__((visibility("default")))
-#endif
 
+/* Compatibility between Lua 5.1+ and Lua 5.0 */
+#ifndef LUA_VERSION_NUM
+#define LUA_VERSION_NUM 0
+#endif
 #if LUA_VERSION_NUM < 501
- #error "Unsupported Lua version. You must use Lua >= 5.1"
+#define luaL_register(a, b, c) luaL_openlib((a), (b), (c), 0)
-#endif
-
-#if LUA_VERSION_NUM < 502
- #define luaL_newlib(L, f)  { lua_newtable(L); luaL_register(L, NULL, f); }
- #define lua_rawlen(L, i)   lua_objlen(L, i)
 #endif
 
 
-#define BOXPTR(L, p)   (*(void**)(lua_newuserdata(L, sizeof(void*))) = (p))
+/* Emulates lua_(un)boxpointer from Lua 5.0 (don't exists on Lua 5.1) */
-#define UNBOXPTR(L, i) (*(void**)(lua_touserdata(L, i)))
+#define boxptr(L, p)   (*(void**)(lua_newuserdata(L, sizeof(void*))) = (p))
+#define unboxptr(L, i) (*(void**)(lua_touserdata(L, i)))
+
+/* Table assumed on top */
+#define tblseticons(L, c, v)    \
+    lua_pushliteral(L, c);      \
+    lua_pushnumber(L, v);       \
+    lua_settable(L, -3);
+
 
-/* Set a integer constant. Assumes a table in the top of the stack */
-#define TBL_SET_INT_CONST(L, c) {   \
-    lua_pushliteral(L, #c);         \
-    lua_pushnumber(L, c);           \
-    lua_settable(L, -3);            \
-}
 
 #define ERROR_NO_MEMORY     1
 #define ERROR_INVALID       2
 #define ERROR_INCOMPLETE    3
 #define ERROR_UNKNOWN       4
-#define ERROR_FINALIZED     5
 
 
-
+static void push_iconv_t(lua_State *L, iconv_t cd) {
-static void push_iconv_t(lua_State *L, iconv_t cd)
+    boxptr(L, cd);
-{
-    BOXPTR(L, cd);
     luaL_getmetatable(L, ICONV_TYPENAME);
     lua_setmetatable(L, -2);
 }
 
 
-static iconv_t get_iconv_t(lua_State *L, int i)
+static iconv_t get_iconv_t(lua_State *L, int i) {
-{
     if (luaL_checkudata(L, i, ICONV_TYPENAME) != NULL) {
-        iconv_t cd = UNBOXPTR(L, i);
+        iconv_t cd = unboxptr(L, i);
-        return cd;  /* May be NULL. This must be checked by the caller. */
+        if (cd == (iconv_t) NULL)
+            luaL_error(L, "attempt to use an invalid " ICONV_TYPENAME);
+        return cd;
     }
-    luaL_argerror(L, i, lua_pushfstring(L, ICONV_TYPENAME " expected, got %s",
+    luaL_typerror(L, i, ICONV_TYPENAME);
-        luaL_typename(L, i)));
     return NULL;
 }
 
 
-static int Liconv_open(lua_State *L)
+static int Liconv_open(lua_State *L) {
-{
     const char *tocode = luaL_checkstring(L, 1);
     const char *fromcode = luaL_checkstring(L, 2);
     iconv_t cd = iconv_open(tocode, fromcode);
-    if (cd != (iconv_t)(-1)) {
+    if (cd != (iconv_t)(-1))
         push_iconv_t(L, cd);    /* ok */
-        return 1;
-    } else {
-        lua_pushnil(L);         /* error */
-        if (errno == EINVAL)
-            lua_pushnumber(L, ERROR_INVALID);
     else
-            lua_pushnumber(L, ERROR_UNKNOWN);
+        lua_pushnil(L);         /* erro */
-        return 2;
+    return 1;
-    };
 }
 
-/* Use a fixed-size buffer in the stack to avoid a lot of small mallocs
- * and prevent memory fragmentation. This should not be a problem in any
- * contemporary general purpose system but, if you are running in a very
- * limited stack system you may use a smaller buffer, but the luaL_Buffer
- * will compensate this with more reallocs and memcpys.
- */
-#define CONV_BUF_SIZE 256
 
-static int Liconv(lua_State *L)
+static int Liconv(lua_State *L) {
-{
     iconv_t cd = get_iconv_t(L, 1);
-    size_t ibleft = lua_rawlen(L, 2);
+    size_t ibleft = lua_strlen(L, 2);
     char *inbuf = (char*) luaL_checkstring(L, 2);
-    char outbufs[CONV_BUF_SIZE];
+    char *outbuf;
-    char *outbuf = outbufs;
+    char *outbufs;
-    size_t obleft = CONV_BUF_SIZE;
+    size_t obsize = (ibleft > 256) ? ibleft : 256; 
+    size_t obleft = obsize;
     size_t ret = -1;
-    luaL_Buffer b;
+    int hasone = 0;
 
-    if (cd == NULL) {
+    outbuf = (char*) malloc(obsize * sizeof(char));
+    if (outbuf == NULL) {
         lua_pushstring(L, "");
-        lua_pushnumber(L, ERROR_FINALIZED);
+        lua_pushnumber(L, ERROR_NO_MEMORY);
         return 2;
     }
-
+    outbufs = outbuf;
-    luaL_buffinit(L, &b);
 
     do {
         ret = iconv(cd, &inbuf, &ibleft, &outbuf, &obleft);
         if (ret == (size_t)(-1)) {
-            luaL_addlstring(&b, outbufs, CONV_BUF_SIZE - obleft);
+            lua_pushlstring(L, outbufs, obsize - obleft);
+            if (hasone == 1)
+                lua_concat(L, 2);
+            hasone = 1;
             if (errno == EILSEQ) {
-                luaL_pushresult(&b);
                 lua_pushnumber(L, ERROR_INVALID);
+                free(outbufs);
                 return 2;   /* Invalid character sequence */
             } else if (errno == EINVAL) {
-                luaL_pushresult(&b);
                 lua_pushnumber(L, ERROR_INCOMPLETE);
+                free(outbufs);
                 return 2;   /* Incomplete character sequence */
             } else if (errno == E2BIG) {
-                obleft = CONV_BUF_SIZE;
+                obleft = obsize;    
                 outbuf = outbufs;
             } else {
-                luaL_pushresult(&b);
                 lua_pushnumber(L, ERROR_UNKNOWN);
+                free(outbufs);
                 return 2; /* Unknown error */
             }
         }
-    } while (ret == (size_t) -1);
+    } while (ret != (size_t) 0);
 
-    luaL_addlstring(&b, outbufs, CONV_BUF_SIZE - obleft);
+    lua_pushlstring(L, outbufs, obsize - obleft);
-    luaL_pushresult(&b);
+    if (hasone == 1)
-    lua_pushnil(L);
+        lua_concat(L, 2);
-    return 2;   /* Done */
+    free(outbufs);
+    return 1;   /* Done */
 }
 
 
 
 #ifdef HAS_ICONVLIST /* a GNU extension? */
 
-static int push_one(unsigned int cnt, char *names[], void *data)
+static int push_one(unsigned int cnt, char *names[], void *data) {
-{
     lua_State *L = (lua_State*) data;
     int n = (int) lua_tonumber(L, -1);
     int i;
@@ -192,8 +175,7 @@ static int push_one(unsigned int cnt, char *names[], void *data)
 }
 
 
-static int Liconvlist(lua_State *L)
+static int Liconvlist(lua_State *L) {
-{
     lua_newtable(L);
     lua_pushnumber(L, 1);
 
@@ -208,23 +190,17 @@ static int Liconvlist(lua_State *L)
 #endif
 
 
-static int Liconv_close(lua_State *L)
+static int Liconv_close(lua_State *L) {
-{
     iconv_t cd = get_iconv_t(L, 1);
-    if (cd != NULL && iconv_close(cd) == 0) {
+    if (iconv_close(cd) == 0)
-        /* Mark the pointer as freed, preventing interpreter crashes
-           if the user forces __gc to be called twice. */
-        void **ptr = lua_touserdata(L, 1);
-        *ptr = NULL;
         lua_pushboolean(L, 1);  /* ok */
-    }
     else
-        lua_pushnil(L);         /* error, called from __gc, so no need for error messsage */
+        lua_pushnil(L);         /* erro */
     return 1;
 }
 
 
-static const luaL_Reg iconv_funcs[] = {
+static const luaL_reg inconvFuncs[] = {
     { "open",   Liconv_open },
     { "new",    Liconv_open },
     { "iconv",  Liconv },
@@ -235,30 +211,29 @@ static const luaL_Reg iconv_funcs[] = {
 };
 
 
-LUAEXPORT int luaopen_iconv(lua_State *L)
+static const luaL_reg iconvMT[] = {
-{
+    { "__gc", Liconv_close },
-    luaL_newlib(L, iconv_funcs);
+    { NULL, NULL }
+};
 
-    TBL_SET_INT_CONST(L, ERROR_NO_MEMORY);
+
-    TBL_SET_INT_CONST(L, ERROR_INVALID);
+int luaopen_iconv(lua_State *L) {
-    TBL_SET_INT_CONST(L, ERROR_INCOMPLETE);
+    luaL_register(L, LIB_NAME, inconvFuncs);
-    TBL_SET_INT_CONST(L, ERROR_FINALIZED);
+
-    TBL_SET_INT_CONST(L, ERROR_UNKNOWN);
+    tblseticons(L, "ERROR_NO_MEMORY",   ERROR_NO_MEMORY);
+    tblseticons(L, "ERROR_INVALID",     ERROR_INVALID);
+    tblseticons(L, "ERROR_INCOMPLETE",  ERROR_INCOMPLETE);
+    tblseticons(L, "ERROR_UNKNOWN",     ERROR_UNKNOWN);
 
     lua_pushliteral(L, "VERSION");
     lua_pushstring(L, LIB_VERSION);
     lua_settable(L, -3);
 
     luaL_newmetatable(L, ICONV_TYPENAME);
-
     lua_pushliteral(L, "__index");
     lua_pushvalue(L, -3);
     lua_settable(L, -3);
-
+    luaL_openlib(L, NULL, iconvMT, 0);
-    lua_pushliteral(L, "__gc");
-    lua_pushcfunction(L, Liconv_close);
-    lua_settable(L, -3);
-
     lua_pop(L, 1);
 
     return 1;

makestr.lua

@@ -3,6 +3,8 @@ local fp = assert(io.open(arg[1], "rb"))
 local str = assert(fp:read("*a"))
 fp:close()
 
+local i
+local c = 0
 local ostr = "local xxxxxxxxxxx = \""
 for i = 1, string.len(str) do
   ostr = ostr .. "\\" .. string.byte(string.sub(str, i, i+1))

maketargz.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PACKAGE=lua-iconv
-VERSION=7
+VERSION=r5
 
 DIRNAME=$PACKAGE-$VERSION
 TGZNAME=$DIRNAME.tar.gz
@@ -9,7 +9,7 @@ TGZNAME=$DIRNAME.tar.gz
 rm -f $TGZNAME
 mkdir $DIRNAME
 
-cp -r debian $DIRNAME/
+#cp -r debian $DIRNAME/
 #rm -rf $DIRNAME/debian/.svn
 
 cp -r COPYING Makefile README luaiconv.c test_iconv.lua $DIRNAME

rockspecs/lua-iconv-7-1.rockspec

@@ -1,52 +0,0 @@
-
--- Packs lua-iconv into a LuaRock
--- rockspec based uppon the file provided by DarkGod <darkgod at net-core.org>
-
-package = "lua-iconv"
-version = "7-1"
-
-source = {
-  url = "https://github.com/downloads/ittner/lua-iconv/lua-iconv-7.tar.gz",
-  md5 = "8a38b4e6ac8a9290093898793d16fe4b"
-}
-
-description = {
-   summary = "Lua binding to the iconv",
-   detailed = [[
-     Lua binding to the POSIX 'iconv' library, which converts a sequence of
-     characters from one codeset into a sequence of corresponding characters
-     in another codeset.
-   ]],
-   license = "MIT/X11",
-   homepage = "https://github.com/ittner/lua-iconv/"
-}
-
-dependencies = {
-   "lua >= 5.1",
-}
-
-external_dependencies = {
-   ICONV = {
-      header = "iconv.h"
-   }
-}
-
-build = {
-   type = "builtin",
-   modules = {
-      iconv = {
-          sources = {"luaiconv.c"},
-          incdirs = {"$(ICONV_INCDIR)"},
-          libdirs = {"$(ICONV_LIBDIR)"}
-      }
-   },
-   platforms = {
-      cygwin = {
-         modules = {
-            iconv = {
-               libraries = {"iconv"}
-            }
-         }
-      }
-   }
-}

rockspecs/lua-iconv-7.0.0-2.rockspec

@@ -1,51 +0,0 @@
-
--- Packs lua-iconv into a LuaRock
--- rockspec based uppon the file provided by DarkGod <darkgod at net-core.org>
-
-package = "lua-iconv"
-version = "7.0.0-2"
-
-source = {
-  url = "https://github.com/lunarmodules/lua-iconv/archive/v7.0.0/lua-iconv-7.0.0.tar.gz",
-}
-
-description = {
-   summary = "Lua binding to the iconv",
-   detailed = [[
-     Lua binding to the POSIX 'iconv' library, which converts a sequence of
-     characters from one codeset into a sequence of corresponding characters
-     in another codeset.
-   ]],
-   license = "MIT/X11",
-   homepage = "https://github.com/lunarmodules/lua-iconv/"
-}
-
-dependencies = {
-   "lua >= 5.1",
-}
-
-external_dependencies = {
-   ICONV = {
-      header = "iconv.h"
-   }
-}
-
-build = {
-   type = "builtin",
-   modules = {
-      iconv = {
-          sources = {"luaiconv.c"},
-          incdirs = {"$(ICONV_INCDIR)"},
-          libdirs = {"$(ICONV_LIBDIR)"}
-      }
-   },
-   platforms = {
-      cygwin = {
-         modules = {
-            iconv = {
-               libraries = {"iconv"}
-            }
-         }
-      }
-   }
-}

rockspecs/lua-iconv-7.0.0-4.rockspec

@@ -1,50 +0,0 @@
--- Packs lua-iconv into a LuaRock
--- rockspec based uppon the file provided by DarkGod <darkgod at net-core.org>
-
-package = "lua-iconv"
-version = "7.0.0-4"
-
-source = {
-  url = "https://github.com/lunarmodules/lua-iconv/archive/v7.0.0/lua-iconv-7.0.0.tar.gz",
-}
-
-description = {
-   summary = "Lua binding to the iconv",
-   detailed = [[
-     Lua binding to the POSIX 'iconv' library, which converts a sequence of
-     characters from one codeset into a sequence of corresponding characters
-     in another codeset.
-   ]],
-   license = "MIT/X11",
-   homepage = "https://github.com/lunarmodules/lua-iconv/"
-}
-
-dependencies = {
-   "lua >= 5.1",
-}
-
-external_dependencies = {
-   ICONV = {
-      header = "iconv.h"
-   }
-}
-
-build = {
-   type = "builtin",
-   modules = {
-      iconv = {
-          sources = {"luaiconv.c"},
-          incdirs = {"$(ICONV_INCDIR)"},
-          libdirs = {"$(ICONV_LIBDIR)"}
-      }
-   },
-   platforms = {
-      cygwin = {
-         modules = {
-            iconv = {
-               libraries = {"iconv"}
-            }
-         }
-      }
-   }
-}

rockspecs/lua-iconv-7.1.0-1.rockspec

@@ -1,62 +0,0 @@
-local package_name = "lua-iconv"
-local package_version = "7.1.0"
-local rockspec_revision = "1"
-local github_account_name = "lunarmodules"
-local github_repo_name = package_name
-
-package = package_name
-version = package_version.."-"..rockspec_revision
-
-source = {
-   url = "git+https://github.com/"..github_account_name.."/"..github_repo_name..".git",
-   branch = (package_version == "dev") and "master" or nil,
-   tag = (package_version ~= "dev") and ("v" .. package_version) or nil,
-}
-
-description = {
-   summary = "Lua binding to the iconv",
-   detailed = [[
-      Lua binding to the POSIX 'iconv' library, which converts a sequence of
-      characters from one codeset into a sequence of corresponding characters
-      in another codeset.
-      ]],
-   license = "MIT/X11",
-   homepage = "https://github.com/"..github_account_name.."/"..github_repo_name,
-}
-
-dependencies = {
-   "lua >= 5.1",
-}
-
-external_dependencies = {
-   ICONV = {
-      header = "iconv.h"
-   }
-}
-
-build = {
-   type = "builtin",
-   modules = {
-      iconv = {
-          sources = {"luaiconv.c"},
-          incdirs = {"$(ICONV_INCDIR)"},
-          libdirs = {"$(ICONV_LIBDIR)"}
-      }
-   },
-   platforms = {
-      cygwin = {
-         modules = {
-            iconv = {
-               libraries = {"iconv"}
-            }
-         }
-      },
-      macosx = {
-         modules = {
-           iconv = {
-              libraries = {"iconv"}
-           }
-        }
-     },
-   }
-}

test_iconv.lua

@@ -1,6 +1,4 @@
--- -*- coding: utf-8 -*-
+require "iconv"
-
-local iconv = require("iconv")
 
 -- Set your terminal encoding here
 -- local termcs = "iso-8859-1"
@@ -76,30 +74,20 @@ local ebcdic = "\193\150\64\147\150\149\135\133\107\64\129\150\64\147\164\129"
 .. "\37"
 
 
-local function ErrMsg(errno)
+function check_one(to, from, text)
-  if errno == iconv.ERROR_INCOMPLETE then
-    return "Incomplete input."
-  elseif errno == iconv.ERROR_INVALID then
-    return "Invalid input."
-  elseif errno == iconv.ERROR_NO_MEMORY then
-    return "Failed to allocate memory."
-  elseif errno == iconv.ERROR_UNKNOWN then
-    return "There was an unknown error."
-  elseif errno == iconv.FINALIZED then
-    return "Handle was already finalized."
-  end
-  return "Unknown error: "..tostring(errno)
-end
-
-
-local function check_one(to, from, text)
   print("\n-- Testing conversion from " .. from .. " to " .. to)
-  local cd, errno = iconv.new(to .. "//TRANSLIT", from)
+  local cd = iconv.new(to .. "//TRANSLIT", from)
-  assert(cd, "Failed to create a converter object: " .. ErrMsg(errno))
+  assert(cd, "Failed to create a converter object.")
   local ostr, err = cd:iconv(text)
 
-  if err then
+  if err == iconv.ERROR_INCOMPLETE then
-    print("ERROR: " .. ErrMsg(err))
+    print("ERROR: Incomplete input.")
+  elseif err == iconv.ERROR_INVALID then
+    print("ERROR: Invalid input.")
+  elseif err == iconv.ERROR_NO_MEMORY then
+    print("ERROR: Failed to allocate memory.")
+  elseif err == iconv.ERROR_UNKNOWN then
+    print("ERROR: There was an unknown error.")
   end
   print(ostr)
 end
@@ -109,27 +97,3 @@ check_one(termcs, "utf8", utf8)
 check_one(termcs, "utf16", utf16)
 check_one(termcs, "EBCDIC-CP-ES", ebcdic)
 
-
--- The library must never crash the interpreter, even if the user tweaks
--- with the garbage collector methods.
-local _, e, cd, s, gc
-cd = iconv.new("iso-8859-1", "utf-8")
-_, e = cd:iconv("atenção")
-assert(e == nil, "Unexpected conversion error")
-gc = getmetatable(cd).__gc
-gc(cd)
-_, e = cd:iconv("atenção")
-assert(e == iconv.ERROR_FINALIZED, "Failed to detect double-freed objects")
-gc(cd)
-
-
--- Test expected return values
-cd = iconv.new("ascii", "utf-8")
-_, e = cd:iconv("atenção")
-assert(e == iconv.ERROR_INVALID, "Unexpected return value for invalid conversion")
-
-
-cd = iconv.new("iso-8859-1", "utf-8")
-s, e = cd:iconv("atenção")
-assert(s == "aten\231\227o", "Unexpected result for valid conversion")
-assert(e == nil, "Unexpected return value for valid conversion")

uniopen.lua

@@ -1,37 +0,0 @@
-
--- Simple (and incomplete) Unicode I/O layer.
-
-local iconv = require("iconv")
-
-local m = { }
-local mti = { }
-local mt = { __index = mti }
-
-function m.open(fname, mode, tocharset, fromcharset)
-  assert(mode == "r" or mode == "rb", "Only read modes are supported yet")
-  local cd = assert(iconv.new(tocharset, fromcharset), "Bad charset")
-  local fp = io.open(fname, mode)
-  if not fp then
-    return nil
-  end
-  local o =  { fp = fp, cd = cd }
-  setmetatable(o, mt)
-  return o;
-end
-
-function mti.read(fp, mod)
-  assert(fp and fp.fp and fp.cd, "Bad file descriptor")
-  local ret = fp.fp:read(mod)
-  if ret then
-    return fp.cd:iconv(ret)  -- returns: string, error code
-  else
-    return nil
-  end
-end
-
-function mti.close(fp)
-  assert(fp and fp.fp, "Bad file descriptor")
-  fp.fp:close()
-end
-
-return m