update hexdump and fix dict merge problem

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1723 2a923420-c742-0410-a762-8d5b09965624

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.7-7
+Version: 1.0.7-8
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.4),mongoose(>=3.0-9),jim(>=0.74-2),jim-oo,jim-sqlite3(>=0.74-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)

var/mongoose/html/m/lib/header.jim

@@ -16,8 +16,7 @@ puts "
 
 puts {
 <meta charset="utf-8">
-<meta name="viewport"
+<meta name="viewport" content="user-scalable=no,initial-scale=1"> 
-    content="width=device-width,user-scalable=no,initial-scale=1"> 
 <meta name=apple-mobile-web-app-capable content=yes>
 <meta name=apple-mobile-web-app-status-bar-style content=black>
 <link rel="stylesheet" href="/lib/jquery.mobile/jquery.mobile.css" />

var/mongoose/lib/hexdump

@@ -1,30 +1,16 @@
 package require binary
 
-proc hexdump {str} {
+proc hexdump data {
-        set s ""
+	set dump ""
-	set addr 0
+	set n 0
-	
+	while {$n < [string bytelength $data]} {
-	append s "[format "%07x" $addr]: "
+		set bytes [string byterange $data $n $($n+15)]
-	set t ""
+		binary scan $bytes H* hex
-        for {set i 0} {$i < [string length $str]} {incr i} {
+		set hex [regexp -all -inline .. $hex]
-		if {$i > 0 && [expr $i % 16] == 0} {
+		regsub -all -- {[^a-z]} $bytes . ascii
-			append s "  $t\n"
+		append dump [format "%04X: %-48s %-16s\n" $n $hex $ascii]
-			append s "[format "%07x" $addr]: "
+		incr n 16
-			incr addr 16 
+	}
-			set t ""
+	puts $dump
-		} elseif {$i > 0 && [expr $i % 2] == 0} {
-			append s " "
-		}
-
-		set char [string index $str $i]
-                binary scan $char H2 cc
-                append s $cc
-		if {[string is print $char]} {
-			append t $char
-		} else {
-			append t "."
-		}
-        }
-	puts $s
 }
 

var/mongoose/lib/overrides

@@ -0,0 +1,10 @@
+
+proc {dict merge} {dict args} {
+	foreach d $args {
+		foreach k [dict keys $d] {
+			dict set dict $k [dict get $d $k]
+		}
+	}
+	return $dict
+}
+

var/mongoose/lib/setup

@@ -54,6 +54,6 @@ if {![exists -proc require]} {
 		}
 	}
 
-	require fileops
+	require fileops overrides
 }