summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-04-08 23:26:02 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2016-04-08 23:26:08 +0200
commita995e0f6a8cbf6d56a99f79a7107508f4d4b038c (patch)
tree994f0bf119f9e97e5fa406f035a22c94cba7cb73 /src
parent6e77d498c589ccfd353e8475cf22fb5935b151d8 (diff)
downloadluaotfload-a995e0f6a8cbf6d56a99f79a7107508f4d4b038c.tar.gz
[db] ditch our gzip wrappers
We again depend on the full Lualibs set for some time so our wrappers are irrelevant as we can just use the similar once from there.
Diffstat (limited to 'src')
-rw-r--r--src/luaotfload-database.lua45
1 files changed, 4 insertions, 41 deletions
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 0adc262..f5aacbc 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -57,7 +57,8 @@ local fontloaderinfo = fontloader.info
local fontloaderclose = fontloader.close
local fontloaderopen = fontloader.open
----- fontloaderto_table = fontloader.to_table
-local gzipopen = gzip.open
+local gzipload = gzip.load
+local gzipsave = gzip.save
local iolines = io.lines
local ioopen = io.open
local iopopen = io.popen
@@ -361,44 +362,6 @@ local initialize_namedata = function (formats, created)
}
end
---[[doc--
-
- Since Luaotfload does not depend on the lualibs anymore we
- have to put our own small wrappers for the gzip library in
- place.
-
- load_gzipped -- Read and decompress and entire gzipped file.
- Returns the uncompressed content as a string.
-
---doc]]--
-
-local load_gzipped = function (filename)
- local gh = gzipopen (filename,"rb")
- if gh then
- local data = gh:read "*all"
- gh:close ()
- return data
- end
-end
-
---[[doc--
-
- save_gzipped -- Compress and write a string to file. The return
- value is the number of bytes written. Zlib parameters are: best
- compression and default strategy.
-
---doc]]--
-
-local save_gzipped = function (filename, data)
- local gh = gzipopen (filename, "wb9")
- if gh then
- gh:write (data)
- local bytes = gh:seek ()
- gh:close ()
- return bytes
- end
-end
-
--- When loading a lua file we try its binary complement first, which
--- is assumed to be located at an identical path, carrying the suffix
--- .luc.
@@ -427,7 +390,7 @@ local load_lua_file = function (path)
if not code then --- probe gzipped file
foundname = filereplacesuffix (path, "lua.gz")
- local chunk = load_gzipped (foundname)
+ local chunk = gzipload (foundname)
if chunk then
code = load (chunk, "t")
end
@@ -3298,7 +3261,7 @@ save_names = function (currentnames)
local gzname = luaname .. ".gz"
if config.luaotfload.db.compress then
local serialized = tableserialize (currentnames, true)
- save_gzipped (gzname, serialized)
+ gzipsave (gzname, serialized)
caches.compile (currentnames, "", lucname)
else
tabletofile (luaname, currentnames, true)