system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 00:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd: Use boolean types for boolean variables.

Browse source
This commit is contained in:
Frédéric Delanoy 2011-11-29 14:39:26 +01:00 committed by Alexandre Julliard
parent 2820ed9764
commit 51b05c72d7
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
programs/cmd/wcmdmain.c
View file

@ -36,7 +36,7 @@ HINSTANCE hinst;
DWORD errorlevel; DWORD errorlevel;
int defaultColor = 7; int defaultColor = 7;
BOOL echo_mode = TRUE; BOOL echo_mode = TRUE;
static int opt_c, opt_k, opt_s; static BOOL opt_c, opt_k, opt_s;
const WCHAR newline[] = {'\r','\n','\0'}; const WCHAR newline[] = {'\r','\n','\0'};
const WCHAR space[] = {' ','\0'}; const WCHAR space[] = {' ','\0'};
WCHAR anykey[100]; WCHAR anykey[100];
@ -1154,7 +1154,7 @@ void WCMD_run_program (WCHAR *command, int called) {
&& GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') { && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') {
/* strip first and last quote WCHARacters and try again */ /* strip first and last quote WCHARacters and try again */
WCMD_strip_quotes(command); WCMD_strip_quotes(command);
opt_s=1; opt_s = TRUE;
WCMD_run_program(command, called); WCMD_run_program(command, called);
return; return;
} }
@ -2221,7 +2221,7 @@ int wmain (int argc, WCHAR *argvW[])
WCHAR *cmd = NULL; WCHAR *cmd = NULL;
WCHAR string[1024]; WCHAR string[1024];
WCHAR envvar[4]; WCHAR envvar[4];
int opt_q; BOOL opt_q;
int opt_t = 0; int opt_t = 0;
static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'};
static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'};
@ -2237,7 +2237,7 @@ int wmain (int argc, WCHAR *argvW[])
strcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY)); strcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY));
args = argc; args = argc;
opt_c=opt_k=opt_q=opt_s=0; opt_c = opt_k = opt_q = opt_s = FALSE;
while (args > 0) while (args > 0)
{ {
WCHAR c; WCHAR c;
@ -2250,13 +2250,13 @@ int wmain (int argc, WCHAR *argvW[])
c=(*argvW)[1]; c=(*argvW)[1];
if (tolowerW(c)=='c') { if (tolowerW(c)=='c') {
opt_c=1; opt_c = TRUE;
} else if (tolowerW(c)=='q') { } else if (tolowerW(c)=='q') {
opt_q=1; opt_q = TRUE;
} else if (tolowerW(c)=='k') { } else if (tolowerW(c)=='k') {
opt_k=1; opt_k = TRUE;
} else if (tolowerW(c)=='s') { } else if (tolowerW(c)=='s') {
opt_s=1; opt_s = TRUE;
} else if (tolowerW(c)=='a') { } else if (tolowerW(c)=='a') {
unicodePipes=FALSE; unicodePipes=FALSE;
} else if (tolowerW(c)=='u') { } else if (tolowerW(c)=='u') {
@ -2335,20 +2335,20 @@ int wmain (int argc, WCHAR *argvW[])
} }
if (qcount!=2) if (qcount!=2)
opt_s=1; opt_s = TRUE;
/* check argvW[0] for a space and invalid characters */ /* check argvW[0] for a space and invalid characters */
if (!opt_s) { if (!opt_s) {
opt_s=1; opt_s = TRUE;
p=*argvW; p=*argvW;
while (*p!='\0') { while (*p!='\0') {
if (*p=='&' || *p=='<' || *p=='>' || *p=='(' || *p==')' if (*p=='&' || *p=='<' || *p=='>' || *p=='(' || *p==')'
|| *p=='@' || *p=='^' || *p=='|') { || *p=='@' || *p=='^' || *p=='|') {
opt_s=1; opt_s = TRUE;
break; break;
} }
if (*p==' ') if (*p==' ')
opt_s=0; opt_s = FALSE;
p++; p++;
} }
} }