Merge branch 'binwalk-2.0' of https://github.com/devttys0/binwalk into binwalk-2.0

src/binwalk/core/smart.py

@@ -226,11 +226,11 @@ class Signature(object):
 
         Returns the modified string result data.
         '''
-        while tag.keyword in data:
-            (data, arg) = self.get_keyword_arg(data, tag.name)
-            v = '%s%s%s' % (tag.keyword, arg, self.TAG_DELIM_END)
-            math_value = "%d" % self.get_math_arg(data, tag.name)
-            data = data.replace(v, math_value)
+        while tag.tag in self.safe_string(data):
+            (data, arg) = self.get_keyword_arg(data, tag)
+            v = '%s%s%s' % (tag.tag, arg, tag.TAG_DELIM_END)
+            (data, math_value) = self.get_math_arg(data, tag)
+            data = data.replace(v, "%d" % math_value)
 
         return (data, None)
 

src/binwalk/magic/binwalk

@@ -1674,6 +1674,15 @@
 >980	byte		!0
 >>980	string		x				\b, last mounted on: "%s"
 
+# Simple file system found in Foscam camera firmware
+0   beshort 0xbd9a  Foscam WebUI filesystem,
+>2  leshort x       checksum: 0x%X,
+>16 lelong  <1      invalid first file name length,
+>20 byte    0       invalid first file name,
+>20 byte    x       first file name: {raw-replace}
+>16 lelong  x       {raw-string-length:%d}
+>20 string  x       {raw-string:%s}
+
 
 #--------------------------Firmware Formats---------------------------
 

src/magic/filesystems

@@ -569,3 +569,12 @@
 >980	byte		!0
 >>980	string		x				\b, last mounted on: "%s"
 
+# Simple file system found in Foscam camera firmware
+0   beshort 0xbd9a  Foscam WebUI filesystem,
+>2  leshort x       checksum: 0x%X,
+>16 lelong  <1      invalid first file name length,
+>20 byte    0       invalid first file name,
+>20 byte    x       first file name: {raw-replace}
+>16 lelong  x       {raw-string-length:%d}
+>20 string  x       {raw-string:%s}
+