Changeset 36b128 for molecuilder/src

Timestamp:

Apr 29, 2008, 6:57:59 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

7b1cea

Parents:

dac5c5

Message:

Comply with test again: help and version command options exit at once

This had been changed to just flag=2 for this, as molecule and periodentafel structures were not free'd, but this broke the test, so we changed it back and added some delete()s.

File:

• molecuilder/src/builder.cpp (modified) (4 diffs)

molecuilder/src/builder.cpp

@@ -725 +725 @@
   output.close();
   output.clear();
+  if (!strcmp(configuration->configpath, configuration->GetDefaultPath())) {
+    cerr << "WARNING: config is found under different path then stated in config file::defaultpath!" << endl;
+  }
 };
 
@@ -773 +776 @@
           case 'H':
           case '?':
-            flag=2;
             cout << "MoleCuilder suite" << endl << "==================" << endl << endl;
             cout << "Usage: " << argv[0] << "[-{acepsthH?vfrp}] [further arguments] [config file]" << endl; 
@@ -787 +789 @@
             cout << "\t-v/-V\t\tGives version information." << endl;
             cout << "Note: config files must not begin with '-' !" << endl;
+            delete(mol);
+            delete(periode);
+            return (0);
             break;
           case 'v':
           case 'V':
-            flag=2;
             cout << argv[0] << " " << VERSIONSTRING << endl;
             cout << "Build your own molecule position set." << endl;
+            delete(mol);
+            delete(periode);
+            return (0);
             break;
           case 'e':
@@ -1005 +1012 @@
           } else argptr++;
         } while (argptr < (argc-1));
-    if (flag == 1)  // 1 means save and exit
+    if (flag == 1) { // 1 means save and exit
       SaveConfig(ConfigFileName, &configuration, periode, mol);
-    if (flag > 1) { // 2 means just exit
       delete(mol);
       delete(periode);