BIND 10 master, updated. b8d6b949eb7f4705e32fbdfd7694ca2e6a6a5cdc [2700] Fix issue where the cmd line switches are printed as ASCII codes.
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 12 11:29:32 UTC 2013
The branch, master has been updated
via b8d6b949eb7f4705e32fbdfd7694ca2e6a6a5cdc (commit)
from ea110815f2864c353ac69ba54dd837987890d496 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b8d6b949eb7f4705e32fbdfd7694ca2e6a6a5cdc
Author: Marcin Siodelski <marcin at isc.org>
Date: Tue Feb 12 10:55:17 2013 +0100
[2700] Fix issue where the cmd line switches are printed as ASCII codes.
-----------------------------------------------------------------------
Summary of changes:
tests/tools/perfdhcp/command_options.cc | 16 +++++++++-------
tests/tools/perfdhcp/command_options.h | 8 +++++---
tests/tools/perfdhcp/main.cc | 8 ++++++--
3 files changed, 20 insertions(+), 12 deletions(-)
-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/command_options.cc b/tests/tools/perfdhcp/command_options.cc
index f770373..9433442 100644
--- a/tests/tools/perfdhcp/command_options.cc
+++ b/tests/tools/perfdhcp/command_options.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
@@ -87,7 +87,7 @@ CommandOptions::reset() {
}
bool
-CommandOptions::parse(int argc, char** const argv) {
+CommandOptions::parse(int argc, char** const argv, bool print_cmd_line) {
// Reset internal variables used by getopt
// to eliminate undefined behavior when
// parsing different command lines multiple times
@@ -125,7 +125,7 @@ CommandOptions::parse(int argc, char** const argv) {
reset();
// Informs if program has been run with 'h' or 'v' option.
- bool help_or_version_mode = initialize(argc, argv);
+ bool help_or_version_mode = initialize(argc, argv, print_cmd_line);
if (!help_or_version_mode) {
validate();
}
@@ -133,7 +133,7 @@ CommandOptions::parse(int argc, char** const argv) {
}
bool
-CommandOptions::initialize(int argc, char** argv) {
+CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
int opt = 0; // Subsequent options returned by getopt()
std::string drop_arg; // Value of -D<value>argument
size_t percent_loc = 0; // Location of % sign in -D<value>
@@ -151,10 +151,10 @@ CommandOptions::initialize(int argc, char** argv) {
// they will be tuned and validated elsewhere
while((opt = getopt(argc, argv, "hv46r:t:R:b:n:p:d:D:l:P:a:L:"
"s:iBc1T:X:O:E:S:I:x:w:")) != -1) {
- stream << " -" << opt;
+ stream << " -" << static_cast<char>(opt);
if (optarg) {
stream << " " << optarg;
- }
+ }
switch (opt) {
case '1':
use_first_ = true;
@@ -416,7 +416,9 @@ CommandOptions::initialize(int argc, char** argv) {
}
}
- std::cout << "Running: " << stream.str() << std::endl;
+ if (print_cmd_line) {
+ std::cout << "Running: " << stream.str() << std::endl;
+ }
// Handle the local '-l' address/interface
if (!localname_.empty()) {
diff --git a/tests/tools/perfdhcp/command_options.h b/tests/tools/perfdhcp/command_options.h
index cbb6236..4b804dc 100644
--- a/tests/tools/perfdhcp/command_options.h
+++ b/tests/tools/perfdhcp/command_options.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
@@ -56,9 +56,10 @@ public:
///
/// \param argc Argument count passed to main().
/// \param argv Argument value array passed to main().
+ /// \param print_cmd_line Print the command line being run to the console.
/// \throws isc::InvalidParameter if parse fails.
/// \return true if program has been run in help or version mode ('h' or 'v' flag).
- bool parse(int argc, char** const argv);
+ bool parse(int argc, char** const argv, bool print_cmd_line = false);
/// \brief Returns IP version.
///
@@ -261,9 +262,10 @@ private:
///
/// \param argc Argument count passed to main().
/// \param argv Argument value array passed to main().
+ /// \param print_cmd_line Print the command line being run to the console.
/// \throws isc::InvalidParameter if command line options initialization fails.
/// \return true if program has been run in help or version mode ('h' or 'v' flag).
- bool initialize(int argc, char** argv);
+ bool initialize(int argc, char** argv, bool print_cmd_line);
/// \brief Validates initialized options.
///
diff --git a/tests/tools/perfdhcp/main.cc b/tests/tools/perfdhcp/main.cc
index aa202f1..a5254fc 100644
--- a/tests/tools/perfdhcp/main.cc
+++ b/tests/tools/perfdhcp/main.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
@@ -32,7 +32,11 @@ main(int argc, char* argv[]) {
// If parser returns true it means that user specified
// 'h' or 'v' command line option. Program shows the
// help or version message and exits here.
- if (command_options.parse(argc, argv)) {
+ // The third argument indicates that the command line
+ // should be printed when it gets parsed. This is useful
+ // in particular when the command line needs to be
+ // extracted from the log file.
+ if (command_options.parse(argc, argv, true)) {
return (ret_code);
}
} catch(isc::Exception& e) {
More information about the bind10-changes
mailing list