reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 06:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd.exe: Move writing to console into a single function.

Browse Source
This commit is contained in:
Jason Edmeades 2007-06-03 22:07:40 +01:00 committed by Alexandre Julliard
parent 5cc492c783
commit 926da13e56
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
programs/cmd/wcmdmain.c
View File

@ -1192,6 +1192,16 @@ int p = 0;
}
}
/*******************************************************************
* WCMD_output_asis_len - send output to current standard output
* device without formatting eg. when message contains '%'
* of a supplied length.
*/
static void WCMD_output_asis_len(const char *message, int len) {
DWORD count;
WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), message, len, &count, NULL);
}
/*******************************************************************
* WCMD_output - send output to current standard output device.
*
@ -1208,9 +1218,10 @@ void WCMD_output (const char *format, ...) {
va_end(ap);
if( ret >= sizeof( string)) {
WINE_ERR("Output truncated in WCMD_output\n" );
string[sizeof( string) -1] = '\0';
ret = sizeof(string) - 1;
string[ret] = '\0';
}
WCMD_output_asis(string);
WCMD_output_asis_len(string, ret);
}
@ -1250,22 +1261,20 @@ void WCMD_output_asis (const char *message) {
if (paged_mode) {
do {
if ((ptr = strchr(message, '\n')) != NULL) ptr++;
WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), message,
(ptr) ? ptr - message : lstrlen(message), &count, NULL);
WCMD_output_asis_len(message, (ptr) ? ptr - message : lstrlen(message));
if (ptr) {
if (++line_count >= max_height - 1) {
line_count = 0;
WCMD_output_asis (pagedMessage);
line_count = 1;
WCMD_output_asis_len(pagedMessage, lstrlen(pagedMessage));
ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string), &count, NULL);
}
}
} while ((message = ptr) != NULL);
} else {
WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), message, lstrlen(message), &count, NULL);
WCMD_output_asis_len(message, lstrlen(message));
}
}
/***************************************************************************
* WCMD_strtrim_leading_spaces
*