Changeset 94e46c9 in mainline for uspace/app/bdsh/cmds/modules/cmp/cmp.c

Timestamp:

2015-05-23T04:09:11Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

• uspace/app/bdsh/cmds/modules/cmp/cmp.c (modified) (1 diff)

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

@@ -130 +130 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hv", long_options, &opt_ind);
                 switch (c) {