fix: lua export (#19)

* fix: lua export

.github/workflows/deploy.yml

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,13 @@
+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

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

CHANGELOG.md

@@ -0,0 +1,13 @@
+# 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 Alexandre Erwin Ittner <aittner@netuno.com.br>
+Lua-iconv is (c) 2005-10 Alexandre Erwin Ittner <alexandre@ittner.com.br>
 
 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 Alexandre Erwin Ittner <aittner@netuno.com.br>
+# (c) 2005-10 Alexandre Erwin Ittner <alexandre@ittner.com.br>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,24 +23,50 @@
 # If you use this package in a product, an acknowledgment in the product
 # documentation would be greatly appreciated (but it is not required).
 
+#CC = gcc
+#RM = rm
 
-CC=gcc
+# Gives a nice speedup, but also spoils debugging on x86. Comment out this
-OUTFILE=libluaiconv.so
+# line when debugging.
-CFLAGS=-Wall
+OMIT_FRAME_PTR = -fomit-frame-pointer
-LFLAGS=-shared -llua 
+
-#WLFLAGS=-liconv
+LUABIN = lua
+LUAPKG = lua5.2
+CFLAGS = `pkg-config $(LUAPKG) --cflags` -fPIC -O3 -Wall $(OMIT_FRAME_PTR)
+LFLAGS = -shared
+
+INSTALL_PATH = `$(LUABIN) -e'                           \
+    for dir in package.cpath:gmatch("(/[^?;]+)?") do    \
+        io.write(dir)                                   \
+        os.exit(0)                                      \
+    end                                                 \
+    os.exit(1)                                          \
+'`
+
+## If your system doesn't have pkg-config or if you do not want to get the
+## install path from Lua, comment out the previous lines and uncomment and
+## change the following ones according to your building environment.
+
+#CFLAGS = -I/usr/local/include/ -fPIC -O3 -Wall $(OMIT_FRAME_PTR)
+#LFLAGS = -shared
+#INSTALL_PATH = /usr/local/lib/lua/5.2/
 
 
-all: $(OUTFILE)
+all: iconv.so
 
-$(OUTFILE): luaiconv.c
+iconv.lo: luaiconv.c
-	$(CC) -o $(OUTFILE) $(CFLAGS) $(LFLAGS) $(WLFLAGS) luaiconv.c
+	$(CC) -o iconv.lo -c $(CFLAGS) luaiconv.c
 
-install: $(OUTFILE)
+iconv.so: iconv.lo
-	cp $(OUTFILE) /usr/lib/
+	$(CC) -o iconv.so $(LFLAGS) $(LIBS) iconv.lo
 
-install51: $(OUTFILE)
+install: iconv.so
-	lua install51.lua $(OUTFILE) iconv
+	make test
+	install -D -s iconv.so $(DESTDIR)/$(INSTALL_PATH)/iconv.so
 
 clean:
-	rm -f $(OUTFILE) *.o
+	$(RM) iconv.so iconv.lo
+
+test: iconv.so test_iconv.lua
+	$(LUABIN) test_iconv.lua
+

README

@@ -1,135 +0,0 @@
-
-        Lua-iconv: performs character set conversions in Lua
-       (c) 2005 Alexandre Erwin Ittner <aittner@netuno.com.br>
-              Project page: http://lua-iconv.luaforge.net/
-
-
-
-
-=== INTRODUCTION ===
-
-Lua-iconv is a Lua binding to the POSIX 'iconv' library. 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.
-
-Details regarding iconv may be obtained from:
-http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html
-
-
-
-=== LICENSE ===
-
-Lua-iconv is (c) 2005 Alexandre Erwin Ittner <aittner@netuno.com.br>
-
-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 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 'loadlib' facility (or the new module system in
-Lua 5.1). To compile the library, 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 /usr/lib/ directory.
-
-To install the library with Lua 5.1 and above just type
-
-    make install51
-
-This will cause the Makefile to run a Lua script that will install the
-library into a directory from package.cpath, allowing you to use the
-package system to load the library.
-
-
-
-=== 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. You must
-use loadlib function to for that. Using Lua 5.0, under Unix and with
-libluaiconv.so on your LUA_PATH (or also your LD_PATH) you can just do:
-
-    assert(loadlib("libluaiconv.so", "luaopen_iconv"))()
-
-And, under Windows and with libluaiconv.dll on your path, you can do
-
-    assert(loadlib("libluaiconv.dll", "luaopen_iconv"))()
-
-On the Lua 5.1, Lua-iconv uses the new package system that allows you
-to simply do a
-
-    require "gd"
-
-call to load up the library (that was installed on the right place by
-install51.lua).
-
-
-
-=== 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.
-

README.md

@@ -0,0 +1,145 @@
+# 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/changelog

@@ -0,0 +1,28 @@
+lua-iconv (7-1) unstable; urgency=low
+
+  * Update package for lua-iconv 7 + Lua-5.2
+
+ -- Alexandre Erwin Ittner <alexandre@ittner.com.br>  Sun, 06 May 2012 22:35:22 -0300
+
+lua-iconv (6-3) unstable; urgency=low
+
+  * debian/control: Conflicts, Provides, and Replaces lua-iconv
+    (Closes: #557052)
+
+ -- Jon Bernard <jbernard@debian.org>  Fri, 20 Nov 2009 18:58:12 -0600
+
+lua-iconv (6-2) unstable; urgency=low
+
+  * 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

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

debian/control

@@ -0,0 +1,21 @@
+Source: lua-iconv
+Section: interpreters
+Priority: optional
+Maintainer: Jon Bernard <jbernard@debian.org>
+Build-Depends: debhelper (>= 7), liblua5.2-dev, lua5.2, pkg-config
+Standards-Version: 3.8.2
+Vcs-Git: https://github.com/ittner/lua-iconv.git
+Vcs-Browser: https://github.com/ittner/lua-iconv.git
+Homepage: http://ittner.github.com/lua-iconv/
+
+Package: liblua5.2-iconv0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: lua5.2
+Conflicts: lua-iconv
+Provides: lua-iconv
+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.

debian/copyright

@@ -0,0 +1,42 @@
+This package was debianized by Jon Bernard <jbernard@debian.org> on
+Sun, 02 Aug 2009 13:50:50 -0400.
+
+It was downloaded from http://luaforge.net/frs/?group_id=131&release_id=1440
+
+Upstream Author:
+
+    Alexandre Erwin Ittner <alexandre@ittner.com.br>
+
+Copyright:
+
+    Copyright (C) 2005-09 Alexandre Erwin Ittner
+
+License:
+
+    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/docs

@@ -0,0 +1 @@
+README

debian/examples

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

debian/rules

@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+	dh $@

fp.txt

@@ -1,16 +0,0 @@
-Ao longe, ao luar
-No rio uma vela
-Serena a passar,
-Que é que me revela
-
-Não sei, mas mue ser
-Tornou-se-me estranho,
-E eu sonho sem ver
-Os sonhos que tenho.
-
-Que angústia me enlaça?
-Que amor não se explica?
-É a vela que passa
-Na noite que fica
-
-    -- Fernando Pessoa

iconv.lua

@@ -1,52 +0,0 @@
-
--- Common locations (add new ones if needed).
-local locs = {
-    -- Unices
-    "libluaiconv.so",
-    "./libluaiconv.so",
-    "/usr/lib/libluaiconv.so",
-    "/usr/local/lib/libluaiconv.so",
-    "/usr/local/lib/lua/5.0/lib/libluaiconv.so",
-
-    -- Windows
-    "libluaiconv.dll",
-    "luaiconv.dll",
-    ".\\luaiconv.dll",
-    ".\\libluaiconv.dll",
-    "c:\\lua\\lib\\libluaiconv.dll"
-}
-
-local loadiconv, fname, ndx
-for ndx, fname in ipairs(locs) do
-  loadiconv = loadlib(fname, "luaopen_iconv")
-  if loadiconv then
-    break
-  end
-end
-
-assert(loadiconv, "Can't load Lua-iconv")
-loadiconv()
-
-
-
-
-
--- An useful extension: Detects automatically the charset of the string
--- and returns it on the chosen one.
-
-iconv.commoncharsets = {
-    "ascii", "iso-8859-1", "utf-8", "utf-16", "windows-1252"
-}
-
-iconv.autoconvert = function(tocode, str)
-  local _, fromcode, cd, ret, err
-  for _, fromcode in pairs(iconv.commoncharsets) do
-    cd = iconv.new(tocode, fromcode)
-    ret, err = cd:iconv(str)
-    if not err then
-      return ret
-    end
-  end
-  return nil
-end
-

install51.lua

@@ -1,92 +0,0 @@
-#!/usr/bin/env lua
--- Easy way to put a library on the path. For Lua >= 5.1 only.
--- (c) 2005 Alexandre Erwin Ittner < aittner{at}netuno.com.br >
---
--- This file is distributed under the same license that Lua 5.1 itself.
---
--- $Id$
---
-
--- Splits a package.cpath into a table.
-function splitpath(str)
-  local t = {}
-  local v
-  for v in string.gfind(str, "([^;]+);") do
-    table.insert(t, v)
-  end
-  return t
-end
-
-
--- Checks if a given file exists. DUMB. Do not distinguish files from
--- symlinks, pipes, sockets, device drivers, etc.
-function fileexists(fname)
-  local fp = io.open(fname, "r")
-  if fp then
-    fp:close()
-    return true
-  end
-  return false
-end
-
-
--- Finds the first absolute path on the list. Works with *nix (MacOS X
--- included) and Windows paths.
-function findplace(tbl)
-  local k, v
-  for k, v in ipairs(tbl) do
-    if v:sub(1, 1) == "/"
-    or v:sub(2, 3) == ":\\" then
-      return v
-    end
-  end
-end
-
-
--- It's REALLY stupid, but also it's REALLY cross-platform.
-function dumbcopy(from, to)
-  local bufsize = 512*1024  -- 512K at once
-  local ifp = io.open(from, "rb")
-  assert(ifp, "Can't open file for reading. File not found?")
-  local ofp = io.open(to, "wb")
-  assert(ofp, "Can't open file for writing. Permission denied?")
-  local buf
-  repeat
-    buf = ifp:read(bufsize)
-    if buf then
-      ofp:write(buf)
-    end
-  until not buf
-  ifp:close()
-  ofp:close()
-end
-
-
--- Copies the file. 'to' MUST be an absolute path!
-function copy(from, to)
-  if to:sub(1, 1) == "/" then       -- Cool! We are on Unix, guys!
-    ret = os.execute('install -D "' .. from .. '" "' .. to .. '"')
-    if ret == 0 and fileexists(to) then
-      return
-    end
-  end
-  -- Let's try some violence.
-  dumbcopy(from, to)
-end
-
-
--- Installs one file. Simple. Perfect.
-function installfile(fname, name)
-  local tpath = splitpath(package.cpath)
-  local path = findplace(tpath)
-  assert(path, "Can't find a place to install")
-  local dest = path:gsub("%?", name)
-  print("Install:", dest)
-  copy(fname, dest)
-end
-
-assert(package, "No package module found. Are you REALLY using Lua >= 5.1?")
-assert(arg[1] and arg[2], "No arguments provided")
-
-installfile(arg[1], arg[2])
-os.exit(0)

lua-iconv-dev-1.rockspec

@@ -0,0 +1,62 @@
+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-logo.ps

@@ -0,0 +1,210 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: Lua logo
+%%Creator: lua@tecgraf.puc-rio.br
+%%CreationDate: Wed Nov 29 19:04:04 EDT 2000
+%%BoundingBox: -45 0 1035 1080
+%%Pages: 1
+%%EndComments
+%%EndProlog
+
+%------------------------------------------------------------------------------
+%
+% Copyright (C) 1998-2000. All rights reserved.
+% Graphic design by Alexandre Nakonechnyj (nako@openlink.com.br).
+% PostScript programming by the Lua team (lua@tecgraf.puc-rio.br).
+%
+% Permission is hereby granted, without written agreement and without license 
+% or royalty fees, to use, copy, and distribute this logo for any purpose, 
+% including commercial applications, subject to the following conditions: 
+%
+% * The origin of this logo must not be misrepresented; you must not
+%   claim that you drew the original logo. We recommend that you give credit
+%   to the graphics designer in all printed matter that includes the logo.
+%
+% * The only modification you can make is to adapt the orbiting text to
+%   your product name.
+%
+% * The logo can be used in any scale as long as the relative proportions 
+%   of its elements are maintained.
+%
+%------------------------------------------------------------------------------
+
+/LABEL		(iconv) def
+
+%-- DO NOT CHANGE ANYTHING BELOW THIS LINE ------------------------------------
+
+/PLANETCOLOR	{0 0 0.5 setrgbcolor} bind def
+/HOLECOLOR	{1.0 setgray} bind def
+/ORBITCOLOR	{0.5 setgray} bind def
+/LOGOFONT	{/Helvetica 0.90} def
+/LABELFONT	{/Helvetica 0.36} def
+
+%------------------------------------------------------------------------------
+
+/MOONCOLOR	{PLANETCOLOR} bind def
+/LOGOCOLOR	{HOLECOLOR} bind def
+/LABELCOLOR	{ORBITCOLOR} bind def
+
+/LABELANGLE	125 def
+/LOGO		(Lua) def
+
+/DASHANGLE	10 def
+/HALFDASHANGLE	DASHANGLE 2 div def
+
+% moon radius. planet radius is 1.
+/r 1 2 sqrt 2 div sub def
+
+/D {0 360 arc fill} bind def
+/F {exch findfont exch scalefont setfont} bind def
+
+% place it nicely on the paper
+/RESOLUTION	1024 def
+RESOLUTION 2 div dup translate
+RESOLUTION 2 div 2 sqrt div dup scale
+
+%-------------------------------------------------------------------- planet --
+PLANETCOLOR
+0 0 1 D
+
+%---------------------------------------------------------------------- hole --
+HOLECOLOR
+1 2 r mul sub dup r D
+
+%---------------------------------------------------------------------- moon --
+MOONCOLOR
+1 1 r D
+
+%---------------------------------------------------------------------- logo --
+LOGOCOLOR
+LOGOFONT
+F
+LOGO stringwidth pop 2 div neg
+-0.5 moveto
+LOGO show
+
+%------------------------------------------------------------------------------
+% based on code from Blue Book Program 10, on pages 167--169
+% available at ftp://ftp.adobe.com/pub/adobe/displaypostscript/bluebook.shar
+
+%	str ptsize centerangle radius	outsidecircletext	--
+/outsidecircletext {
+	circtextdict begin
+	/radius exch def
+	/centerangle exch def
+	/ptsize exch def
+	/str exch def
+
+	gsave
+	 str radius ptsize findhalfangle
+	 centerangle
+	 add rotate
+	 str
+		{ /charcode exch def
+		  ( ) dup 0 charcode put outsideplacechar
+		} forall
+	
+	grestore
+	end
+} def
+
+%	string radius ptsize	findhalfangle	halfangle
+/findhalfangle {
+	4 div add
+	exch
+	stringwidth pop 2 div
+	exch
+	2 mul 3.1415926535 mul div 360 mul
+} def
+
+/circtextdict 16 dict def
+circtextdict begin
+
+ /outsideplacechar {
+	/char exch def
+	/halfangle char radius ptsize findhalfangle def
+	gsave
+	 halfangle neg rotate
+	 radius 0 translate
+	 -90 rotate
+	 char stringwidth pop 2 div neg 0 moveto
+	 char show
+	grestore
+	halfangle 2 mul neg rotate
+ } def
+
+end
+
+%--------------------------------------------------------------------- label --
+LABELFONT
+F
+
+/LABELSIZE	LABELFONT exch pop def
+/LABELRADIUS	LABELSIZE 3 div 1 r add sub neg 1.02 mul def
+
+
+/HALFANGLE
+	LABEL LABELRADIUS LABELSIZE findhalfangle
+	HALFDASHANGLE div ceiling HALFDASHANGLE mul
+def
+
+/LABELANGLE
+	60 LABELANGLE HALFANGLE sub
+	lt
+	{
+	HALFANGLE
+	HALFANGLE DASHANGLE div floor DASHANGLE mul
+	eq
+		{LABELANGLE DASHANGLE div ceiling DASHANGLE mul}
+		{LABELANGLE HALFDASHANGLE sub DASHANGLE div round DASHANGLE mul HALFDASHANGLE add}
+	ifelse
+	}
+	{HALFANGLE 60 add}
+	ifelse
+def
+
+LABELCOLOR
+LABEL
+LABELSIZE
+LABELANGLE
+LABELRADIUS
+outsidecircletext
+
+%--------------------------------------------------------------------- orbit --
+ORBITCOLOR
+0.03 setlinewidth
+[1 r add 3.1415926535 180 div HALFDASHANGLE mul mul] 0 setdash
+newpath
+0 0
+1 r add
+3 copy
+30
+LABELANGLE HALFANGLE add
+arcn
+stroke
+60
+LABELANGLE HALFANGLE sub
+2 copy
+lt {arc stroke} {4 {pop} repeat} ifelse
+
+%------------------------------------------------------------------ copyright --
+/COPYRIGHT
+(Graphic design by A. Nakonechnyj. Copyright (c) 1998, All rights reserved.)
+def
+
+LABELCOLOR
+LOGOFONT
+32 div
+F
+2 sqrt 0.99 mul
+dup
+neg
+moveto
+COPYRIGHT
+90 rotate
+%show
+
+%---------------------------------------------------------------------- done --
+showpage
+
+%%Trailer
+%%EOF

luaiconv.c

@@ -1,6 +1,6 @@
 /*
  * luaiconv - Performs character set conversions in Lua
- * (c) 2005 Alexandre Erwin Ittner <aittner@netuno.com.br>
+ * (c) 2005-11 Alexandre Erwin Ittner <alexandre@ittner.com.br>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -24,7 +24,6 @@
  * If you use this package in a product, an acknowledgment in the product
  * documentation would be greatly appreciated (but it is not required).
  *
- * $Id$
  *
  */
 
@@ -37,40 +36,46 @@
 #include <errno.h>
 
 #define LIB_NAME                "iconv"
-#define LIB_VERSION             LIB_NAME " r1"
+#define LIB_VERSION             LIB_NAME " 7"
 #define ICONV_TYPENAME          "iconv_t"
 
-
+#ifdef _WIN32
-/* Compatibility between Lua 5.1+ and Lua 5.0 */
+#define LUAEXPORT __declspec(dllexport)
-#ifndef LUA_VERSION_NUM
+#else
-#define LUA_VERSION_NUM 0
+#define LUAEXPORT __attribute__((visibility("default")))
 #endif
+
 #if LUA_VERSION_NUM < 501
-#define luaL_register(a, b, c) luaL_openlib((a), (b), (c), 0)
+ #error "Unsupported Lua version. You must use Lua >= 5.1"
+#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
 
 
-/* Emulates lua_(un)boxpointer from Lua 5.0 (don't exists on Lua 5.1) */
+#define BOXPTR(L, p)   (*(void**)(lua_newuserdata(L, sizeof(void*))) = (p))
-#define boxptr(L, p)   (*(void**)(lua_newuserdata(L, sizeof(void*))) = (p))
+#define UNBOXPTR(L, i) (*(void**)(lua_touserdata(L, i)))
-#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)
 {
-    boxptr(L, cd);
+    BOXPTR(L, cd);
     luaL_getmetatable(L, ICONV_TYPENAME);
     lua_setmetatable(L, -2);
 }
@@ -78,14 +83,12 @@ static void push_iconv_t(lua_State *L, iconv_t cd)
 
 static iconv_t get_iconv_t(lua_State *L, int i)
 {
-    if(luaL_checkudata(L, i, ICONV_TYPENAME) != NULL)
+    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_typerror(L, i, ICONV_TYPENAME);
+    luaL_argerror(L, i, lua_pushfstring(L, ICONV_TYPENAME " expected, got %s",
+        luaL_typename(L, i)));
     return NULL;
 }
 
@@ -95,76 +98,73 @@ 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 */
-    else
+        return 1;
-        lua_pushnil(L);         /* erro */
+    } else {
-    return 1;
+        lua_pushnil(L);         /* error */
+        if (errno == EINVAL)
+            lua_pushnumber(L, ERROR_INVALID);
+        else
+            lua_pushnumber(L, ERROR_UNKNOWN);
+        return 2;
+    };
 }
 
