This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Delete remaining parseCommandFIXMEs.
- From: cagney at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 27 Feb 2008 05:33:19 -0000
- Subject: [SCM] master: Delete remaining parseCommandFIXMEs.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via 090326a700daee630229c0654a16884fe6816223 (commit)
from e843db654791fb4bf47fd301bc18499d0ade8cb0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 090326a700daee630229c0654a16884fe6816223
Author: Andrew Cagney <cagney@redhat.com>
Date: Wed Feb 27 00:32:21 2008 -0500
Delete remaining parseCommandFIXMEs.
frysk-core/frysk/bindir/ChangeLog
2008-02-27 Andrew Cagney <cagney@redhat.com>
* fcatch.java (parseCommand(Proc)): Replace parseCommandFIXME.
* fstep.java: Ditto.
frysk-core/frysk/util/ChangeLog
2008-02-27 Andrew Cagney <cagney@redhat.com>
* CommandlineParser.java (parseCommandFIXME(String[])): Delete.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/bindir/ChangeLog | 5 +++++
frysk-core/frysk/bindir/fcatch.java | 13 +++++++------
frysk-core/frysk/bindir/fstep.java | 4 ++--
frysk-core/frysk/bindir/ftrace.java | 15 +++++++--------
frysk-core/frysk/util/ChangeLog | 4 ++++
frysk-core/frysk/util/CommandlineParser.java | 15 +++------------
6 files changed, 28 insertions(+), 28 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index 8a6d763..d54bc4d 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-27 Andrew Cagney <cagney@redhat.com>
+
+ * fcatch.java (parseCommand(Proc)): Replace parseCommandFIXME.
+ * fstep.java: Ditto.
+
2008-02-26 Andrew Cagney <cagney@redhat.com>
* fhpd.java (parseCommand(Proc)): Replace parseCommandFIXME.
diff --git a/frysk-core/frysk/bindir/fcatch.java b/frysk-core/frysk/bindir/fcatch.java
index 069c0b0..6bc7dfd 100644
--- a/frysk-core/frysk/bindir/fcatch.java
+++ b/frysk-core/frysk/bindir/fcatch.java
@@ -43,7 +43,7 @@ import java.util.logging.Logger;
import frysk.util.Util;
import frysk.util.CommandlineParser;
import frysk.util.FCatch;
-
+import frysk.proc.Proc;
import gnu.classpath.tools.getopt.Option;
import gnu.classpath.tools.getopt.OptionException;
@@ -65,11 +65,12 @@ public class fcatch {
}
//@Override
- public void parseCommandFIXME(String[] command) {
- System.err.println("Entered parseCommand");
- argString = new StringBuffer(command[0]);
- for (int i = 1; i < command.length; i++)
- argString.append(" ").append(command[i]);
+ public void parseCommand(Proc command) {
+ // FIXME: This concatinatin the string is unnecessary.
+ String[] line = command.getCmdLine();
+ argString = new StringBuffer(line[0]);
+ for (int i = 1; i < line.length; i++)
+ argString.append(" ").append(line[i]);
}
};
diff --git a/frysk-core/frysk/bindir/fstep.java b/frysk-core/frysk/bindir/fstep.java
index e8a783a..282142b 100644
--- a/frysk-core/frysk/bindir/fstep.java
+++ b/frysk-core/frysk/bindir/fstep.java
@@ -92,8 +92,8 @@ public class fstep
final CommandlineParser parser = new CommandlineParser("fstep")
{
- public void parseCommandFIXME(String[] command) {
- fstep.command = command;
+ public void parseCommand(Proc command) {
+ fstep.command = command.getCmdLine();
}
};
diff --git a/frysk-core/frysk/bindir/ftrace.java b/frysk-core/frysk/bindir/ftrace.java
index 98d66e0..06c7972 100644
--- a/frysk-core/frysk/bindir/ftrace.java
+++ b/frysk-core/frysk/bindir/ftrace.java
@@ -699,14 +699,13 @@ class ftrace
throw new OptionException("no command or PID specified");
}
- //@Override
- public void parseCommandFIXME(String[] command)
- {
- commandAndArguments = new ArrayList();
-
- for (int i = 0; i < command.length; i++)
- commandAndArguments.add(command[i]);
- }
+ //@Override
+ public void parseCommand(Proc command) {
+ String[] line = command.getCmdLine();
+ commandAndArguments = new ArrayList();
+ for (int i = 0; i < line.length; i++)
+ commandAndArguments.add(line[i]);
+ }
//@Override
public void parsePids(Proc[] procs) {
diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog
index cb51cfa..02f6317 100644
--- a/frysk-core/frysk/util/ChangeLog
+++ b/frysk-core/frysk/util/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-27 Andrew Cagney <cagney@redhat.com>
+
+ * CommandlineParser.java (parseCommandFIXME(String[])): Delete.
+
2008-02-26 Andrew Cagney <cagney@redhat.com>
* CommandlineParser.java (parseCoresFIXME(CoreExePair[])): Delete.
diff --git a/frysk-core/frysk/util/CommandlineParser.java b/frysk-core/frysk/util/CommandlineParser.java
index 7f14c06..03347ec 100644
--- a/frysk-core/frysk/util/CommandlineParser.java
+++ b/frysk-core/frysk/util/CommandlineParser.java
@@ -103,16 +103,6 @@ public class CommandlineParser {
}
/**
- * Callback function. Gives a string array represented a parsed
- * command. Clients should instead accept the parsed and verified
- * Proc.
- *
- * @param command The parsed command.
- */
- public void parseCommandFIXME(String[] command) {
- parseCommand(LinuxExeFactory.createProc(command));
- }
- /**
* Callback function. Gives a Proc represented a parsed command.
*
* @param command The parsed command.
@@ -197,8 +187,9 @@ public class CommandlineParser {
}
// If not above, then this is an executable command.
- fine.log(this, "parse command", result);
- parseCommandFIXME(result);
+ Proc command = LinuxExeFactory.createProc(result);
+ fine.log(this, "parse command", command);
+ parseCommand(command);
return result;
}
hooks/post-receive
--
frysk system monitor/debugger