From: Pierre Schweitzer <pierre@reactos.org>
Date: Sun, 11 Dec 2016 10:23:02 +0000 (+0000)
Subject: [NET/USE]
X-Git-Tag: ReactOS-0.4.4-FOSDEM2017~87
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=0afae481fac90082d2a4013b83baf0a23e058f65;hp=332071647dd0b454f570f25835d354d24c8f7770

[NET/USE]
On enumeration, don't print raw status

svn path=/trunk/; revision=73449
---

diff --git a/reactos/base/applications/network/net/cmdUse.c b/reactos/base/applications/network/net/cmdUse.c
index d6901a2bc6c..f0f405d3c3c 100644
--- a/reactos/base/applications/network/net/cmdUse.c
+++ b/reactos/base/applications/network/net/cmdUse.c
@@ -63,6 +63,21 @@ EnumerateConnections(LPCWSTR Local)
     return 0;
 }
 
+static
+VOID
+PrintError(DWORD Status)
+{
+    LPWSTR Buffer;
+
+    ConResPrintf(StdErr, IDS_ERROR_SYSTEM_ERROR, Status);
+
+    if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, Status, 0, (LPWSTR)&Buffer, 0, NULL))
+    {
+        ConPrintf(StdErr, L"\n%s", Buffer);
+        LocalFree(Buffer);
+    }
+}
+
 INT
 cmdUse(
     INT argc,
@@ -73,7 +88,11 @@ cmdUse(
     if (argc == 2)
     {
         Status = EnumerateConnections(NULL);
-        ConPrintf(StdOut, L"Status: %lu\n", Status);
+        if (Status == NO_ERROR)
+            ConResPrintf(StdOut, IDS_ERROR_NO_ERROR);
+        else
+            PrintError(Status);
+
         return 0;
     }
     else if (argc == 3)
@@ -92,7 +111,11 @@ cmdUse(
         }
 
         Status = EnumerateConnections(argv[2]);
-        ConPrintf(StdOut, L"Status: %lu\n", Status);
+        if (Status == NO_ERROR)
+            ConResPrintf(StdOut, IDS_ERROR_NO_ERROR);
+        else
+            PrintError(Status);
+
         return 0;
     }
 
@@ -100,7 +123,6 @@ cmdUse(
     if (Len != 1 && Len != 2)
     {
         ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName");
-        ConPrintf(StdOut, L"Len: %lu\n", Len);
         return 1;
     }
 
@@ -192,17 +214,7 @@ cmdUse(
         if (argv[2][0] == L'*' && Status == NO_ERROR && OutFlags == CONNECT_LOCALDRIVE)
             ConResPrintf(StdOut, IDS_USE_NOW_CONNECTED, argv[3], Access);
         else if (Status != NO_ERROR)
-        {
-            LPWSTR Buffer;
-
-            ConResPrintf(StdErr, IDS_ERROR_SYSTEM_ERROR, Status);
-
-            if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, Status, 0, (LPWSTR)&Buffer, 0, NULL))
-            {
-                ConPrintf(StdErr, L"\n%s\n", Buffer);
-                LocalFree(Buffer);
-            }
-        }
+            PrintError(Status);
 
         return Status;
     }
diff --git a/reactos/base/applications/network/net/lang/en-US.rc b/reactos/base/applications/network/net/lang/en-US.rc
index e8914c15dd9..6ca97b5d876 100644
--- a/reactos/base/applications/network/net/lang/en-US.rc
+++ b/reactos/base/applications/network/net/lang/en-US.rc
@@ -123,4 +123,5 @@ BEGIN
     IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n"
     IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n"
     IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n"
+    IDS_ERROR_NO_ERROR "The command got executed successfully.\n"
 END
diff --git a/reactos/base/applications/network/net/lang/es-ES.rc b/reactos/base/applications/network/net/lang/es-ES.rc
index 4367d02b8d6..fc87a4435c9 100644
--- a/reactos/base/applications/network/net/lang/es-ES.rc
+++ b/reactos/base/applications/network/net/lang/es-ES.rc
@@ -126,4 +126,5 @@ BEGIN
     IDS_ERROR_OPTION_NOT_SUPPORTED "La opción %s todavía no está disponible.\n"
     IDS_ERROR_INVALID_OPTION_VALUE "El valor para la opción %s no es válido.\n"
     IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n"