+/* 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)
 {
     iconv_t cd = get_iconv_t(L, 1);
-    size_t ibleft = lua_strlen(L, 2);
+    size_t ibleft = lua_rawlen(L, 2);
     char *inbuf = (char*) luaL_checkstring(L, 2);
-    char *outbuf;
+    char outbufs[CONV_BUF_SIZE];
-    char *outbufs;
+    char *outbuf = outbufs;
-    size_t obsize = (ibleft > 256) ? ibleft : 256; 
+    size_t obleft = CONV_BUF_SIZE;
-    size_t obleft = obsize;
     size_t ret = -1;
-    int hasone = 0;
+    luaL_Buffer b;
 
-    outbuf = (char*) malloc(obsize * sizeof(char));
+    if (cd == NULL) {
-    if(outbuf == NULL)
-    {
         lua_pushstring(L, "");
-        lua_pushnumber(L, ERROR_NO_MEMORY);
+        lua_pushnumber(L, ERROR_FINALIZED);
         return 2;
     }
-    outbufs = outbuf;
 
-    do
+    luaL_buffinit(L, &b);
-    {
+
+    do {
         ret = iconv(cd, &inbuf, &ibleft, &outbuf, &obleft);
-        if(ret == (size_t)(-1))
+        if (ret == (size_t)(-1)) {
-        {
+            luaL_addlstring(&b, outbufs, CONV_BUF_SIZE - obleft);
-            lua_pushlstring(L, outbufs, obsize - obleft);
+            if (errno == EILSEQ) {
-            if(hasone == 1)
+                luaL_pushresult(&b);
-                lua_concat(L, 2);
-            hasone = 1;
-            if(errno == EILSEQ)
-            {
                 lua_pushnumber(L, ERROR_INVALID);
-                free(outbufs);
                 return 2;   /* Invalid character sequence */
