Changeset 2fbba84

Timestamp:

Jul 10, 2012, 3:45:22 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

035791

Parents:

516fb4

Message:

tempcommit: getInputFileNames() needs optind.

File:

• src/bin/mpqc/mpqc.cc (modified) (4 diffs)

src/bin/mpqc/mpqc.cc

@@ -363 +363 @@
     const char *&generic_input,
     GetLongOpt &options,
+    int optind,
     int argc,
     char **argv)
@@ -375 +376 @@
     generic_input = argv[optind];
   }
-  else {
+  else if (!options.retrieve("n")) {
     options.usage();
     throw invalid_argument("extra arguments given");
@@ -383 +384 @@
     generic_input = "mpqc.in";
     }
-  else if (object_input && generic_input) {
+  else if (object_input && !options.retrieve("n") && generic_input) {
     options.usage();
     throw invalid_argument("only one of -f and a file argument can be given");
@@ -1517 +1518 @@
   const char *object_input = 0;
   const char *generic_input = 0;
-  getInputFileNames(object_input, generic_input, options, argc, argv);
+  getInputFileNames(object_input, generic_input, options, optind, argc, argv);
   const char *input;
   if (object_input) input = object_input;