From 0cd63f061a274c35b38917f668fd9e833a6d2274 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Tue, 30 Jun 2009 14:41:28 +0000 Subject: Revert mistaken bug fix to format.string_to_table and made corresponding change to processinfo. Bumped version to 0.6.1. (reverted part of 9b934599d84f0b3dd32cda657790dc2c34bd95d8) --- Makefile | 2 +- lib/format.lua | 8 ++------ lib/processinfo.lua | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index fc0e74f..4a6d2c3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ APP_NAME=core PACKAGE=acf-$(APP_NAME) -VERSION=0.6.0 +VERSION=0.6.1 P=$(PACKAGE)-$(VERSION) DISTDIR:=$(shell pwd)/$(P) diff --git a/lib/format.lua b/lib/format.lua index 9492eca..63b8fec 100644 --- a/lib/format.lua +++ b/lib/format.lua @@ -175,14 +175,10 @@ function string_to_table ( text, delimiter) while 1 do local first, last = string.find(text, delimiter, pos) if first then -- found? - if first > pos then - table.insert(list, string.sub(text, pos, first-1)) - end + table.insert(list, string.sub(text, pos, first-1)) pos = last+1 else - if pos < string.len(text) then - table.insert(list, string.sub(text, pos)) - end + table.insert(list, string.sub(text, pos)) break end end diff --git a/lib/processinfo.lua b/lib/processinfo.lua index ec232aa..5e5136a 100644 --- a/lib/processinfo.lua +++ b/lib/processinfo.lua @@ -48,9 +48,9 @@ function read_initrunlevels() local cmdresult = f:read("*a") or "" f:close() for line in string.gmatch(cmdresult, "([^\n]*)\n?") do - local service, runlevels = string.match(line, "^%s*(%w+) |(.*)") + local service, runlevels = string.match(line, "^%s*(%w+) |%s*(.*)") if service then - local runlevel = format.string_to_table(runlevels, "%s+") or {} + local runlevel = format.string_to_table(string.gsub(runlevels, "%s+$", ""), "%s+") or {} config[#config+1] = {servicename=service, runlevels=runlevel} end end -- cgit v1.2.3