From 8b38567d751848d93b18e96de1cddde339ebdbf0 Mon Sep 17 00:00:00 2001 From: "Adrian C. (anrxc)" Date: Thu, 6 Aug 2009 22:03:21 +0200 Subject: [PATCH] Added missing poolsize info to the README + minor change in fs.lua --- README | 2 ++ entropy.lua | 4 +--- fs.lua | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index d7305d6..6c0949a 100644 --- a/README +++ b/README @@ -143,6 +143,8 @@ vicious.widgets.mdir vicious.widgets.entropy - provides available system entropy + - takes the poolsize as an argument, or fallbacks to Linux 2.6 + default entropy pool of 4096-bits vicious.widgets.org - provides agenda statistics for Emacs org-mode diff --git a/entropy.lua b/entropy.lua index c9b798d..33da459 100644 --- a/entropy.lua +++ b/entropy.lua @@ -19,9 +19,7 @@ module("vicious.entropy") function worker(format, poolsize) -- Don't waste time opening the poolsize, Linux 2.6 has a default -- entropy pool of 4096-bits, if needed specify otherwise - if poolsize == nil then - poolsize = 4096 - end + if poolsize == nil then poolsize = 4096 end -- Get available entropy local f = io.open("/proc/sys/kernel/random/entropy_avail") diff --git a/fs.lua b/fs.lua index 055bf42..f4ccf0f 100644 --- a/fs.lua +++ b/fs.lua @@ -17,7 +17,7 @@ module("vicious.fs") function worker(format) -- Get data from df local f = io.popen("df -hP") - local args = {} + local fs_info = {} -- Format data for line in f:lines() do @@ -28,15 +28,15 @@ function worker(format) -- Instead match all at once, including network file systems line:match("^[%w/-:%.]+[%s]+([%d%.]+)[%a]?[%s]+([%d%.]+)[%a]?[%s]+([%d%.]+)[%a]?[%s]+([%d]+)%%[%s]+([-/%w]+)$") - args["{"..mount.." size}"] = size - args["{"..mount.." used}"] = used - args["{"..mount.." avail}"] = avail - args["{"..mount.." usep}"] = usep + fs_info["{"..mount.." size}"] = size + fs_info["{"..mount.." used}"] = used + fs_info["{"..mount.." avail}"] = avail + fs_info["{"..mount.." usep}"] = usep end end f:close() - return args + return fs_info end -- }}}