Coverage test fixes and whitespace/doc tweaks.

doc/scripts/DocSourcesList.cmake

@@ -164,9 +164,12 @@ rest_target(${psd} base/protocols/ssl/main.bro)
 rest_target(${psd} base/protocols/ssl/mozilla-ca-list.bro)
 rest_target(${psd} base/protocols/syslog/consts.bro)
 rest_target(${psd} base/protocols/syslog/main.bro)
+rest_target(${psd} base/utils/active-http.bro)
 rest_target(${psd} base/utils/addrs.bro)
 rest_target(${psd} base/utils/conn-ids.bro)
+rest_target(${psd} base/utils/dir.bro)
 rest_target(${psd} base/utils/directions-and-hosts.bro)
+rest_target(${psd} base/utils/exec.bro)
 rest_target(${psd} base/utils/files.bro)
 rest_target(${psd} base/utils/numbers.bro)
 rest_target(${psd} base/utils/paths.bro)

scripts/base/utils/active-http.bro

@@ -12,10 +12,10 @@ export {
 	## The default HTTP method/verb to use for requests.
 	const default_method = "GET" &redef;
 
- 	type Response: record {
+	type Response: record {
 		## Numeric response code from the server.
 		code:      count;
-		## String response messgae from the server.
+		## String response message from the server.
 		msg:       string;
 		## Full body of the response.
 		body:      string                  &optional;
@@ -29,7 +29,7 @@ export {
 		## The HTTP method/verb to use for the request.
 		method:          string                  &default=default_method;
 		## Data to send to the server in the client body.  Keep in
-		## mind that you will probably need to set the $method field
+		## mind that you will probably need to set the *method* field
 		## to "POST" or "PUT".
 		client_data:     string                  &optional;
 		## Arbitrary headers to pass to the server.  Some headers

scripts/base/utils/exec.bro

@@ -1,6 +1,4 @@
 ##! A module for executing external command line programs.
-##! This requires code that is still in topic branches and 
-##! definitely won't currently work on any released version of Bro.
 
 @load base/frameworks/input
 
@@ -8,15 +6,13 @@ module Exec;
 
 export {
 	type Command: record {
-		## The command line to execute.
-		## Use care to avoid injection attacks!
+		## The command line to execute.  Use care to avoid injection attacks.
+		## I.e. if the command uses untrusted/variable data, sanitize it.
 		cmd:         string;
-		## Provide standard in to the program as a
-		## string.
+		## Provide standard in to the program as a string.
 		stdin:       string      &default="";
-		## If additional files are required to be read 
-		## in as part of the output of the command they
-		## can be defined here.
+		## If additional files are required to be read in as part of the output
+		## of the command they can be defined here.
 		read_files:  set[string] &optional;
 	};
 

testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log

@@ -3,7 +3,7 @@
 #empty_field	(empty)
 #unset_field	-
 #path	loaded_scripts
-#open	2013-07-10-21-18-31
+#open	2013-07-22-16-01-22
 #fields	name
 #types	string
 scripts/base/init-bare.bro
@@ -90,12 +90,17 @@ scripts/base/init-bare.bro
 scripts/base/init-default.bro
   scripts/base/utils/site.bro
     scripts/base/utils/patterns.bro
+  scripts/base/utils/active-http.bro
+    scripts/base/utils/exec.bro
   scripts/base/utils/addrs.bro
   scripts/base/utils/conn-ids.bro
+  scripts/base/utils/dir.bro
+    scripts/base/frameworks/reporter/__load__.bro
+      scripts/base/frameworks/reporter/main.bro
+    scripts/base/utils/paths.bro
   scripts/base/utils/directions-and-hosts.bro
   scripts/base/utils/files.bro
   scripts/base/utils/numbers.bro
-  scripts/base/utils/paths.bro
   scripts/base/utils/queue.bro
   scripts/base/utils/strings.bro
   scripts/base/utils/thresholds.bro
@@ -129,8 +134,6 @@ scripts/base/init-default.bro
   scripts/base/frameworks/intel/__load__.bro
     scripts/base/frameworks/intel/main.bro
     scripts/base/frameworks/intel/input.bro
-  scripts/base/frameworks/reporter/__load__.bro
-    scripts/base/frameworks/reporter/main.bro
   scripts/base/frameworks/sumstats/__load__.bro
     scripts/base/frameworks/sumstats/main.bro
     scripts/base/frameworks/sumstats/plugins/__load__.bro
@@ -195,4 +198,4 @@ scripts/base/init-default.bro
   scripts/base/protocols/tunnels/__load__.bro
   scripts/base/misc/find-checksum-offloading.bro
 scripts/policy/misc/loaded-scripts.bro
-#close	2013-07-10-21-18-31
+#close	2013-07-22-16-01-22