Changeset 86cf96d in mainline

Timestamp:

2015-04-29T12:40:14Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3811c9

Parents:

dcba819

git-author:

Luka Strižić <luka@…> (2015-04-29 12:40:14)

git-committer:

Jakub Jermar <jakub@…> (2015-04-29 12:40:14)

Message:

Set optreset before each option parsing
(Thanks to Luka Strižić)

bdsh modules such as ls can be used repeatedly within the lifetime of
the bdsh task. As such, they need to set the optreset variable before
each command line options evaluation.

Location:

uspace/app/bdsh/cmds/modules

Files:

• cat/cat.c (modified) (1 diff)
• cmp/cmp.c (modified) (1 diff)
• cp/cp.c (modified) (1 diff)
• ls/ls.c (modified) (1 diff)
• mkdir/mkdir.c (modified) (1 diff)
• mkfile/mkfile.c (modified) (1 diff)
• mount/mount.c (modified) (1 diff)
• rm/rm.c (modified) (1 diff)
• touch/touch.c (modified) (1 diff)

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

@@ -324 +324 @@
         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, "xhvmH:t:b:s:n", long_options, &opt_ind);
                 switch (c) {

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) {

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

@@ -457 +457 @@
         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, "hvVfirb:", long_options, &opt_ind);
                 switch (c) { 

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

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

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

@@ -173 +173 @@
         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, "pvhVfm:", long_options, &opt_ind);
                 switch (c) {

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

@@ -126 +126 @@
         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, "ps:h", long_options, &opt_ind);
                 switch (c) {

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

@@ -117 +117 @@
         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, "i:h", long_options, &opt_ind);
                 switch (c) {

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) {

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

@@ -90 +90 @@
         DIR *dirp;
         
-        for (c = 0, optind = 0, longind = 0; c != -1; ) {
+        for (c = 0, optreset = 1, optind = 0, longind = 0; c != -1; ) {
                 c = getopt_long(argc, argv, "c", long_options, &longind);
                 switch (c) {