+    IDS_ERROR_NO_ERROR "The command got executed successfully.\n"
 END
diff --git a/reactos/base/applications/network/net/lang/ro-RO.rc b/reactos/base/applications/network/net/lang/ro-RO.rc
index 561ea62a11f..42bb63244a5 100644
--- a/reactos/base/applications/network/net/lang/ro-RO.rc
+++ b/reactos/base/applications/network/net/lang/ro-RO.rc
@@ -129,4 +129,5 @@ BEGIN
     IDS_ERROR_OPTION_NOT_SUPPORTED "Opţiunea %s încă nu este admisă.\n"
     IDS_ERROR_INVALID_OPTION_VALUE "Aţi introdus o valoare nevalidă pentru opţiunea %s.\n"
     IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n"
+    IDS_ERROR_NO_ERROR "The command got executed successfully.\n"
 END
diff --git a/reactos/base/applications/network/net/lang/ru-RU.rc b/reactos/base/applications/network/net/lang/ru-RU.rc
index 60e66b19505..492dd992383 100644
--- a/reactos/base/applications/network/net/lang/ru-RU.rc
+++ b/reactos/base/applications/network/net/lang/ru-RU.rc
@@ -125,4 +125,5 @@ BEGIN
     IDS_ERROR_OPTION_NOT_SUPPORTED "Опция %s в данный момент не поддерживается.\n"
     IDS_ERROR_INVALID_OPTION_VALUE "Вы ввели неверный данные для данной опции %s.\n"
     IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n"
+    IDS_ERROR_NO_ERROR "The command got executed successfully.\n"
 END
diff --git a/reactos/base/applications/network/net/lang/tr-TR.rc b/reactos/base/applications/network/net/lang/tr-TR.rc
index 44de3db7430..8271023ad3b 100644
--- a/reactos/base/applications/network/net/lang/tr-TR.rc
+++ b/reactos/base/applications/network/net/lang/tr-TR.rc
@@ -125,4 +125,5 @@ BEGIN
     IDS_ERROR_OPTION_NOT_SUPPORTED "%s seçeneği daha desteklenmiyor.\n"
     IDS_ERROR_INVALID_OPTION_VALUE "%s seçeneği için geçersiz bir değer girdiniz.\n"
     IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n"
+    IDS_ERROR_NO_ERROR "The command got executed successfully.\n"
 END
diff --git a/reactos/base/applications/network/net/lang/zh-CN.rc b/reactos/base/applications/network/net/lang/zh-CN.rc
index 0f20d22afdc..5b9ae525d14 100644
--- a/reactos/base/applications/network/net/lang/zh-CN.rc
+++ b/reactos/base/applications/network/net/lang/zh-CN.rc
@@ -125,4 +125,5 @@ BEGIN
     IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支持 %s 选项。\n"
     IDS_ERROR_INVALID_OPTION_VALUE "Y您输入了无效的值为 %s 选项。\n"
     IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n"
+    IDS_ERROR_NO_ERROR "The command got executed successfully.\n"
 END
diff --git a/reactos/base/applications/network/net/lang/zh-TW.rc b/reactos/base/applications/network/net/lang/zh-TW.rc
index b22d9ce910e..f767c7d24da 100644
--- a/reactos/base/applications/network/net/lang/zh-TW.rc
+++ b/reactos/base/applications/network/net/lang/zh-TW.rc
@@ -125,4 +125,5 @@ BEGIN
     IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支援 %s 選項。\n"
     IDS_ERROR_INVALID_OPTION_VALUE "您輸入了無效的值為 %s 選項。\n"
     IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n"
+    IDS_ERROR_NO_ERROR "The command got executed successfully.\n"
 END
diff --git a/reactos/base/applications/network/net/resource.h b/reactos/base/applications/network/net/resource.h
index a90a15d74b0..ebe658898e5 100644
--- a/reactos/base/applications/network/net/resource.h
+++ b/reactos/base/applications/network/net/resource.h
@@ -103,3 +103,4 @@
 #define IDS_ERROR_OPTION_NOT_SUPPORTED 700
 #define IDS_ERROR_INVALID_OPTION_VALUE 701
 #define IDS_ERROR_SYSTEM_ERROR         702
+#define IDS_ERROR_NO_ERROR             703