ChangeSet ID: 21616 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/12/02 04:30:04
Modified files: programs/wcmd : batch.c builtins.c wcmdmain.c
Log message: Rein Klazes wijn@wanadoo.nl Avoid formatted output in a few more places where formatting is not really needed and output could be large enough to be truncated.
Patch: http://cvs.winehq.org/patch.py?id=21616
Old revision New revision Changes Path 1.14 1.15 +5 -2 wine/programs/wcmd/batch.c 1.31 1.32 +7 -2 wine/programs/wcmd/builtins.c 1.49 1.50 +3 -3 wine/programs/wcmd/wcmdmain.c
Index: wine/programs/wcmd/batch.c diff -u -p wine/programs/wcmd/batch.c:1.14 wine/programs/wcmd/batch.c:1.15 --- wine/programs/wcmd/batch.c:1.14 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/batch.c 2 Dec 2005 10:30: 4 -0000 @@ -94,7 +94,9 @@ BATCH_CONTEXT *prev_context;
while (WCMD_fgets (string, sizeof(string), h)) { if (strlen(string) == MAXSTRING -1) - WCMD_output("Line in Batch processing possible truncated. Using:\n%s\n",string); + WCMD_output_asis( "Line in Batch processing possible truncated. Using:\n"); + WCMD_output_asis( string); + WCMD_output_asis( "\n"); if (string[0] != ':') { /* Skip over labels */ WCMD_batch_command (string); } @@ -179,7 +181,8 @@ int i; /* Show prompt before batch line IF echo is on */ if (echo_mode && (line[0] != '@')) { WCMD_show_prompt(); - WCMD_output ("%s\n", cmd2); + WCMD_output_asis ( cmd2); + WCMD_output_asis ( "\n"); }
WCMD_process_command (cmd2); Index: wine/programs/wcmd/builtins.c diff -u -p wine/programs/wcmd/builtins.c:1.31 wine/programs/wcmd/builtins.c:1.32 --- wine/programs/wcmd/builtins.c:1.31 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/builtins.c 2 Dec 2005 10:30: 4 -0000 @@ -827,7 +827,10 @@ char buffer[1048]; */ status = GetEnvironmentVariable(s, buffer, sizeof(buffer)); if (status) { - WCMD_output("%s=%s\n", s, buffer); + WCMD_output_asis( s); + WCMD_output_asis( "="); + WCMD_output_asis( buffer); + WCMD_output_asis( "\n"); } else { WCMD_output ("Environment variable %s not defined\n", s); } @@ -856,7 +859,9 @@ DWORD status; if (strlen(param1) == 0) { status = GetEnvironmentVariable ("PATH", string, sizeof(string)); if (status != 0) { - WCMD_output ("PATH=%s\n", string); + WCMD_output_asis ( "PATH="); + WCMD_output_asis ( string); + WCMD_output_asis ( "\n"); } else { WCMD_output ("PATH not found\n"); Index: wine/programs/wcmd/wcmdmain.c diff -u -p wine/programs/wcmd/wcmdmain.c:1.49 wine/programs/wcmd/wcmdmain.c:1.50 --- wine/programs/wcmd/wcmdmain.c:1.49 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/wcmdmain.c 2 Dec 2005 10:30: 4 -0000 @@ -698,7 +698,7 @@ char *p, *q; *q = '\0'; } } - WCMD_output (out_string); + WCMD_output_asis (out_string); }
/**************************************************************************** @@ -720,9 +720,9 @@ int status; error_code, GetLastError()); return; } - WCMD_output (lpMsgBuf); + WCMD_output_asis (lpMsgBuf); LocalFree ((HLOCAL)lpMsgBuf); - WCMD_output (newline); + WCMD_output_asis (newline); return; }