Change the default to non-log-style stdout/stderr output for the CLI.

For the Linux PBA, the default is that everything goes to stderr in
log style (prepended with the date).

If the user would like log style output sent to stderr only with the
CLI, the new -l option will turn that on.

Author: kendmerry

Common/DtaOptions.cpp

@@ -30,6 +30,7 @@ void usage()
     printf("sedutil-cli <-v> <-n> <action> <options> <device>\n");
     printf("-v (optional)                       increase verbosity, one to five v's\n");
     printf("-n (optional)                       no password hashing. Passwords will be sent in clear text!\n");
+    printf("-l (optional)                       log style output to stderr only\n");
     printf("actions \n");
     printf("--scan \n");
     printf("                                Scans the devices on the system \n");
@@ -133,10 +134,10 @@ uint8_t DtaOptions(int argc, char * argv[], DTA_OPTIONS * opts)
 			opts->no_hash_passwords = true;
 			LOG(D) << "Password hashing is disabled";
                 }
-		else if (!strcmp("-x", argv[i])) {
+		else if (!strcmp("-l", argv[i])) {
 			baseOptions += 1;
-			opts->output_format = sedutilReadable;
-			output_format = sedutilReadable;
+			opts->output_format = sedutilNormal;
+			outputFormat = sedutilNormal;
 		}
 		else if (!(('-' == argv[i][0]) && ('-' == argv[i][1])) && 
 			(0 == opts->action))

Common/log.h

@@ -313,12 +313,12 @@ class FILELOG_DECLSPEC RCLog : public RLog<Output2FILE> {
 	else if (level > CLog::Level() || !Output2FILE::Stream()) ; \
 	else
 
-extern sedutiloutput output_format;
+extern sedutiloutput outputFormat;
 
 #define	LOGX(level) \
 	if (level > CLOG_MAX_LEVEL) ;\
 	else if (level > RCLog::Level() || !Output2FILE::Stream()) ; \
-	else RCLog().Get(level, output_format)
+	else RCLog().Get(level, outputFormat)
 #define	LOG LOGX
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)

Common/sedutil.cpp

@@ -29,7 +29,8 @@ along with sedutil.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace std;
 
-sedutiloutput output_format;
+/* Default to output that omits timestamps and goes to stdout */
+sedutiloutput outputFormat = sedutilReadable;
 
 int isValidSEDDisk(char *devname)
 {

LinuxPBA/LinuxPBA.cpp

@@ -28,6 +28,9 @@ This software is Copyright 2014-2017 Bright Plaza Inc. <[email protected]
 
 using namespace std;
 
+/* Default to output that includes timestamps and goes to stderr*/
+sedutiloutput outputFormat = sedutilNormal;
+
 int main(int argc, char** argv) {
 
     CLog::Level() = CLog::FromInt(0);