cmd: Print error messages on stderr, not on stdout.

Francois Gouget fgouget at free.fr
Wed Nov 23 17:29:49 CST 2011


---

I consider messages like 'Not Yet Implemented' and 'No Argument' to be 
errors so that they should go to stderr. But maybe there's a strong 
argument for not doing it that way.

 programs/cmd/builtins.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 56961a3..2de897b 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -207,7 +207,7 @@ void WCMD_clear_screen (void) {
 
 void WCMD_change_tty (void) {
 
-  WCMD_output (WCMD_LoadMessage(WCMD_NYI));
+  WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI));
 
 }
 
@@ -403,7 +403,7 @@ void WCMD_copy (void) {
   WCHAR ext[MAX_PATH];
 
   if (param1[0] == 0x00) {
-    WCMD_output (WCMD_LoadMessage(WCMD_NOARG));
+    WCMD_output_stderr (WCMD_LoadMessage(WCMD_NOARG));
     return;
   }
 
@@ -1149,7 +1149,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) {
 
   /* Ensure line continues with variable */
   if (!*curPos || *curPos != '%') {
-      WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR));
+      WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR));
       return;
   }
 
@@ -1168,7 +1168,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) {
   if (!*curPos
        || !WCMD_keyword_ws_found(inW, sizeof(inW)/sizeof(inW[0]), curPos)) {
 
-      WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR));
+      WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR));
       return;
   }
 
@@ -1195,7 +1195,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) {
   if ((*cmdList == NULL)
       || !WCMD_keyword_ws_found(doW, sizeof(doW)/sizeof(doW[0]), (*cmdList)->command)) {
 
-      WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR));
+      WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR));
       return;
   }
 
@@ -2213,14 +2213,14 @@ void WCMD_setshow_date (void) {
         WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE));
         WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count);
         if (count > 2) {
-          WCMD_output (WCMD_LoadMessage(WCMD_NYI));
+          WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI));
         }
       }
     }
     else WCMD_print_error ();
   }
   else {
-    WCMD_output (WCMD_LoadMessage(WCMD_NYI));
+    WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI));
   }
 }
 
@@ -2441,14 +2441,14 @@ void WCMD_setshow_time (void) {
         WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME));
         WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count);
         if (count > 2) {
-          WCMD_output (WCMD_LoadMessage(WCMD_NYI));
+          WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI));
         }
       }
     }
     else WCMD_print_error ();
   }
   else {
-    WCMD_output (WCMD_LoadMessage(WCMD_NYI));
+    WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI));
   }
 }
 
@@ -2529,7 +2529,7 @@ void WCMD_type (WCHAR *command) {
 		FILE_ATTRIBUTE_NORMAL, NULL);
     if (h == INVALID_HANDLE_VALUE) {
       WCMD_print_error ();
-      WCMD_output(WCMD_LoadMessage(WCMD_READFAIL), thisArg); /* should be _stderr */
+      WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg);
       errorlevel = 1;
     } else {
       if (writeHeaders) {
-- 
1.7.7.1




More information about the wine-patches mailing list