Changeset 8d1f92f in mainline for uspace/app/bdsh/cmds/modules/rm/rm.c

Timestamp:

2015-05-24T09:34:05Z (9 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

fc7bf19

Parents:

a18a8b9 (diff), 91deaff (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:

Sync with mainline

File:

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

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

@@ -261 +261 @@
         }
 
-        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, "hvrfs", long_options, &opt_ind);
                 switch (c) {