Changeset f3a37e28 in mainline

Timestamp:

2012-08-20T18:04:01Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7eaeec1

Parents:

1f136a27

Message:

bdsh: fix cmp

File:

• uspace/app/bdsh/cmds/modules/cmp/cmp.c (modified) (6 diffs)

uspace/app/bdsh/cmds/modules/cmp/cmp.c

@@ -29 +29 @@
 #include <errno.h>
 #include <fcntl.h>
+#include <getopt.h>
 #include <mem.h>
 #include <stdio.h>
@@ -46 +47 @@
 #define CMP_BUFLEN 1024
 
+static struct option const long_options[] = {
+        { "help", no_argument, 0, 'h' },
+        { "version", no_argument, 0, 'v' },
+        { 0, 0, 0, 0 }
+};
+
 /* Dispays help for cat in various levels */
 void help_cmd_cmp(unsigned int level)
@@ -55 +62 @@
                 printf(
                 "Usage:  %s [options] <file1> <file2>\n"
+                "Options:\n"
+                "  -h, --help       A short option summary\n"
+                "  -v, --version    Print version information and exit\n"
                 "No output is printed; the return code is 1 if the files differ.\n",
                 cmdname);
@@ -64 +74 @@
 static int cmp_files(const char *fn0, const char *fn1)
 {
-        int fd0, fd1;
-        char buffer0[CMP_BUFLEN], buffer1[CMP_BUFLEN];
-        ssize_t size0, size1;
-        ssize_t offset0, offset1;
+        int rc = 0;
+        const char *fn[2] = {fn0, fn1};
+        int fd[2] = {-1, -1};
+        char buffer[2][CMP_BUFLEN];
+        ssize_t offset[2];
 
-        fd0 = open(fn0, O_RDONLY);
-        if (fd0 < 0) {
-                printf("Unable to open %s\n", fn0);
-                return errno;
-        }
-        fd1 = open(fn1, O_RDONLY);
-        if (fd1 < 0) {
-                printf("Unable to open %s\n", fn1);
-                return errno;
+        for (int i = 0; i < 2; i++) {
+                fd[i] = open(fn[i], O_RDONLY);
+                if (fd[i] < 0) {
+                        rc = errno;
+                        printf("Unable to open %s\n", fn[i]);
+                        goto end;
+                }
         }
 
         do {
-                offset0 = offset1 = 0;
+                for (int i = 0; i < 2; i++) {
+                        offset[i] = 0;
+                        ssize_t size;
+                        do {
+                                size = read(fd[i], buffer[i] + offset[i],
+                                    CMP_BUFLEN - offset[i]);
+                                if (size < 0) {
+                                        rc = errno;
+                                        printf("Error reading from %s\n",
+                                            fn[i]);
+                                        goto end;
+                                }
+                                offset[i] += size;
+                        } while (size && offset[i] < CMP_BUFLEN);
+                }
 
-                do {
-                        size0 = read(fd0, buffer0 + offset0,
-                            CMP_BUFLEN - offset0);
-                        if (size0 < 0) {
-                                printf("Error reading from %s\n", fn0);
-                                return errno;
-                        }
-                        offset0 += size0;
-                } while (size0 && offset0 < CMP_BUFLEN);
+                if (offset[0] != offset[1] ||
+                    bcmp(buffer[0], buffer[1], offset[0])) {
+                        rc = 1;
+                        goto end;
+                }
+        } while (offset[0] == CMP_BUFLEN);
 
-                do {
-                        size1 = read(fd1, buffer1 + offset1,
-                            CMP_BUFLEN - offset1);
-                        if (size1 < 0) {
-                                printf("Error reading from %s\n", fn1);
-                                return errno;
-                        }
-                        offset1 += size1;
-                } while (size1 && offset1 < CMP_BUFLEN);
-
-                if (offset0 != offset1)
-                        return 1;
-                if (bcmp(buffer0, buffer1, offset0))
-                        return 1;
-        } while (offset0 == CMP_BUFLEN);
-
-        return 0;
+end:
+        if (fd[0] >= 0)
+                close(fd[0]);
+        if (fd[1] >= 0)
+                close(fd[1]);
+        return rc;
 }
 
@@ -115 +124 @@
 int cmd_cmp(char **argv)
 {
+        int rc;
         unsigned int argc;
-        int rc;
+        int c, opt_ind;
         
         argc = cli_count_args(argv);
-        if (argc != 3) {
+
+        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+                c = getopt_long(argc, argv, "hv", long_options, &opt_ind);
+                switch (c) {
+                case 'h':
+                        help_cmd_cmp(HELP_LONG);
+                        return CMD_SUCCESS;
+                case 'v':
+                        printf("%s\n", CMP_VERSION);
+                        return CMD_SUCCESS;
+                }
+        }
+
+        if (argc - optind != 2) {
                 printf("%s - incorrect number of arguments. Try `%s --help'\n",
                         cmdname, cmdname);
@@ -125 +148 @@
         }
 
-        rc = cmp_files(argv[1], argv[2]);
+        rc = cmp_files(argv[optind], argv[optind + 1]);
         if (rc)
                 return CMD_FAILURE;