-            }
+            } else if (errno == EINVAL) {
-            else if(errno == EINVAL)
+                luaL_pushresult(&b);
-            {
                 lua_pushnumber(L, ERROR_INCOMPLETE);
-                free(outbufs);
                 return 2;   /* Incomplete character sequence */
-            }
+            } else if (errno == E2BIG) {
-            else if(errno == E2BIG)
+                obleft = CONV_BUF_SIZE;
-            {
-                obleft = obsize;    
                 outbuf = outbufs;
-            }
+            } else {
-            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);
 
-    lua_pushlstring(L, outbufs, obsize - obleft);
+    luaL_addlstring(&b, outbufs, CONV_BUF_SIZE - obleft);
-    if(hasone == 1)
+    luaL_pushresult(&b);
-        lua_concat(L, 2);
+    lua_pushnil(L);
-    free(outbufs);
+    return 2;   /* Done */
-    return 1;   /* Done */
 }
 
 
@@ -179,8 +179,7 @@ static int push_one(unsigned int cnt, char *names[], void *data)
 
     /* Stack: <tbl> n */
     lua_remove(L, -1);    
-    for(i = 0; i < cnt; i++)
+    for (i = 0; i < cnt; i++) {
-    {
         /* Stack> <tbl> */
         lua_pushnumber(L, n++);
         lua_pushstring(L, names[i]);
@@ -212,16 +211,20 @@ static int Liconvlist(lua_State *L)
 static int Liconv_close(lua_State *L)
 {
     iconv_t cd = get_iconv_t(L, 1);
-    if(iconv_close(cd) == 0)
+    if (cd != NULL && 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);         /* erro */
+        lua_pushnil(L);         /* error, called from __gc, so no need for error messsage */
     return 1;
 }
 
 
-static const luaL_reg inconvFuncs[] =
+static const luaL_Reg iconv_funcs[] = {
-{
     { "open",   Liconv_open },
     { "new",    Liconv_open },
     { "iconv",  Liconv },
@@ -232,31 +235,30 @@ static const luaL_reg inconvFuncs[] =
 };
 
 
-static const luaL_reg iconvMT[] =
+LUAEXPORT int luaopen_iconv(lua_State *L)
 {
-    { "__gc", Liconv_close },
+    luaL_newlib(L, iconv_funcs);
-    { NULL, NULL }
-};
 
-
+    TBL_SET_INT_CONST(L, ERROR_NO_MEMORY);
-int luaopen_iconv(lua_State *L)
+    TBL_SET_INT_CONST(L, ERROR_INVALID);
-{
+    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,12 +3,10 @@ local fp = assert(io.open(arg[1], "rb"))
 local str = assert(fp:read("*a"))
 fp:close()
 
-local i
+local ostr = "local xxxxxxxxxxx = \""
-local c = 0
-local ostr = "local xxxxx = \""
 for i = 1, string.len(str) do
   ostr = ostr .. "\\" .. string.byte(string.sub(str, i, i+1))
-  if string.len(ostr) > 74 then
+  if string.len(ostr) > 72 then
     io.write(ostr .. "\"\n")
     ostr = ".. \""
   end

maketargz.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PACKAGE=lua-iconv
-VERSION=r1
+VERSION=7
 
 DIRNAME=$PACKAGE-$VERSION
 TGZNAME=$DIRNAME.tar.gz
@@ -9,9 +9,15 @@ TGZNAME=$DIRNAME.tar.gz
 rm -f $TGZNAME
 mkdir $DIRNAME
 
-cp COPYING Makefile README luaiconv.c iconv.lua test_iconv.lua \
+cp -r debian $DIRNAME/
-    install51.lua $DIRNAME
+#rm -rf $DIRNAME/debian/.svn
+
+cp -r COPYING Makefile README luaiconv.c test_iconv.lua $DIRNAME
 
 tar -czf $TGZNAME $DIRNAME
+
+#cd $DIRNAME dpkg-buildpackage -rfakeroot
+#cd ..
+
 rm -rf $DIRNAME
 tar -tzf $TGZNAME

rockspecs/lua-iconv-6-1.rockspec

@@ -0,0 +1,52 @@
+
+-- Packs lua-iconv into a LuaRock
+-- rockspec based uppon the file provided by DarkGod <darkgod at net-core.org>
+
+package = "lua-iconv"
+version = "6-1"
+
+source = {
+  url = "http://luaforge.net/frs/download.php/4181/lua-iconv-6.tar.gz",
+  md5 = "2cec334c5786d7c420a53003d6cb93d4"
+}
+
+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 = "http://luaforge.net/projects/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.rockspec

@@ -0,0 +1,52 @@
+
+-- 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

@@ -0,0 +1,51 @@
+
+-- 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

@@ -0,0 +1,50 @@
+-- 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

@@ -0,0 +1,62 @@
+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,27 +1,25 @@
-require "iconv"
+-- -*- coding: utf-8 -*-
+
+local iconv = require("iconv")
 
 -- Set your terminal encoding here
-local termcs = "iso-8859-1"
+-- local termcs = "iso-8859-1"
-
+local termcs = "utf-8"
-
-local iso88591 = [[
-Ao longe, ao luar
-No rio uma vela
-Serena a passar,
-Que é que me revela
-
-Não sei, mas mue ser
-Tornou-se-me estranho,
-E eu sonho sem ver
-Os sonhos que tenho.
-
-Que angústia me enlaça?
-Que amor não se explica?
-É a vela que passa
-Na noite que fica
-
-    -- Fernando Pessoa]]
 
+local iso88591 = "\65\111\32\108\111\110\103\101\44\32\97\111\32\108\117"
+.. "\97\114\10\78\111\32\114\105\111\32\117\109\97\32\118\101\108\97\10\83"
+.. "\101\114\101\110\97\32\97\32\112\97\115\115\97\114\44\10\81\117\101\32"
+.. "\233\32\113\117\101\32\109\101\32\114\101\118\101\108\97\10\10\78\227"
+.. "\111\32\115\101\105\44\32\109\97\115\32\109\117\101\32\115\101\114\10"
+.. "\84\111\114\110\111\117\45\115\101\45\109\101\32\101\115\116\114\97\110"
+.. "\104\111\44\10\69\32\101\117\32\115\111\110\104\111\32\115\101\109\32"
+.. "\118\101\114\10\79\115\32\115\111\110\104\111\115\32\113\117\101\32\116"
+.. "\101\110\104\111\46\10\10\81\117\101\32\97\110\103\250\115\116\105\97"
+.. "\32\109\101\32\101\110\108\97\231\97\63\10\81\117\101\32\97\109\111\114"
+.. "\32\110\227\111\32\115\101\32\101\120\112\108\105\99\97\63\10\201\32\97"
+.. "\32\118\101\108\97\32\113\117\101\32\112\97\115\115\97\10\78\97\32\110"
+.. "\111\105\116\101\32\113\117\101\32\102\105\99\97\10\10\32\32\32\32\45"
+.. "\45\32\70\101\114\110\97\110\100\111\32\80\101\115\115\111\97\10"
 
 local utf8 = "\65\111\32\108\111\110\103\101\44\32\97\111\32\108\117\97\114"
 .. "\10\78\111\32\114\105\111\32\117\109\97\32\118\101\108\97\10\83\101\114"
@@ -78,25 +76,31 @@ local ebcdic = "\193\150\64\147\150\149\135\133\107\64\129\150\64\147\164\129"
 .. "\37"
 
 
-function check_one(to, from, text)
+local function ErrMsg(errno)
-  print("\n-- Testing conversion from " .. from .. " to " .. to)
+  if errno == iconv.ERROR_INCOMPLETE then
-  local cd = iconv.new(to .. "//TRANSLIT", from)
+    return "Incomplete input."
-  if not cd then
+  elseif errno == iconv.ERROR_INVALID then
-    printf("FAILED!")
+    return "Invalid input."
-    return
+  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)
+  assert(cd, "Failed to create a converter object: " .. ErrMsg(errno))
   local ostr, err = cd:iconv(text)
 
-  if err == iconv.ERROR_INCOMPLETE then
+  if err then
-    print("ERROR: Incomplete input.")
+    print("ERROR: " .. ErrMsg(err))
-  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
 
@@ -106,3 +110,26 @@ 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

@@ -0,0 +1,37 @@
+
+-- 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