renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wifi(fix): quote ssid and password for wpa_passphrase

Browse Source
This commit is contained in:
Qingping Hou
2017-05-09 00:29:21 -07:00
committed by Frans de Jonge
parent 4eb8664c95
commit bde2139b27
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/apps/reader/modules/readerdictionary.lua
View File

@@ -164,8 +164,9 @@ function ReaderDictionary:stardictLookup(word, box)
results_str = A.stdout("./sdcv", "--utf8-input", "--utf8-output",
"-nj", word, "--data-dir", dict_dir)
else
local std_out = io.popen("./sdcv --utf8-input --utf8-output -nj "
.. ("%q"):format(word) .. " --data-dir " .. dict_dir, "r")
local std_out = io.popen(
("./sdcv --utf8-input --utf8-output -nj %q --data-dir %q"):format(word, dict_dir),
"r")
if std_out then
results_str = std_out:read("*all")
std_out:close()

2
frontend/ui/network/wpa_supplicant.lua
View File

@@ -45,7 +45,7 @@ local function calculatePsk(ssid, pwd)
-- * /wpa_supplicant/wpa_passphrase.c
-- * /src/crypto/sha1-pbkdf2.c
-- see: http://docs.ros.org/diamondback/api/wpa_supplicant/html/sha1-pbkdf2_8c_source.html
local fp = io.popen(string.format("wpa_passphrase %s %s", ssid, pwd))
local fp = io.popen(("wpa_passphrase %q %q"):format(ssid, pwd))
local out = fp:read("*a")
fp:close()
return string.match(out, 'psk=([a-f0-9]+)')