From 0fcda712a220abea5dc7a6e60c4f406ca14d34dc Mon Sep 17 00:00:00 2001
From: Wei Mao <weimao1@gmail.com>
Date: Tue, 21 Mar 2017 06:44:26 -0700
Subject: Add cmdline option -u for Unicode (UTF-16) output

---
 setup/devcon/devcon.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'setup/devcon/devcon.cpp')

diff --git a/setup/devcon/devcon.cpp b/setup/devcon/devcon.cpp
index 08736c82..1328b91c 100644
--- a/setup/devcon/devcon.cpp
+++ b/setup/devcon/devcon.cpp
@@ -14,8 +14,6 @@ Abstract:
 --*/
 
 #include "devcon.h"
-#include <io.h>
-#include <fcntl.h>
 
 struct IdEntry {
     LPCTSTR String;     // string looking for
@@ -1077,13 +1075,9 @@ Return Value:
     // -m:<machine>  - remote
     // -r            - auto reboot
     // -f            - force operation
+    // -u            - unicode output
     //
 
-#ifdef UNICODE
-    _setmode(_fileno(stdout), _O_WTEXT);
-    _setmode(_fileno(stderr), _O_WTEXT);
-#endif
-
     baseName = _tcsrchr(argv[0],TEXT('\\'));
     if(!baseName) {
         baseName = argv[0];
@@ -1117,6 +1111,18 @@ Return Value:
             } else {
                 flags |= DEVCON_FLAG_FORCE;
             }
+        } else if((argv[firstArg][1]==TEXT('u')) || (argv[firstArg][1]==TEXT('U'))) {
+            if((argv[firstArg][2]!=TEXT('\0')) ) {
+                //
+                // don't recognize this switch
+                //
+                break;
+            } else {
+#ifdef UNICODE
+                _setmode(_fileno(stdout), _O_WTEXT);
+                _setmode(_fileno(stderr), _O_WTEXT);
+#endif
+            }
         } else {
             //
             // don't recognize this switch
-- 
cgit v1.3.1