summaryrefslogtreecommitdiffhomepage
path: root/libs
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-09-18 19:23:08 +0000
committerSteven Barth <steven@midlink.org>2008-09-18 19:23:08 +0000
commit5067e2d185bbd1fdf029a8da2a84895bbccfad02 (patch)
treed0caa1289fce35bacaae1f1055aaa8317828cf13 /libs
parent60579b28e861af7780b596eca70a547b4bb779d1 (diff)
Revised sysupgrade part 1
Diffstat (limited to 'libs')
-rw-r--r--libs/http/luasrc/http/protocol.lua6
-rw-r--r--libs/sys/luasrc/sys/mtdow.lua10
2 files changed, 8 insertions, 8 deletions
diff --git a/libs/http/luasrc/http/protocol.lua b/libs/http/luasrc/http/protocol.lua
index 93c9e7999..6873d2486 100644
--- a/libs/http/luasrc/http/protocol.lua
+++ b/libs/http/luasrc/http/protocol.lua
@@ -421,7 +421,7 @@ function mimedecode_message_body( src, msg, filecb )
end
if store then
- store( field.headers, predata, true )
+ store( field, predata, true )
end
@@ -439,7 +439,7 @@ function mimedecode_message_body( src, msg, filecb )
data = data:sub( 1, #data - 78 )
if store then
- store( field.headers, data, false )
+ store( field, data, false )
else
return nil, "Invalid MIME section header"
end
@@ -451,7 +451,7 @@ function mimedecode_message_body( src, msg, filecb )
lchunk, eof = parse_headers( data, field )
inhdr = not eof
else
- store( field.headers, lchunk, false )
+ store( field, lchunk, false )
lchunk, chunk = chunk, nil
end
end
diff --git a/libs/sys/luasrc/sys/mtdow.lua b/libs/sys/luasrc/sys/mtdow.lua
index bfa2e9e93..7c03845a3 100644
--- a/libs/sys/luasrc/sys/mtdow.lua
+++ b/libs/sys/luasrc/sys/mtdow.lua
@@ -44,7 +44,7 @@ EmulatedWriter.blocks = {
image = {
magic = "eb48",
device = "/dev/hda",
- write = WRITE_SEPARATELY
+ write = WRITE_EMULATED
}
}
@@ -193,7 +193,7 @@ function Writer._write_memory(self, devicename, imagestream)
end
return os.execute(
- "%s write '%s' '%s'" % {
+ "%s write '%s' '%s' >/dev/null 2>&1" % {
self.MTD, self.IMAGEFIFO, devicename
}
)
@@ -212,21 +212,21 @@ function Writer._write_combined(self, devicename, imagestream, appendfile)
end
return os.execute(
- "%s -j '%s' write '%s' '%s'" % {
+ "%s -j '%s' write '%s' '%s' >/dev/null 2>&1" % {
self.MTD, appendfile, self.IMAGEFIFO, devicename
}
)
end
function Writer._refresh_block(self, devicename)
- return os.execute("%s refresh '%s'" % {self.MTD, devicename})
+ return os.execute("%s refresh '%s' >/dev/null 2>&1" % {self.MTD, devicename})
end
function Writer._append(self, devicename, appendfile, erase)
erase = erase and ("-e '%s' " % devicename) or ''
return os.execute(
- "%s %s jffs2write '%s' '%s'" % {
+ "%s %s jffs2write '%s' '%s' >/dev/null 2>&1" % {
self.MTD, erase, appendfile, devicename
}
)