Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  Fix memory access error in nfs.proc.read_setup, nfs.proc.write_setup and nfs.proc.commit_setup
  Update NEWS regarding the systemtap client/server.
  New man page for the systemtap client/server and related utilities.
  Repopulate symbol/type info.
  Pushed quiesce logic down into the task_finder layer.
  Added bug 6841 fix utrace syscall test.
  PR6731: improve listing mode to list variables

1 files changed, 13 insertions, 0 deletions

diff --git a/main.cxx b/main.cxx
index 8807a03d..11244d8d 100644
--- a/main.cxx
+++ b/main.cxx
@@ -179,6 +179,18 @@ printscript(systemtap_session& s, ostream& o)
           if (seen.find (pp) == seen.end())
             {
               o << pp << endl;
+              if (s.verbose) {
+	              for (unsigned j=0; j<p->locals.size(); j++)
+		            {
+        		      vardecl* v = p->locals[j];
+	        	      if (j>0)
+			      	o << ", ";
+        		      else
+		      		o << "  ";
+		              v->printsig (o);
+		            }
+	              o << endl;
+              }
               seen.insert (pp);
             }
         }
@@ -581,6 +593,7 @@ main (int argc, char * const argv [])
         case 'l':
 	  s.suppress_warnings = true;
           s.listing_mode = true;
+          s.unoptimized = true;
           s.last_pass = 2;
           if (have_script)
             {