jnode-svn-commits Mailing List for JNode: new Java Operating System (Page 7)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5851
          http://jnode.svn.sourceforge.net/jnode/?rev=5851&view=rev
Author:   lsantha
Date:     2011-08-17 19:41:28 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
Added shell command: cmp.

Modified Paths:
--------------
    trunk/cli/descriptors/org.jnode.command.file.xml

Added Paths:
-----------
    trunk/cli/src/commands/org/jnode/command/file/CmpCommand.java

Modified: trunk/cli/descriptors/org.jnode.command.file.xml
===================================================================

--- trunk/cli/descriptors/org.jnode.command.file.xml	2011-08-16 21:16:00 UTC (rev 5850)
+++ trunk/cli/descriptors/org.jnode.command.file.xml	2011-08-17 19:41:28 UTC (rev 5851)
@@ -26,6 +26,7 @@
   <extension point="org.jnode.shell.aliases">
     <alias name="cat"     class="org.jnode.command.file.CatCommand"/>
     <alias name="cd"      class="org.jnode.command.file.CdCommand" internal="yes"/>
+    <alias name="cmp"     class="org.jnode.command.file.CmpCommand"/>
     <alias name="cp"      class="org.jnode.command.file.CpCommand"/>
     <alias name="cut"     class="org.jnode.command.file.CutCommand"/>
     <alias name="del"     class="org.jnode.command.file.DeleteCommand"/>
@@ -74,6 +75,12 @@
       <empty description="change the current directory to the 'user.home' directory"/>
       <argument argLabel="directory" description="change the current directory to 'directory'"/>
     </syntax>
+    <syntax alias="cmp">
+      <sequence description="compare two files">
+        <argument argLabel="file1"/>
+        <argument argLabel="file2"/>
+      </sequence>
+    </syntax>
     <syntax alias="cp">
       <sequence description="copy files or directories">
         <optionSet>

Added: trunk/cli/src/commands/org/jnode/command/file/CmpCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/CmpCommand.java	                        (rev 0)
+++ trunk/cli/src/commands/org/jnode/command/file/CmpCommand.java	2011-08-17 19:41:28 UTC (rev 5851)
@@ -0,0 +1,123 @@
+package org.jnode.command.file;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import org.jnode.shell.AbstractCommand;
+import org.jnode.shell.syntax.Argument;
+import org.jnode.shell.syntax.FileArgument;
+
+/**
+ * Compare two files and report the first difference.
+ *
+ * @author Levente S\u00e1ntha
+ */
+public class CmpCommand extends AbstractCommand {
+
+    private static final int BUFFER_SIZE = 64 * 1024;
+
+    private static final String HELP_SUPER = "Compare two files";
+    private static final String HELP_FILE = "a file to compare";
+    private static final String ERR_FILE_INVALID = "%s is not a file%n";
+    private static final String MSG_DIFFER = "%s %s differ: byte %d, line %d%n";
+    private static final String MSG_EOF = "cmp: EOF on %s%n";
+
+    private final FileArgument file1Arg;
+    private final FileArgument file2Arg;
+
+    public CmpCommand() {
+        super(HELP_SUPER);
+
+        file1Arg = new FileArgument("file1", Argument.MANDATORY | Argument.EXISTING, HELP_FILE);
+        file2Arg = new FileArgument("file2", Argument.MANDATORY | Argument.EXISTING, HELP_FILE);
+
+        registerArguments(file1Arg, file2Arg);
+    }
+
+    public static void main(String[] args) throws Exception {
+        new CmpCommand().execute(args);
+    }
+
+    @Override
+    public void execute() throws IOException {
+
+        File file1 = file1Arg.getValue();
+        File file2 = file2Arg.getValue();
+
+        PrintWriter err = getError().getPrintWriter();
+
+        if (!file1.isFile()) {
+            err.format(ERR_FILE_INVALID, file1);
+            exit(1);
+        }
+
+        if (!file2.isFile()) {
+            err.format(ERR_FILE_INVALID, file2);
+            exit(1);
+        }
+
+        BufferedInputStream bis1 = null;
+        BufferedInputStream bis2 = null;
+
+        try {
+            bis1 = new BufferedInputStream(new FileInputStream(file1), BUFFER_SIZE);
+            bis2 = new BufferedInputStream(new FileInputStream(file2), BUFFER_SIZE);
+
+            long bc = 1;
+            long lc = 1;
+
+            while (true) {
+                int b1 = bis1.read();
+                int b2 = bis2.read();
+
+                if (b1 == -1 && b2 == -1)
+                    //done
+                    break;
+
+                if (b1 == -1) {
+                    PrintWriter out = getOutput().getPrintWriter();
+                    out.format(MSG_EOF, file1.toString());
+                    exit(1);
+                    return;
+                }
+
+                if (b2 == -1) {
+                    PrintWriter out = getOutput().getPrintWriter();
+                    out.format(MSG_EOF, file2.toString());
+                    exit(1);
+                    return;
+                }
+
+                if (b1 != b2) {
+                    PrintWriter out = getOutput().getPrintWriter();
+                    out.format(MSG_DIFFER, file1.toString(), file2.toString(), bc, lc);
+                    exit(1);
+                    return;
+                }
+
+                bc++;
+
+                if (b1 == (byte) '\n')
+                    lc++;
+            }
+        } finally {
+            if (bis1 != null) {
+                try {
+                    bis1.close();
+                } catch (IOException x) {
+                    //ignore
+                }
+            }
+
+            if (bis2 != null) {
+                try {
+                    bis2.close();
+                } catch (IOException x) {
+                    //ignore
+                }
+            }
+        }
+    }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (97)
2007	Jan (127)	Feb (34)	Mar (16)	Apr (26)	May (55)	Jun (107)	Jul (36)	Aug (72)	Sep (90)	Oct (41)	Nov (27)	Dec (13)
2008	Jan (37)	Feb (39)	Mar (98)	Apr (115)	May (134)	Jun (120)	Jul (86)	Aug (149)	Sep (68)	Oct (66)	Nov (104)	Dec (49)
2009	Jan (131)	Feb (132)	Mar (125)	Apr (172)	May (161)	Jun (43)	Jul (47)	Aug (38)	Sep (18)	Oct (6)	Nov (1)	Dec (15)
2010	Jan (21)	Feb (8)	Mar (10)	Apr (4)	May (9)	Jun	Jul (1)	Aug	Sep	Oct (2)	Nov	Dec (4)
2011	Jan (23)	Feb (10)	Mar (13)	Apr (3)	May	Jun (19)	Jul (11)	Aug (22)	Sep	Oct (4)	Nov (2)	Dec (12)
2012	Jan (3)	Feb (4)	Mar (7)	Apr (3)	May	Jun (1)	Jul (1)	Aug (30)	Sep (3)	Oct (2)	Nov	Dec (8)
2013	Jan (3)	Feb (40)	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov (12)	Dec
2021	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (2)	Oct	Nov	Dec

jnode-svn-commits Mailing List for JNode: new Java Operating System (Page 7)

jnode-svn-commits — Subversion commit notifications