Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 59387: [CMD] Fix whitespace (part 5ter/6) (convert tabs into 4-space indent).
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 12:58:45 2013 New Revision: 59387 URL: http://svn.reactos.org/svn/reactos?rev=59387&view=rev Log: [CMD] Fix whitespace (part 5ter/6) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/cmdinput.c Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sun Jun 30 12:58:45 2013 @@ -114,501 +114,491 @@ static VOID ClearCommandLine (LPTSTR str, INT maxlen, SHORT orgx, SHORT orgy) { - INT count; - - SetCursorXY (orgx, orgy); - for (count = 0; count < (INT)_tcslen (str); count++) - ConOutChar (_T(' ')); - _tcsnset (str, _T('\0'), maxlen); - SetCursorXY (orgx, orgy); + INT count; + + SetCursorXY (orgx, orgy); + for (count = 0; count < (INT)_tcslen (str); count++) + ConOutChar (_T(' ')); + _tcsnset (str, _T('\0'), maxlen); + SetCursorXY (orgx, orgy); } /* read in a command line */ BOOL ReadCommand (LPTSTR str, INT maxlen) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - SHORT orgx; /* origin x/y */ - SHORT orgy; - SHORT curx; /*current x/y cursor position*/ - SHORT cury; - SHORT tempscreen; - INT count; /*used in some for loops*/ - INT current = 0; /*the position of the cursor in the string (str)*/ - INT charcount = 0;/*chars in the string (str)*/ - INPUT_RECORD ir; + CONSOLE_SCREEN_BUFFER_INFO csbi; + SHORT orgx; /* origin x/y */ + SHORT orgy; + SHORT curx; /*current x/y cursor position*/ + SHORT cury; + SHORT tempscreen; + INT count; /*used in some for loops*/ + INT current = 0; /*the position of the cursor in the string (str)*/ + INT charcount = 0;/*chars in the string (str)*/ + INPUT_RECORD ir; #ifdef FEATURE_UNIX_FILENAME_COMPLETION - WORD wLastKey = 0; -#endif - TCHAR ch; - BOOL bReturn = FALSE; - BOOL bCharInput; + WORD wLastKey = 0; +#endif + TCHAR ch; + BOOL bReturn = FALSE; + BOOL bCharInput; #ifdef FEATURE_4NT_FILENAME_COMPLETION - TCHAR szPath[MAX_PATH]; + TCHAR szPath[MAX_PATH]; #endif #ifdef FEATURE_HISTORY - //BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ - TCHAR PreviousChar; -#endif - - if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) - { - /* No console */ - HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE); - DWORD dwRead; - CHAR chr; - do - { - if (!ReadFile(hStdin, &chr, 1, &dwRead, NULL) || !dwRead) - return FALSE; + //BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ + TCHAR PreviousChar; +#endif + + if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) + { + /* No console */ + HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE); + DWORD dwRead; + CHAR chr; + do + { + if (!ReadFile(hStdin, &chr, 1, &dwRead, NULL) || !dwRead) + return FALSE; #ifdef _UNICODE - MultiByteToWideChar(InputCodePage, 0, &chr, 1, &str[charcount++], 1); -#endif - } while (chr != '\n' && charcount < maxlen); - str[charcount] = _T('\0'); - return TRUE; - } - - /* get screen size */ - maxx = csbi.dwSize.X; - maxy = csbi.dwSize.Y; - - curx = orgx = csbi.dwCursorPosition.X; - cury = orgy = csbi.dwCursorPosition.Y; - - memset (str, 0, maxlen * sizeof (TCHAR)); - - SetCursorType (bInsert, TRUE); - - do - { - - bReturn = FALSE; - - ConInKey (&ir); - - if (ir.Event.KeyEvent.dwControlKeyState & - (RIGHT_ALT_PRESSED|LEFT_ALT_PRESSED| - RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) - { - - switch (ir.Event.KeyEvent.wVirtualKeyCode) - { - + MultiByteToWideChar(InputCodePage, 0, &chr, 1, &str[charcount++], 1); +#endif + } while (chr != '\n' && charcount < maxlen); + str[charcount] = _T('\0'); + return TRUE; + } + + /* get screen size */ + maxx = csbi.dwSize.X; + maxy = csbi.dwSize.Y; + + curx = orgx = csbi.dwCursorPosition.X; + cury = orgy = csbi.dwCursorPosition.Y; + + memset (str, 0, maxlen * sizeof (TCHAR)); + + SetCursorType (bInsert, TRUE); + + do + { + + bReturn = FALSE; + + ConInKey (&ir); + + if (ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_ALT_PRESSED |LEFT_ALT_PRESSED| + RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) + { + switch (ir.Event.KeyEvent.wVirtualKeyCode) + { #ifdef FEATURE_HISTORY - - case 'K': - /*add the current command line to the history*/ - if (ir.Event.KeyEvent.dwControlKeyState & - (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) - { - - if (str[0]) - History(0,str); - - ClearCommandLine (str, maxlen, orgx, orgy); - current = charcount = 0; - curx = orgx; - cury = orgy; - //bContinue=TRUE; - break; - } - - case 'D': - /*delete current history entry*/ - if (ir.Event.KeyEvent.dwControlKeyState & - (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) - { - ClearCommandLine (str, maxlen, orgx, orgy); - History_del_current_entry(str); - current = charcount = _tcslen (str); - ConOutPrintf (_T("%s"), str); - GetCursorXY (&curx, &cury); - //bContinue=TRUE; - break; - } - -#endif/*FEATURE_HISTORY*/ - } - - - - - } - - bCharInput = FALSE; - - switch (ir.Event.KeyEvent.wVirtualKeyCode) - { - case VK_BACK: - /* <BACKSPACE> - delete character to left of cursor */ - if (current > 0 && charcount > 0) - { - if (current == charcount) - { - /* if at end of line */ - str[current - 1] = _T('\0'); - if (GetCursorX () != 0) - { - ConOutPrintf (_T("\b \b")); - curx--; - } - else - { - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - ConOutChar (_T(' ')); - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - cury--; - curx = maxx - 1; - } - } - else - { - for (count = current - 1; count < charcount; count++) - str[count] = str[count + 1]; - if (GetCursorX () != 0) - { - SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); - curx--; - } - else - { - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - cury--; - curx = maxx - 1; - } - GetCursorXY (&curx, &cury); - ConOutPrintf (_T("%s "), &str[current - 1]); - SetCursorXY (curx, cury); - } - charcount--; - current--; - } - break; - - case VK_INSERT: - /* toggle insert/overstrike mode */ - bInsert ^= TRUE; - SetCursorType (bInsert, TRUE); - break; - - case VK_DELETE: - /* delete character under cursor */ - if (current != charcount && charcount > 0) - { - for (count = current; count < charcount; count++) - str[count] = str[count + 1]; - charcount--; - GetCursorXY (&curx, &cury); - ConOutPrintf (_T("%s "), &str[current]); - SetCursorXY (curx, cury); - } - break; - - case VK_HOME: - /* goto beginning of string */ - if (current != 0) - { - SetCursorXY (orgx, orgy); - curx = orgx; - cury = orgy; - current = 0; - } - break; - - case VK_END: - /* goto end of string */ - if (current != charcount) - { - SetCursorXY (orgx, orgy); - ConOutPrintf (_T("%s"), str); - GetCursorXY (&curx, &cury); - current = charcount; - } - break; - - case VK_TAB: + case 'K': + /*add the current command line to the history*/ + if (ir.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + { + if (str[0]) + History(0,str); + + ClearCommandLine (str, maxlen, orgx, orgy); + current = charcount = 0; + curx = orgx; + cury = orgy; + //bContinue=TRUE; + break; + } + + case 'D': + /*delete current history entry*/ + if (ir.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + { + ClearCommandLine (str, maxlen, orgx, orgy); + History_del_current_entry(str); + current = charcount = _tcslen (str); + ConOutPrintf (_T("%s"), str); + GetCursorXY (&curx, &cury); + //bContinue=TRUE; + break; + } + +#endif /*FEATURE_HISTORY*/ + } + } + + bCharInput = FALSE; + + switch (ir.Event.KeyEvent.wVirtualKeyCode) + { + case VK_BACK: + /* <BACKSPACE> - delete character to left of cursor */ + if (current > 0 && charcount > 0) + { + if (current == charcount) + { + /* if at end of line */ + str[current - 1] = _T('\0'); + if (GetCursorX () != 0) + { + ConOutPrintf (_T("\b \b")); + curx--; + } + else + { + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + ConOutChar (_T(' ')); + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + cury--; + curx = maxx - 1; + } + } + else + { + for (count = current - 1; count < charcount; count++) + str[count] = str[count + 1]; + if (GetCursorX () != 0) + { + SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); + curx--; + } + else + { + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + cury--; + curx = maxx - 1; + } + GetCursorXY (&curx, &cury); + ConOutPrintf (_T("%s "), &str[current - 1]); + SetCursorXY (curx, cury); + } + charcount--; + current--; + } + break; + + case VK_INSERT: + /* toggle insert/overstrike mode */ + bInsert ^= TRUE; + SetCursorType (bInsert, TRUE); + break; + + case VK_DELETE: + /* delete character under cursor */ + if (current != charcount && charcount > 0) + { + for (count = current; count < charcount; count++) + str[count] = str[count + 1]; + charcount--; + GetCursorXY (&curx, &cury); + ConOutPrintf (_T("%s "), &str[current]); + SetCursorXY (curx, cury); + } + break; + + case VK_HOME: + /* goto beginning of string */ + if (current != 0) + { + SetCursorXY (orgx, orgy); + curx = orgx; + cury = orgy; + current = 0; + } + break; + + case VK_END: + /* goto end of string */ + if (current != charcount) + { + SetCursorXY (orgx, orgy); + ConOutPrintf (_T("%s"), str); + GetCursorXY (&curx, &cury); + current = charcount; + } + break; + + case VK_TAB: #ifdef FEATURE_UNIX_FILENAME_COMPLETION - /* expand current file name */ - if ((current == charcount) || - (current == charcount - 1 && - str[current] == _T('"'))) /* only works at end of line*/ - { - if (wLastKey != VK_TAB) - { - /* if first TAB, complete filename*/ - tempscreen = charcount; - CompleteFilename (str, charcount); - charcount = _tcslen (str); - current = charcount; - - SetCursorXY (orgx, orgy); - ConOutPrintf (_T("%s"), str); - - if (tempscreen > charcount) - { - GetCursorXY (&curx, &cury); - for (count = tempscreen - charcount; count--; ) - ConOutChar (_T(' ')); - SetCursorXY (curx, cury); - } - else - { - if (((charcount + orgx) / maxx) + orgy > maxy - 1) - orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); - } - - /* set cursor position */ - SetCursorXY ((orgx + current) % maxx, - orgy + (orgx + current) / maxx); - GetCursorXY (&curx, &cury); - } - else - { - /*if second TAB, list matches*/ - if (ShowCompletionMatches (str, charcount)) - { - PrintPrompt (); - GetCursorXY (&orgx, &orgy); - ConOutPrintf (_T("%s"), str); - - /* set cursor position */ - SetCursorXY ((orgx + current) % maxx, - orgy + (orgx + current) / maxx); - GetCursorXY (&curx, &cury); - } - - } - } - else - { - MessageBeep (-1); - } + /* expand current file name */ + if ((current == charcount) || + (current == charcount - 1 && + str[current] == _T('"'))) /* only works at end of line*/ + { + if (wLastKey != VK_TAB) + { + /* if first TAB, complete filename*/ + tempscreen = charcount; + CompleteFilename (str, charcount); + charcount = _tcslen (str); + current = charcount; + + SetCursorXY (orgx, orgy); + ConOutPrintf (_T("%s"), str); + + if (tempscreen > charcount) + { + GetCursorXY (&curx, &cury); + for (count = tempscreen - charcount; count--; ) + ConOutChar (_T(' ')); + SetCursorXY (curx, cury); + } + else + { + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + } + + /* set cursor position */ + SetCursorXY ((orgx + current) % maxx, + orgy + (orgx + current) / maxx); + GetCursorXY (&curx, &cury); + } + else + { + /*if second TAB, list matches*/ + if (ShowCompletionMatches (str, charcount)) + { + PrintPrompt (); + GetCursorXY (&orgx, &orgy); + ConOutPrintf (_T("%s"), str); + + /* set cursor position */ + SetCursorXY ((orgx + current) % maxx, + orgy + (orgx + current) / maxx); + GetCursorXY (&curx, &cury); + } + + } + } + else + { + MessageBeep (-1); + } #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION - - /* used to later see if we went down to the next line */ - tempscreen = charcount; - szPath[0]=_T('\0'); - - /* str is the whole things that is on the current line - that is and and out. arg 2 is weather it goes back - one file or forward one file */ - CompleteFilename(str, !(ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED), szPath, current); - /* Attempt to clear the line */ - ClearCommandLine (str, maxlen, orgx, orgy); - curx = orgx; - cury = orgy; - current = charcount = 0; - - /* Everything is deleted, lets add it back in */ - _tcscpy(str,szPath); - - /* Figure out where cusor is going to be after we print it */ - charcount = _tcslen (str); - current = charcount; - - SetCursorXY (orgx, orgy); - /* Print out what we have now */ - ConOutPrintf (_T("%s"), str); - - /* Move cursor accordingly */ - if(tempscreen > charcount) - { - GetCursorXY (&curx, &cury); - for(count = tempscreen - charcount; count--; ) - ConOutChar (_T(' ')); - SetCursorXY (curx, cury); - } - else - { - if(((charcount + orgx) / maxx) + orgy > maxy - 1) - orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); - } - SetCursorXY((short)(((int)orgx + current) % maxx), (short)((int)orgy + ((int)orgx + current) / maxx)); - GetCursorXY(&curx, &cury); - -#endif - break; - - case _T('M'): - case _T('C'): - /* ^M does the same as return */ - bCharInput = TRUE; - if(!(ir.Event.KeyEvent.dwControlKeyState & - (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) - { - break; - } - - case VK_RETURN: - /* end input, return to main */ + /* used to later see if we went down to the next line */ + tempscreen = charcount; + szPath[0]=_T('\0'); + + /* str is the whole things that is on the current line + that is and and out. arg 2 is weather it goes back + one file or forward one file */ + CompleteFilename(str, !(ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED), szPath, current); + /* Attempt to clear the line */ + ClearCommandLine (str, maxlen, orgx, orgy); + curx = orgx; + cury = orgy; + current = charcount = 0; + + /* Everything is deleted, lets add it back in */ + _tcscpy(str,szPath); + + /* Figure out where cusor is going to be after we print it */ + charcount = _tcslen (str); + current = charcount; + + SetCursorXY (orgx, orgy); + /* Print out what we have now */ + ConOutPrintf (_T("%s"), str); + + /* Move cursor accordingly */ + if(tempscreen > charcount) + { + GetCursorXY (&curx, &cury); + for(count = tempscreen - charcount; count--; ) + ConOutChar (_T(' ')); + SetCursorXY (curx, cury); + } + else + { + if(((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + } + SetCursorXY((short)(((int)orgx + current) % maxx), (short)((int)orgy + ((int)orgx + current) / maxx)); + GetCursorXY(&curx, &cury); +#endif + break; + + case _T('M'): + case _T('C'): + /* ^M does the same as return */ + bCharInput = TRUE; + if(!(ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) + { + break; + } + + case VK_RETURN: + /* end input, return to main */ #ifdef FEATURE_HISTORY - /* add to the history */ - if (str[0]) - History (0, str); -#endif - str[charcount++] = _T('\n'); - str[charcount] = _T('\0'); - ConOutChar (_T('\n')); - bReturn = TRUE; - break; - - case VK_ESCAPE: - /* clear str Make this callable! */ - ClearCommandLine (str, maxlen, orgx, orgy); - curx = orgx; - cury = orgy; - current = charcount = 0; - break; + /* add to the history */ + if (str[0]) + History (0, str); +#endif + str[charcount++] = _T('\n'); + str[charcount] = _T('\0'); + ConOutChar (_T('\n')); + bReturn = TRUE; + break; + + case VK_ESCAPE: + /* clear str Make this callable! */ + ClearCommandLine (str, maxlen, orgx, orgy); + curx = orgx; + cury = orgy; + current = charcount = 0; + break; #ifdef FEATURE_HISTORY - case VK_F3: - History_move_to_bottom(); -#endif - case VK_UP: + case VK_F3: + History_move_to_bottom(); +#endif + case VK_UP: #ifdef FEATURE_HISTORY - /* get previous command from buffer */ - ClearCommandLine (str, maxlen, orgx, orgy); - History (-1, str); - current = charcount = _tcslen (str); - if (((charcount + orgx) / maxx) + orgy > maxy - 1) - orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); - ConOutPrintf (_T("%s"), str); - GetCursorXY (&curx, &cury); -#endif - break; - - case VK_DOWN: + /* get previous command from buffer */ + ClearCommandLine (str, maxlen, orgx, orgy); + History (-1, str); + current = charcount = _tcslen (str); + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + ConOutPrintf (_T("%s"), str); + GetCursorXY (&curx, &cury); +#endif + break; + + case VK_DOWN: #ifdef FEATURE_HISTORY - /* get next command from buffer */ - ClearCommandLine (str, maxlen, orgx, orgy); - History (1, str); - current = charcount = _tcslen (str); - if (((charcount + orgx) / maxx) + orgy > maxy - 1) - orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); - ConOutPrintf (_T("%s"), str); - GetCursorXY (&curx, &cury); -#endif - break; - - case VK_LEFT: - /* move cursor left */ - if (current > 0) - { - current--; - if (GetCursorX () == 0) - { - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - curx = maxx - 1; - cury--; - } - else - { - SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); - curx--; - } - } - else - { - MessageBeep (-1); - } - break; - - case VK_RIGHT: - /* move cursor right */ - if (current != charcount) - { - current++; - if (GetCursorX () == maxx - 1) - { - SetCursorXY (0, (SHORT)(GetCursorY () + 1)); - curx = 0; - cury++; - } - else - { - SetCursorXY ((SHORT)(GetCursorX () + 1), GetCursorY ()); - curx++; - } - } + /* get next command from buffer */ + ClearCommandLine (str, maxlen, orgx, orgy); + History (1, str); + current = charcount = _tcslen (str); + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + ConOutPrintf (_T("%s"), str); + GetCursorXY (&curx, &cury); +#endif + break; + + case VK_LEFT: + /* move cursor left */ + if (current > 0) + { + current--; + if (GetCursorX () == 0) + { + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + curx = maxx - 1; + cury--; + } + else + { + SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); + curx--; + } + } + else + { + MessageBeep (-1); + } + break; + + case VK_RIGHT: + /* move cursor right */ + if (current != charcount) + { + current++; + if (GetCursorX () == maxx - 1) + { + SetCursorXY (0, (SHORT)(GetCursorY () + 1)); + curx = 0; + cury++; + } + else + { + SetCursorXY ((SHORT)(GetCursorX () + 1), GetCursorY ()); + curx++; + } + } #ifdef FEATURE_HISTORY - else - { - LPCTSTR last = PeekHistory(-1); - if (last && charcount < (INT)_tcslen (last)) - { - PreviousChar = last[current]; - ConOutChar(PreviousChar); - GetCursorXY(&curx, &cury); - str[current++] = PreviousChar; - charcount++; - } - } -#endif - break; - - default: - /* This input is just a normal char */ - bCharInput = TRUE; - - } + else + { + LPCTSTR last = PeekHistory(-1); + if (last && charcount < (INT)_tcslen (last)) + { + PreviousChar = last[current]; + ConOutChar(PreviousChar); + GetCursorXY(&curx, &cury); + str[current++] = PreviousChar; + charcount++; + } + } +#endif + break; + + default: + /* This input is just a normal char */ + bCharInput = TRUE; + + } #ifdef _UNICODE - ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + ch = ir.Event.KeyEvent.uChar.UnicodeChar; + if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #else - ch = ir.Event.KeyEvent.uChar.AsciiChar; - if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + ch = ir.Event.KeyEvent.uChar.AsciiChar; + if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #endif /* _UNICODE */ - { - /* insert character into string... */ - if (bInsert && current != charcount) - { - /* If this character insertion will cause screen scrolling, - * adjust the saved origin of the command prompt. */ - tempscreen = _tcslen(str + current) + curx; - if ((tempscreen % maxx) == (maxx - 1) && - (tempscreen / maxx) + cury == (maxy - 1)) - { - orgy--; - cury--; - } - - for (count = charcount; count > current; count--) - str[count] = str[count - 1]; - str[current++] = ch; - if (curx == maxx - 1) - curx = 0, cury++; - else - curx++; - ConOutPrintf (_T("%s"), &str[current - 1]); - SetCursorXY (curx, cury); - charcount++; - } - else - { - if (current == charcount) - charcount++; - str[current++] = ch; - if (GetCursorX () == maxx - 1 && GetCursorY () == maxy - 1) - orgy--, cury--; - if (GetCursorX () == maxx - 1) - curx = 0, cury++; - else - curx++; - ConOutChar (ch); - } - } - - //wLastKey = ir.Event.KeyEvent.wVirtualKeyCode; - } - while (!bReturn); - - SetCursorType (bInsert, TRUE); + { + /* insert character into string... */ + if (bInsert && current != charcount) + { + /* If this character insertion will cause screen scrolling, + * adjust the saved origin of the command prompt. */ + tempscreen = _tcslen(str + current) + curx; + if ((tempscreen % maxx) == (maxx - 1) && + (tempscreen / maxx) + cury == (maxy - 1)) + { + orgy--; + cury--; + } + + for (count = charcount; count > current; count--) + str[count] = str[count - 1]; + str[current++] = ch; + if (curx == maxx - 1) + curx = 0, cury++; + else + curx++; + ConOutPrintf (_T("%s"), &str[current - 1]); + SetCursorXY (curx, cury); + charcount++; + } + else + { + if (current == charcount) + charcount++; + str[current++] = ch; + if (GetCursorX () == maxx - 1 && GetCursorY () == maxy - 1) + orgy--, cury--; + if (GetCursorX () == maxx - 1) + curx = 0, cury++; + else + curx++; + ConOutChar (ch); + } + } + + //wLastKey = ir.Event.KeyEvent.wVirtualKeyCode; + } + while (!bReturn); + + SetCursorType (bInsert, TRUE); #ifdef FEATURE_ALIASES - /* expand all aliases */ - ExpandAlias (str, maxlen); + /* expand all aliases */ + ExpandAlias (str, maxlen); #endif /* FEATURE_ALIAS */ - return TRUE; + return TRUE; }

1 0

[hbelusca] 59386: [CMD] Fix whitespace (part 5bis/6) (convert tabs into 4-space indent).
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 12:52:54 2013 New Revision: 59386 URL: http://svn.reactos.org/svn/reactos?rev=59386&view=rev Log: [CMD] Fix whitespace (part 5bis/6) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/del.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Sun Jun 30 12:52:54 2013 @@ -54,8 +54,8 @@ * 23-Feb-2001 (Carl Nettelblad <cnettel(a)hem.passagen.es>) * Fixes made to get "for" working. * - * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) - * Remove all hardcode string to En.rc + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) + * Remove all hardcoded strings in En.rc */ #include "precomp.h" @@ -65,7 +65,7 @@ */ LPBATCH_CONTEXT bc = NULL; -BOOL bEcho = TRUE; /* The echo flag */ +BOOL bEcho = TRUE; /* The echo flag */ @@ -82,24 +82,24 @@ LPTSTR FindArg(TCHAR Char, BOOL *IsParam0) { - LPTSTR pp; - INT n = Char - _T('0'); - - TRACE ("FindArg: (%d)\n", n); - - if (n < 0 || n > 9) - return NULL; - - n = bc->shiftlevel[n]; - *IsParam0 = (n == 0); - pp = bc->params; - - /* Step up the strings till we reach the end */ - /* or the one we want */ - while (*pp && n--) - pp += _tcslen (pp) + 1; - - return pp; + LPTSTR pp; + INT n = Char - _T('0'); + + TRACE ("FindArg: (%d)\n", n); + + if (n < 0 || n > 9) + return NULL; + + n = bc->shiftlevel[n]; + *IsParam0 = (n == 0); + pp = bc->params; + + /* Step up the strings till we reach the end */ + /* or the one we want */ + while (*pp && n--) + pp += _tcslen (pp) + 1; + + return pp; } @@ -108,51 +108,51 @@ * The parameters consist of null terminated strings with a final * NULL character signalling the end of the parameters. * -*/ + */ LPTSTR BatchParams (LPTSTR s1, LPTSTR s2) { - LPTSTR dp = (LPTSTR)cmd_alloc ((_tcslen(s1) + _tcslen(s2) + 3) * sizeof (TCHAR)); - - /* JPP 20-Jul-1998 added error checking */ - if (dp == NULL) - { - error_out_of_memory(); - return NULL; - } - - if (s1 && *s1) - { - s1 = _stpcpy (dp, s1); - *s1++ = _T('\0'); - } - else - s1 = dp; - - while (*s2) - { - BOOL inquotes = FALSE; - - /* Find next parameter */ - while (_istspace(*s2) || (*s2 && _tcschr(_T(",;="), *s2))) - s2++; - if (!*s2) - break; - - /* Copy it */ - do - { - if (!inquotes && (_istspace(*s2) || _tcschr(_T(",;="), *s2))) - break; - inquotes ^= (*s2 == _T('"')); - *s1++ = *s2++; - } while (*s2); - *s1++ = _T('\0'); - } - - *s1 = _T('\0'); - - return dp; + LPTSTR dp = (LPTSTR)cmd_alloc ((_tcslen(s1) + _tcslen(s2) + 3) * sizeof (TCHAR)); + + /* JPP 20-Jul-1998 added error checking */ + if (dp == NULL) + { + error_out_of_memory(); + return NULL; + } + + if (s1 && *s1) + { + s1 = _stpcpy (dp, s1); + *s1++ = _T('\0'); + } + else + s1 = dp; + + while (*s2) + { + BOOL inquotes = FALSE; + + /* Find next parameter */ + while (_istspace(*s2) || (*s2 && _tcschr(_T(",;="), *s2))) + s2++; + if (!*s2) + break; + + /* Copy it */ + do + { + if (!inquotes && (_istspace(*s2) || _tcschr(_T(",;="), *s2))) + break; + inquotes ^= (*s2 == _T('"')); + *s1++ = *s2++; + } while (*s2); + *s1++ = _T('\0'); + } + + *s1 = _T('\0'); + + return dp; } /* @@ -160,16 +160,16 @@ */ VOID ClearBatch() { - TRACE ("ClearBatch mem = %08x free = %d\n", bc->mem, bc->memfree); - - if (bc->mem && bc->memfree) - cmd_free(bc->mem); - - if (bc->raw_params) - cmd_free(bc->raw_params); - - if (bc->params) - cmd_free(bc->params); + TRACE ("ClearBatch mem = %08x free = %d\n", bc->mem, bc->memfree); + + if (bc->mem && bc->memfree) + cmd_free(bc->mem); + + if (bc->raw_params) + cmd_free(bc->raw_params); + + if (bc->params) + cmd_free(bc->params); } /* @@ -184,20 +184,20 @@ VOID ExitBatch() { - ClearBatch(); - - TRACE ("ExitBatch\n"); - - UndoRedirection(bc->RedirList, NULL); - FreeRedirection(bc->RedirList); - - /* Preserve echo state across batch calls */ - bEcho = bc->bEcho; - - while (bc->setlocal) - cmd_endlocal(_T("")); - - bc = bc->prev; + ClearBatch(); + + TRACE ("ExitBatch\n"); + + UndoRedirection(bc->RedirList, NULL); + FreeRedirection(bc->RedirList); + + /* Preserve echo state across batch calls */ + bEcho = bc->bEcho; + + while (bc->setlocal) + cmd_endlocal(_T("")); + + bc = bc->prev; } /* @@ -206,26 +206,26 @@ */ void BatchFile2Mem(HANDLE hBatchFile) { - TRACE ("BatchFile2Mem ()\n"); - - bc->memsize = GetFileSize(hBatchFile, NULL); - bc->mem = (char *)cmd_alloc(bc->memsize+1); /* 1 extra for '\0' */ - - /* if memory is available, read it in and close the file */ - if (bc->mem != NULL) - { - TRACE ("BatchFile2Mem memory %08x - %08x\n",bc->mem,bc->memsize); - SetFilePointer (hBatchFile, 0, NULL, FILE_BEGIN); - ReadFile(hBatchFile, (LPVOID)bc->mem, bc->memsize, &bc->memsize, NULL); - bc->mem[bc->memsize]='\0'; /* end this, so you can dump it as a string */ - bc->memfree=TRUE; /* this one needs to be freed */ - } - else - { - bc->memsize=0; /* this will prevent mem being accessed */ - bc->memfree=FALSE; - } - bc->mempos = 0; /* set position to the start */ + TRACE ("BatchFile2Mem ()\n"); + + bc->memsize = GetFileSize(hBatchFile, NULL); + bc->mem = (char *)cmd_alloc(bc->memsize+1); /* 1 extra for '\0' */ + + /* if memory is available, read it in and close the file */ + if (bc->mem != NULL) + { + TRACE ("BatchFile2Mem memory %08x - %08x\n",bc->mem,bc->memsize); + SetFilePointer (hBatchFile, 0, NULL, FILE_BEGIN); + ReadFile(hBatchFile, (LPVOID)bc->mem, bc->memsize, &bc->memsize, NULL); + bc->mem[bc->memsize]='\0'; /* end this, so you can dump it as a string */ + bc->memfree=TRUE; /* this one needs to be freed */ + } + else + { + bc->memsize=0; /* this will prevent mem being accessed */ + bc->memfree=FALSE; + } + bc->mempos = 0; /* set position to the start */ } /* @@ -234,97 +234,96 @@ * The firstword parameter is the full filename of the batch file. * */ - INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { - BATCH_CONTEXT new; - LPFOR_CONTEXT saved_fc; - INT i; - INT ret = 0; - BOOL same_fn = FALSE; - - HANDLE hFile = 0; - SetLastError(0); - if (bc && bc->mem) - { - TCHAR fpname[MAX_PATH]; - GetFullPathName(fullname, sizeof(fpname) / sizeof(TCHAR), fpname, NULL); - if (_tcsicmp(bc->BatchFilePath,fpname)==0) - same_fn=TRUE; - } - TRACE ("Batch: (\'%s\', \'%s\', \'%s\') same_fn = %d\n", - debugstr_aw(fullname), debugstr_aw(firstword), debugstr_aw(param), same_fn); - - if (!same_fn) - { - hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, NULL); - - if (hFile == INVALID_HANDLE_VALUE) - { - ConErrResPuts(STRING_BATCH_ERROR); - return 1; - } - } - - if (bc != NULL && Cmd == bc->current) - { - /* Then we are transferring to another batch */ - ClearBatch(); - AddBatchRedirection(&Cmd->Redirections); - } - else - { - struct _SETLOCAL *setlocal = NULL; - - if (Cmd == NULL) - { - /* This is a CALL. CALL will set errorlevel to our return value, so - * in order to keep the value of errorlevel unchanged in the case - * of calling an empty batch file, we must return that same value. */ - ret = nErrorLevel; - } - else if (bc) - { - /* If a batch file runs another batch file as part of a compound command - * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ - - /* Get its SETLOCAL stack so it can be migrated to the new context */ - setlocal = bc->setlocal; - bc->setlocal = NULL; - ExitBatch(); - } - - /* Create a new context. This function will not - * return until this context has been exited */ - new.prev = bc; - /* copy some fields in the new structure if it is the same file */ - if (same_fn) { - new.mem = bc->mem; - new.memsize = bc->memsize; - new.mempos = 0; - new.memfree = FALSE; /* don't free this, being used before this */ - } - bc = &new; - bc->RedirList = NULL; - bc->setlocal = setlocal; - } - - GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); - /* if a new batch file, load it into memory and close the file */ - if (!same_fn) - { - BatchFile2Mem(hFile); - CloseHandle(hFile); - } - - bc->mempos = 0; /* goto begin of batch file */ - bc->bEcho = bEcho; /* Preserve echo across batch calls */ - for (i = 0; i < 10; i++) - bc->shiftlevel[i] = i; - - bc->params = BatchParams (firstword, param); + BATCH_CONTEXT new; + LPFOR_CONTEXT saved_fc; + INT i; + INT ret = 0; + BOOL same_fn = FALSE; + + HANDLE hFile = 0; + SetLastError(0); + if (bc && bc->mem) + { + TCHAR fpname[MAX_PATH]; + GetFullPathName(fullname, sizeof(fpname) / sizeof(TCHAR), fpname, NULL); + if (_tcsicmp(bc->BatchFilePath,fpname)==0) + same_fn=TRUE; + } + TRACE ("Batch: (\'%s\', \'%s\', \'%s\') same_fn = %d\n", + debugstr_aw(fullname), debugstr_aw(firstword), debugstr_aw(param), same_fn); + + if (!same_fn) + { + hFile = CreateFile(fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | + FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + ConErrResPuts(STRING_BATCH_ERROR); + return 1; + } + } + + if (bc != NULL && Cmd == bc->current) + { + /* Then we are transferring to another batch */ + ClearBatch(); + AddBatchRedirection(&Cmd->Redirections); + } + else + { + struct _SETLOCAL *setlocal = NULL; + + if (Cmd == NULL) + { + /* This is a CALL. CALL will set errorlevel to our return value, so + * in order to keep the value of errorlevel unchanged in the case + * of calling an empty batch file, we must return that same value. */ + ret = nErrorLevel; + } + else if (bc) + { + /* If a batch file runs another batch file as part of a compound command + * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ + + /* Get its SETLOCAL stack so it can be migrated to the new context */ + setlocal = bc->setlocal; + bc->setlocal = NULL; + ExitBatch(); + } + + /* Create a new context. This function will not + * return until this context has been exited */ + new.prev = bc; + /* copy some fields in the new structure if it is the same file */ + if (same_fn) { + new.mem = bc->mem; + new.memsize = bc->memsize; + new.mempos = 0; + new.memfree = FALSE; /* don't free this, being used before this */ + } + bc = &new; + bc->RedirList = NULL; + bc->setlocal = setlocal; + } + + GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); + /* if a new batch file, load it into memory and close the file */ + if (!same_fn) + { + BatchFile2Mem(hFile); + CloseHandle(hFile); + } + + bc->mempos = 0; /* goto begin of batch file */ + bc->bEcho = bEcho; /* Preserve echo across batch calls */ + for (i = 0; i < 10; i++) + bc->shiftlevel[i] = i; + + bc->params = BatchParams (firstword, param); // // Allocate enough memory to hold the params and copy them over without modifications // @@ -335,58 +334,58 @@ return 1; } - /* Check if this is a "CALL :label" */ - if (*firstword == _T(':')) - cmd_goto(firstword); - - /* If we are calling from inside a FOR, hide the FOR variables */ - saved_fc = fc; - fc = NULL; - - /* If we have created a new context, don't return - * until this batch file has completed. */ - while (bc == &new && !bExit) - { - Cmd = ParseCommand(NULL); - if (!Cmd) - continue; - - /* JPP 19980807 */ - /* Echo batch file line */ - if (bEcho && !bDisableBatchEcho && Cmd->Type != C_QUIET) - { - if (!bIgnoreEcho) - ConOutChar(_T('\n')); - PrintPrompt(); - EchoCommand(Cmd); - ConOutChar(_T('\n')); - } - - bc->current = Cmd; - ret = ExecuteCommand(Cmd); - FreeCommand(Cmd); - } - - TRACE ("Batch: returns TRUE\n"); - - fc = saved_fc; - return ret; + /* Check if this is a "CALL :label" */ + if (*firstword == _T(':')) + cmd_goto(firstword); + + /* If we are calling from inside a FOR, hide the FOR variables */ + saved_fc = fc; + fc = NULL; + + /* If we have created a new context, don't return + * until this batch file has completed. */ + while (bc == &new && !bExit) + { + Cmd = ParseCommand(NULL); + if (!Cmd) + continue; + + /* JPP 19980807 */ + /* Echo batch file line */ + if (bEcho && !bDisableBatchEcho && Cmd->Type != C_QUIET) + { + if (!bIgnoreEcho) + ConOutChar(_T('\n')); + PrintPrompt(); + EchoCommand(Cmd); + ConOutChar(_T('\n')); + } + + bc->current = Cmd; + ret = ExecuteCommand(Cmd); + FreeCommand(Cmd); + } + + TRACE ("Batch: returns TRUE\n"); + + fc = saved_fc; + return ret; } VOID AddBatchRedirection(REDIRECTION **RedirList) { - REDIRECTION **ListEnd; - - /* Prepend the list to the batch context's list */ - ListEnd = RedirList; - while (*ListEnd) - ListEnd = &(*ListEnd)->Next; - *ListEnd = bc->RedirList; - bc->RedirList = *RedirList; - - /* Null out the pointer so that the list will not be cleared prematurely. - * These redirections should persist until the batch file exits. */ - *RedirList = NULL; + REDIRECTION **ListEnd; + + /* Prepend the list to the batch context's list */ + ListEnd = RedirList; + while (*ListEnd) + ListEnd = &(*ListEnd)->Next; + *ListEnd = bc->RedirList; + bc->RedirList = *RedirList; + + /* Null out the pointer so that the list will not be cleared prematurely. + * These redirections should persist until the batch file exits. */ + *RedirList = NULL; } /* @@ -395,41 +394,41 @@ */ BOOL BatchGetString (LPTSTR lpBuffer, INT nBufferLength) { - LPSTR lpString; - INT len = 0; + LPSTR lpString; + INT len = 0; #ifdef _UNICODE - lpString = cmd_alloc(nBufferLength); + lpString = cmd_alloc(nBufferLength); #else - lpString = lpBuffer; + lpString = lpBuffer; #endif - /* read all chars from memory until a '\n' is encountered */ - if (bc->mem) - { - for (; (bc->mempos < bc->memsize && len < (nBufferLength-1)); len++) - { - lpString[len] = bc->mem[bc->mempos++]; - if (lpString[len] == '\n' ) - { - len++; - break; - } - } - } - - if (!len) - { + /* read all chars from memory until a '\n' is encountered */ + if (bc->mem) + { + for (; (bc->mempos < bc->memsize && len < (nBufferLength-1)); len++) + { + lpString[len] = bc->mem[bc->mempos++]; + if (lpString[len] == '\n' ) + { + len++; + break; + } + } + } + + if (!len) + { #ifdef _UNICODE - cmd_free(lpString); + cmd_free(lpString); #endif - return FALSE; - } - - lpString[len++] = '\0'; + return FALSE; + } + + lpString[len++] = '\0'; #ifdef _UNICODE - MultiByteToWideChar(OutputCodePage, 0, lpString, -1, lpBuffer, len); - cmd_free(lpString); + MultiByteToWideChar(OutputCodePage, 0, lpString, -1, lpBuffer, len); + cmd_free(lpString); #endif - return TRUE; + return TRUE; } /* @@ -442,30 +441,30 @@ */ LPTSTR ReadBatchLine () { - TRACE ("ReadBatchLine ()\n"); - - /* User halt */ - if (CheckCtrlBreak (BREAK_BATCHFILE)) - { - while (bc) - ExitBatch(); - return NULL; - } - - if (!BatchGetString (textline, sizeof (textline) / sizeof (textline[0]) - 1)) - { - TRACE ("ReadBatchLine(): Reached EOF!\n"); - /* End of file.... */ - ExitBatch(); - return NULL; - } - - TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); - - if (textline[_tcslen(textline) - 1] != _T('\n')) - _tcscat(textline, _T("\n")); - - return textline; + TRACE ("ReadBatchLine ()\n"); + + /* User halt */ + if (CheckCtrlBreak (BREAK_BATCHFILE)) + { + while (bc) + ExitBatch(); + return NULL; + } + + if (!BatchGetString (textline, sizeof (textline) / sizeof (textline[0]) - 1)) + { + TRACE ("ReadBatchLine(): Reached EOF!\n"); + /* End of file.... */ + ExitBatch(); + return NULL; + } + + TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); + + if (textline[_tcslen(textline) - 1] != _T('\n')) + _tcscat(textline, _T("\n")); + + return textline; } /* EOF */ Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Jun 30 12:52:54 2013 @@ -7,13 +7,13 @@ * 20-Jan-1999 (Eric Kohl) * started * - * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) - * Remove all hardcode string to En.rc - * - * 01-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) + * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * Remove all hardcoded strings in En.rc + * + * 01-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu> * Added ConPrintfPaging and ConOutPrintfPaging * - * 02-Feb-2007 (Paolo Devoti) <devotip at gmail.com>) + * 02-Feb-2007 (Paolo Devoti) <devotip at gmail.com> * Fixed ConPrintfPaging */ @@ -28,441 +28,441 @@ VOID ConInDisable (VOID) { - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); - DWORD dwMode; - - GetConsoleMode (hInput, &dwMode); - dwMode &= ~ENABLE_PROCESSED_INPUT; - SetConsoleMode (hInput, dwMode); + HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); + DWORD dwMode; + + GetConsoleMode (hInput, &dwMode); + dwMode &= ~ENABLE_PROCESSED_INPUT; + SetConsoleMode (hInput, dwMode); } VOID ConInEnable (VOID) { - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); - DWORD dwMode; - - GetConsoleMode (hInput, &dwMode); - dwMode |= ENABLE_PROCESSED_INPUT; - SetConsoleMode (hInput, dwMode); + HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); + DWORD dwMode; + + GetConsoleMode (hInput, &dwMode); + dwMode |= ENABLE_PROCESSED_INPUT; + SetConsoleMode (hInput, dwMode); } VOID ConInFlush (VOID) { - FlushConsoleInputBuffer (GetStdHandle (STD_INPUT_HANDLE)); + FlushConsoleInputBuffer (GetStdHandle (STD_INPUT_HANDLE)); } VOID ConInKey (PINPUT_RECORD lpBuffer) { - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); - DWORD dwRead; - - if (hInput == INVALID_HANDLE_VALUE) - WARN ("Invalid input handle!!!\n"); - - do - { - ReadConsoleInput (hInput, lpBuffer, 1, &dwRead); - if ((lpBuffer->EventType == KEY_EVENT) && - (lpBuffer->Event.KeyEvent.bKeyDown == TRUE)) - break; - } - while (TRUE); + HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); + DWORD dwRead; + + if (hInput == INVALID_HANDLE_VALUE) + WARN ("Invalid input handle!!!\n"); + + do + { + ReadConsoleInput (hInput, lpBuffer, 1, &dwRead); + if ((lpBuffer->EventType == KEY_EVENT) && + (lpBuffer->Event.KeyEvent.bKeyDown == TRUE)) + break; + } + while (TRUE); } VOID ConInString (LPTSTR lpInput, DWORD dwLength) { - DWORD dwOldMode; - DWORD dwRead = 0; - HANDLE hFile; - - LPTSTR p; - PCHAR pBuf; + DWORD dwOldMode; + DWORD dwRead = 0; + HANDLE hFile; + + LPTSTR p; + PCHAR pBuf; #ifdef _UNICODE - pBuf = (PCHAR)cmd_alloc(dwLength - 1); + pBuf = (PCHAR)cmd_alloc(dwLength - 1); #else - pBuf = lpInput; -#endif - ZeroMemory (lpInput, dwLength * sizeof(TCHAR)); - hFile = GetStdHandle (STD_INPUT_HANDLE); - GetConsoleMode (hFile, &dwOldMode); - - SetConsoleMode (hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); - - ReadFile (hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); + pBuf = lpInput; +#endif + ZeroMemory (lpInput, dwLength * sizeof(TCHAR)); + hFile = GetStdHandle (STD_INPUT_HANDLE); + GetConsoleMode (hFile, &dwOldMode); + + SetConsoleMode (hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + + ReadFile (hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); #ifdef _UNICODE - MultiByteToWideChar(InputCodePage, 0, pBuf, dwRead, lpInput, dwLength - 1); - cmd_free(pBuf); -#endif - for (p = lpInput; *p; p++) - { - if (*p == _T('\x0d')) - { - *p = _T('\0'); - break; - } - } - - SetConsoleMode (hFile, dwOldMode); + MultiByteToWideChar(InputCodePage, 0, pBuf, dwRead, lpInput, dwLength - 1); + cmd_free(pBuf); +#endif + for (p = lpInput; *p; p++) + { + if (*p == _T('\x0d')) + { + *p = _T('\0'); + break; + } + } + + SetConsoleMode (hFile, dwOldMode); } static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle) { - DWORD dwWritten; - HANDLE hOutput = GetStdHandle(nStdHandle); - - if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) - return; - - /* We're writing to a file or pipe instead of the console. Convert the - * string from TCHARs to the desired output format, if the two differ */ - if (bUnicodeOutput) - { + DWORD dwWritten; + HANDLE hOutput = GetStdHandle(nStdHandle); + + if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) + return; + + /* We're writing to a file or pipe instead of the console. Convert the + * string from TCHARs to the desired output format, if the two differ */ + if (bUnicodeOutput) + { #ifndef _UNICODE - WCHAR *buffer = cmd_alloc(len * sizeof(WCHAR)); - if (!buffer) - { - error_out_of_memory(); - return; - } - len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len); - str = (PVOID)buffer; -#endif - WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); + WCHAR *buffer = cmd_alloc(len * sizeof(WCHAR)); + if (!buffer) + { + error_out_of_memory(); + return; + } + len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len); + str = (PVOID)buffer; +#endif + WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); #ifndef _UNICODE - cmd_free(buffer); -#endif - } - else - { + cmd_free(buffer); +#endif + } + else + { #ifdef _UNICODE - CHAR *buffer = cmd_alloc(len * MB_LEN_MAX * sizeof(CHAR)); - if (!buffer) - { - error_out_of_memory(); - return; - } - len = WideCharToMultiByte(OutputCodePage, 0, str, len, buffer, len * MB_LEN_MAX, NULL, NULL); - str = (PVOID)buffer; -#endif - WriteFile(hOutput, str, len, &dwWritten, NULL); + CHAR *buffer = cmd_alloc(len * MB_LEN_MAX * sizeof(CHAR)); + if (!buffer) + { + error_out_of_memory(); + return; + } + len = WideCharToMultiByte(OutputCodePage, 0, str, len, buffer, len * MB_LEN_MAX, NULL, NULL); + str = (PVOID)buffer; +#endif + WriteFile(hOutput, str, len, &dwWritten, NULL); #ifdef _UNICODE - cmd_free(buffer); -#endif - } + cmd_free(buffer); +#endif + } } VOID ConOutChar (TCHAR c) { - ConWrite(&c, 1, STD_OUTPUT_HANDLE); + ConWrite(&c, 1, STD_OUTPUT_HANDLE); } VOID ConPuts(LPTSTR szText, DWORD nStdHandle) { - ConWrite(szText, _tcslen(szText), nStdHandle); + ConWrite(szText, _tcslen(szText), nStdHandle); } VOID ConOutResPaging(BOOL NewPage, UINT resID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintfPaging(NewPage, szMsg); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintfPaging(NewPage, szMsg); } VOID ConOutResPuts (UINT resID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - - ConPuts(szMsg, STD_OUTPUT_HANDLE); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + + ConPuts(szMsg, STD_OUTPUT_HANDLE); } VOID ConOutPuts (LPTSTR szText) { - ConPuts(szText, STD_OUTPUT_HANDLE); + ConPuts(szText, STD_OUTPUT_HANDLE); } VOID ConPrintf(LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { - TCHAR szOut[OUTPUT_BUFFER_SIZE]; - ConWrite(szOut, _vstprintf(szOut, szFormat, arg_ptr), nStdHandle); + TCHAR szOut[OUTPUT_BUFFER_SIZE]; + ConWrite(szOut, _vstprintf(szOut, szFormat, arg_ptr), nStdHandle); } INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { - INT len; - CONSOLE_SCREEN_BUFFER_INFO csbi; - TCHAR szOut[OUTPUT_BUFFER_SIZE]; - DWORD dwWritten; - HANDLE hOutput = GetStdHandle(nStdHandle); - - /* used to count number of lines since last pause */ - static int LineCount = 0; - - /* used to see how big the screen is */ - int ScreenLines = 0; - - /* chars since start of line */ - int CharSL; - - int from = 0, i = 0; - - if(NewPage == TRUE) - LineCount = 0; - - /* rest LineCount and return if no string have been given */ - if (szFormat == NULL) - return 0; - - - //get the size of the visual screen that can be printed too - if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) - { - // we assuming its a file handle - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } - //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() - ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; - CharSL = csbi.dwCursorPosition.X; - - //make sure they didnt make the screen to small - if(ScreenLines<4) - { - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } - - len = _vstprintf (szOut, szFormat, arg_ptr); - - while (i < len) - { - // Search until the end of a line is reached - if (szOut[i++] != _T('\n') && ++CharSL < csbi.dwSize.X) - continue; - - LineCount++; - CharSL=0; - - if(LineCount >= ScreenLines) - { - WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); - from = i; - - if(PagePrompt() != PROMPT_YES) - { - return 1; - } - //reset the number of lines being printed - LineCount = 0; - } - } - - WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); - - return 0; + INT len; + CONSOLE_SCREEN_BUFFER_INFO csbi; + TCHAR szOut[OUTPUT_BUFFER_SIZE]; + DWORD dwWritten; + HANDLE hOutput = GetStdHandle(nStdHandle); + + /* used to count number of lines since last pause */ + static int LineCount = 0; + + /* used to see how big the screen is */ + int ScreenLines = 0; + + /* chars since start of line */ + int CharSL; + + int from = 0, i = 0; + + if(NewPage == TRUE) + LineCount = 0; + + /* rest LineCount and return if no string have been given */ + if (szFormat == NULL) + return 0; + + + //get the size of the visual screen that can be printed too + if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) + { + // we assuming its a file handle + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } + //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() + ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; + CharSL = csbi.dwCursorPosition.X; + + //make sure they didnt make the screen to small + if(ScreenLines<4) + { + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } + + len = _vstprintf (szOut, szFormat, arg_ptr); + + while (i < len) + { + // Search until the end of a line is reached + if (szOut[i++] != _T('\n') && ++CharSL < csbi.dwSize.X) + continue; + + LineCount++; + CharSL=0; + + if(LineCount >= ScreenLines) + { + WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); + from = i; + + if(PagePrompt() != PROMPT_YES) + { + return 1; + } + //reset the number of lines being printed + LineCount = 0; + } + } + + WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); + + return 0; } VOID ConErrFormatMessage (DWORD MessageId, ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - DWORD ret; - LPTSTR text; - va_list arg_ptr; - - va_start (arg_ptr, MessageId); - ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - MessageId, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &text, - 0, - &arg_ptr); - - va_end (arg_ptr); - if(ret > 0) - { - ConErrPuts (text); - LocalFree(text); - } - else - { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); - } + TCHAR szMsg[RC_STRING_MAX_SIZE]; + DWORD ret; + LPTSTR text; + va_list arg_ptr; + + va_start (arg_ptr, MessageId); + ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + MessageId, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &text, + 0, + &arg_ptr); + + va_end (arg_ptr); + if(ret > 0) + { + ConErrPuts (text); + LocalFree(text); + } + else + { + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg); + } } VOID ConOutFormatMessage (DWORD MessageId, ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - DWORD ret; - LPTSTR text; - va_list arg_ptr; - - va_start (arg_ptr, MessageId); - ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - MessageId, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &text, - 0, - &arg_ptr); - - va_end (arg_ptr); - if(ret > 0) - { - ConErrPuts (text); - LocalFree(text); - } - else - { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); - } + TCHAR szMsg[RC_STRING_MAX_SIZE]; + DWORD ret; + LPTSTR text; + va_list arg_ptr; + + va_start (arg_ptr, MessageId); + ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + MessageId, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &text, + 0, + &arg_ptr); + + va_end (arg_ptr); + if(ret > 0) + { + ConErrPuts (text); + LocalFree(text); + } + else + { + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg); + } } VOID ConOutResPrintf (UINT resID, ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - va_list arg_ptr; - - va_start (arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConPrintf(szMsg, arg_ptr, STD_OUTPUT_HANDLE); - va_end (arg_ptr); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + va_list arg_ptr; + + va_start (arg_ptr, resID); + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPrintf(szMsg, arg_ptr, STD_OUTPUT_HANDLE); + va_end (arg_ptr); } VOID ConOutPrintf (LPTSTR szFormat, ...) { - va_list arg_ptr; - - va_start (arg_ptr, szFormat); - ConPrintf(szFormat, arg_ptr, STD_OUTPUT_HANDLE); - va_end (arg_ptr); + va_list arg_ptr; + + va_start (arg_ptr, szFormat); + ConPrintf(szFormat, arg_ptr, STD_OUTPUT_HANDLE); + va_end (arg_ptr); } INT ConOutPrintfPaging (BOOL NewPage, LPTSTR szFormat, ...) { - INT iReturn; - va_list arg_ptr; - - va_start (arg_ptr, szFormat); - iReturn = ConPrintfPaging(NewPage, szFormat, arg_ptr, STD_OUTPUT_HANDLE); - va_end (arg_ptr); - return iReturn; + INT iReturn; + va_list arg_ptr; + + va_start (arg_ptr, szFormat); + iReturn = ConPrintfPaging(NewPage, szFormat, arg_ptr, STD_OUTPUT_HANDLE); + va_end (arg_ptr); + return iReturn; } VOID ConErrChar (TCHAR c) { - ConWrite(&c, 1, STD_ERROR_HANDLE); + ConWrite(&c, 1, STD_ERROR_HANDLE); } VOID ConErrResPuts (UINT resID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConPuts(szMsg, STD_ERROR_HANDLE); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPuts(szMsg, STD_ERROR_HANDLE); } VOID ConErrPuts (LPTSTR szText) { - ConPuts(szText, STD_ERROR_HANDLE); + ConPuts(szText, STD_ERROR_HANDLE); } VOID ConErrResPrintf (UINT resID, ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - va_list arg_ptr; - - va_start (arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConPrintf(szMsg, arg_ptr, STD_ERROR_HANDLE); - va_end (arg_ptr); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + va_list arg_ptr; + + va_start (arg_ptr, resID); + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPrintf(szMsg, arg_ptr, STD_ERROR_HANDLE); + va_end (arg_ptr); } VOID ConErrPrintf (LPTSTR szFormat, ...) { - va_list arg_ptr; - - va_start (arg_ptr, szFormat); - ConPrintf(szFormat, arg_ptr, STD_ERROR_HANDLE); - va_end (arg_ptr); + va_list arg_ptr; + + va_start (arg_ptr, szFormat); + ConPrintf(szFormat, arg_ptr, STD_ERROR_HANDLE); + va_end (arg_ptr); } VOID SetCursorXY (SHORT x, SHORT y) { - COORD coPos; - - coPos.X = x; - coPos.Y = y; - SetConsoleCursorPosition (GetStdHandle (STD_OUTPUT_HANDLE), coPos); + COORD coPos; + + coPos.X = x; + coPos.Y = y; + SetConsoleCursorPosition (GetStdHandle (STD_OUTPUT_HANDLE), coPos); } VOID GetCursorXY (PSHORT x, PSHORT y) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); - - *x = csbi.dwCursorPosition.X; - *y = csbi.dwCursorPosition.Y; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + *x = csbi.dwCursorPosition.X; + *y = csbi.dwCursorPosition.Y; } SHORT GetCursorX (VOID) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); - - return csbi.dwCursorPosition.X; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + return csbi.dwCursorPosition.X; } SHORT GetCursorY (VOID) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); - - return csbi.dwCursorPosition.Y; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + return csbi.dwCursorPosition.Y; } VOID GetScreenSize (PSHORT maxx, PSHORT maxy) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) - { - csbi.dwSize.X = 80; - csbi.dwSize.Y = 25; - } - - if (maxx) - *maxx = csbi.dwSize.X; - if (maxy) - *maxy = csbi.dwSize.Y; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) + { + csbi.dwSize.X = 80; + csbi.dwSize.Y = 25; + } + + if (maxx) + *maxx = csbi.dwSize.X; + if (maxy) + *maxy = csbi.dwSize.Y; } VOID SetCursorType (BOOL bInsert, BOOL bVisible) { - CONSOLE_CURSOR_INFO cci; - - cci.dwSize = bInsert ? 10 : 99; - cci.bVisible = bVisible; - - SetConsoleCursorInfo (GetStdHandle (STD_OUTPUT_HANDLE), &cci); + CONSOLE_CURSOR_INFO cci; + + cci.dwSize = bInsert ? 10 : 99; + cci.bVisible = bVisible; + + SetConsoleCursorInfo (GetStdHandle (STD_OUTPUT_HANDLE), &cci); } /* EOF */ Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Sun Jun 30 12:52:54 2013 @@ -52,28 +52,28 @@ enum { - DEL_ATTRIBUTES = 0x001, /* /A */ - DEL_NOTHING = 0x004, /* /N */ - DEL_PROMPT = 0x008, /* /P */ - DEL_QUIET = 0x010, /* /Q */ - DEL_SUBDIR = 0x020, /* /S */ - DEL_TOTAL = 0x040, /* /T */ - DEL_WIPE = 0x080, /* /W */ - DEL_EMPTYDIR = 0x100, /* /X : not implemented */ - DEL_YES = 0x200, /* /Y */ - DEL_FORCE = 0x800 /* /F */ + DEL_ATTRIBUTES = 0x001, /* /A */ + DEL_NOTHING = 0x004, /* /N */ + DEL_PROMPT = 0x008, /* /P */ + DEL_QUIET = 0x010, /* /Q */ + DEL_SUBDIR = 0x020, /* /S */ + DEL_TOTAL = 0x040, /* /T */ + DEL_WIPE = 0x080, /* /W */ + DEL_EMPTYDIR = 0x100, /* /X : not implemented */ + DEL_YES = 0x200, /* /Y */ + DEL_FORCE = 0x800 /* /F */ }; enum { - ATTR_ARCHIVE = 0x001, /* /A:A */ - ATTR_HIDDEN = 0x002, /* /A:H */ - ATTR_SYSTEM = 0x004, /* /A:S */ - ATTR_READ_ONLY = 0x008, /* /A:R */ - ATTR_N_ARCHIVE = 0x010, /* /A:-A */ - ATTR_N_HIDDEN = 0x020, /* /A:-H */ - ATTR_N_SYSTEM = 0x040, /* /A:-S */ - ATTR_N_READ_ONLY = 0x080 /* /A:-R */ + ATTR_ARCHIVE = 0x001, /* /A:A */ + ATTR_HIDDEN = 0x002, /* /A:H */ + ATTR_SYSTEM = 0x004, /* /A:S */ + ATTR_READ_ONLY = 0x008, /* /A:R */ + ATTR_N_ARCHIVE = 0x010, /* /A:-A */ + ATTR_N_HIDDEN = 0x020, /* /A:-H */ + ATTR_N_SYSTEM = 0x040, /* /A:-S */ + ATTR_N_READ_ONLY = 0x080 /* /A:-R */ }; static TCHAR szDeleteWipe[RC_STRING_MAX_SIZE]; @@ -83,471 +83,460 @@ static VOID LoadStrings(VOID) { - LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, RC_STRING_MAX_SIZE); - GetModuleFileName(NULL, CMDPath, MAX_PATH); - StringsLoaded = TRUE; + LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, RC_STRING_MAX_SIZE); + GetModuleFileName(NULL, CMDPath, MAX_PATH); + StringsLoaded = TRUE; } static BOOL RemoveFile (LPTSTR lpFileName, DWORD dwFlags, WIN32_FIND_DATA* f) { - /*This function is called by CommandDelete and - does the actual process of deleting the single - file*/ - if(CheckCtrlBreak(BREAK_INPUT)) - return 1; - - /*check to see if it is read only and if this is done based on /A - if it is done by file name, access is denied. However, if it is done - using the /A switch you must un-read only the file and allow it to be - deleted*/ - if((dwFlags & DEL_ATTRIBUTES) || (dwFlags & DEL_FORCE)) - { - if(f->dwFileAttributes & FILE_ATTRIBUTE_READONLY) - { - /*setting file to normal, not saving old attrs first - because the file is going to be deleted anyways - so the only thing that matters is that it isn't - read only.*/ - SetFileAttributes(lpFileName,FILE_ATTRIBUTE_NORMAL); - } - } - - if (dwFlags & DEL_WIPE) - { - - HANDLE file; - DWORD temp; + /*This function is called by CommandDelete and + does the actual process of deleting the single + file*/ + if (CheckCtrlBreak(BREAK_INPUT)) + return 1; + + /*check to see if it is read only and if this is done based on /A + if it is done by file name, access is denied. However, if it is done + using the /A switch you must un-read only the file and allow it to be + deleted*/ + if ((dwFlags & DEL_ATTRIBUTES) || (dwFlags & DEL_FORCE)) + { + if (f->dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + /*setting file to normal, not saving old attrs first + because the file is going to be deleted anyways + so the only thing that matters is that it isn't + read only.*/ + SetFileAttributes(lpFileName,FILE_ATTRIBUTE_NORMAL); + } + } + + if (dwFlags & DEL_WIPE) + { + HANDLE file; + DWORD temp; #define BufferSize 65536 - BYTE buffer[BufferSize]; - LONGLONG i; - LARGE_INTEGER FileSize; - - FileSize.u.HighPart = f->nFileSizeHigh; - FileSize.u.LowPart = f->nFileSizeLow; - - for(i = 0; i < BufferSize; i++) - { - buffer[i]=rand() % 256; - } - file = CreateFile (lpFileName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_WRITE_THROUGH, NULL); - if (file != INVALID_HANDLE_VALUE) - { - for(i = 0; i < (FileSize.QuadPart - BufferSize); i += BufferSize) - { - WriteFile (file, buffer, BufferSize, &temp, NULL); - ConOutPrintf (_T("%I64d%% %s\r"),(i * (LONGLONG)100)/FileSize.QuadPart,szDeleteWipe); - } - WriteFile (file, buffer, (DWORD)(FileSize.QuadPart - i), &temp, NULL); - ConOutPrintf (_T("100%% %s\n"),szDeleteWipe); - CloseHandle (file); - } - } - - return DeleteFile (lpFileName); + BYTE buffer[BufferSize]; + LONGLONG i; + LARGE_INTEGER FileSize; + + FileSize.u.HighPart = f->nFileSizeHigh; + FileSize.u.LowPart = f->nFileSizeLow; + + for(i = 0; i < BufferSize; i++) + { + buffer[i]=rand() % 256; + } + file = CreateFile (lpFileName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_WRITE_THROUGH, NULL); + if (file != INVALID_HANDLE_VALUE) + { + for(i = 0; i < (FileSize.QuadPart - BufferSize); i += BufferSize) + { + WriteFile (file, buffer, BufferSize, &temp, NULL); + ConOutPrintf (_T("%I64d%% %s\r"),(i * (LONGLONG)100)/FileSize.QuadPart,szDeleteWipe); + } + WriteFile (file, buffer, (DWORD)(FileSize.QuadPart - i), &temp, NULL); + ConOutPrintf (_T("100%% %s\n"),szDeleteWipe); + CloseHandle (file); + } + } + + return DeleteFile (lpFileName); } static DWORD DeleteFiles(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) { - TCHAR szFullPath[MAX_PATH]; - TCHAR szFileName[MAX_PATH]; - LPTSTR pFilePart; - HANDLE hFile; - WIN32_FIND_DATA f; - BOOL bExclusion; - INT res; - DWORD dwFiles = 0; - - _tcscpy(szFileName, FileName); - - if(_tcschr (szFileName, _T('*')) == NULL && - IsExistingDirectory (szFileName)) - { - /* If it doesnt have a \ at the end already then on needs to be added */ - if(szFileName[_tcslen(szFileName) - 1] != _T('\\')) - _tcscat (szFileName, _T("\\")); - /* Add a wildcard after the \ */ - _tcscat (szFileName, _T("*")); - } - - if(!_tcscmp (szFileName, _T("*")) || - !_tcscmp (szFileName, _T("*.*")) || - (szFileName[_tcslen(szFileName) - 2] == _T('\\') && szFileName[_tcslen(szFileName) - 1] == _T('*'))) - { - /* well, the user wants to delete everything but if they didnt yes DEL_YES, DEL_QUIET, or DEL_PROMPT - then we are going to want to make sure that in fact they want to do that. */ - - if (!((*dwFlags & DEL_YES) || (*dwFlags & DEL_QUIET) || (*dwFlags & DEL_PROMPT))) - { - res = FilePromptYNA (STRING_DEL_HELP2); - if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) - return 0x80000000; - if(res == PROMPT_ALL) - *dwFlags |= DEL_YES; - } - } - - GetFullPathName (szFileName, - MAX_PATH, - szFullPath, - &pFilePart); + TCHAR szFullPath[MAX_PATH]; + TCHAR szFileName[MAX_PATH]; + LPTSTR pFilePart; + HANDLE hFile; + WIN32_FIND_DATA f; + BOOL bExclusion; + INT res; + DWORD dwFiles = 0; + + _tcscpy(szFileName, FileName); + + if (_tcschr (szFileName, _T('*')) == NULL && + IsExistingDirectory (szFileName)) + { + /* If it doesnt have a \ at the end already then on needs to be added */ + if (szFileName[_tcslen(szFileName) - 1] != _T('\\')) + _tcscat (szFileName, _T("\\")); + /* Add a wildcard after the \ */ + _tcscat (szFileName, _T("*")); + } + + if (!_tcscmp (szFileName, _T("*")) || + !_tcscmp (szFileName, _T("*.*")) || + (szFileName[_tcslen(szFileName) - 2] == _T('\\') && szFileName[_tcslen(szFileName) - 1] == _T('*'))) + { + /* well, the user wants to delete everything but if they didnt yes DEL_YES, DEL_QUIET, or DEL_PROMPT + then we are going to want to make sure that in fact they want to do that. */ + + if (!((*dwFlags & DEL_YES) || (*dwFlags & DEL_QUIET) || (*dwFlags & DEL_PROMPT))) + { + res = FilePromptYNA (STRING_DEL_HELP2); + if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) + return 0x80000000; + if (res == PROMPT_ALL) + *dwFlags |= DEL_YES; + } + } + + GetFullPathName(szFileName, + MAX_PATH, + szFullPath, + &pFilePart); + + hFile = FindFirstFile(szFullPath, &f); + if (hFile != INVALID_HANDLE_VALUE) + { + do + { + bExclusion = FALSE; + + /*if it is going to be excluded by - no need to check attrs*/ + if (*dwFlags & DEL_ATTRIBUTES && !bExclusion) + { + /*save if file attr check if user doesnt care about that attr anyways*/ + if (dwAttrFlags & ATTR_ARCHIVE && !(f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_HIDDEN && !(f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_SYSTEM && !(f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_READ_ONLY && !(f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_N_ARCHIVE && (f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_N_HIDDEN && (f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_N_SYSTEM && (f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_N_READ_ONLY && (f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + bExclusion = TRUE; + } + if (bExclusion) continue; + + /* ignore directories */ + if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + + _tcscpy (pFilePart, f.cFileName); + + /* We cant delete ourselves */ + if (!_tcscmp (CMDPath,szFullPath)) continue; + + TRACE("Full filename: %s\n", debugstr_aw(szFullPath)); + + /* ask for deleting */ + if (*dwFlags & DEL_PROMPT) + { + ConErrResPrintf(STRING_DEL_ERROR5, szFullPath); + + res = FilePromptYN (STRING_DEL_ERROR6); + + if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) + { + nErrorLevel = 0; + continue; + } + } + + /*user cant ask it to be quiet and tell you what it did*/ + if (!(*dwFlags & DEL_QUIET) && !(*dwFlags & DEL_TOTAL)) + { + ConErrResPrintf(STRING_DEL_ERROR7, szFullPath); + } + + /* delete the file */ + if (*dwFlags & DEL_NOTHING) continue; + + if (RemoveFile (szFullPath, *dwFlags, &f)) + { + dwFiles++; + } + else + { + ErrorMessage (GetLastError(), _T("")); +// FindClose(hFile); +// return -1; + } + } + while (FindNextFile (hFile, &f)); + FindClose (hFile); + } + else error_sfile_not_found(szFullPath); + return dwFiles; +} + +static DWORD +ProcessDirectory(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) +{ + TCHAR szFullPath[MAX_PATH]; + LPTSTR pFilePart; + LPTSTR pSearchPart; + HANDLE hFile; + WIN32_FIND_DATA f; + DWORD dwFiles = 0; + + GetFullPathName(FileName, + MAX_PATH, + szFullPath, + &pFilePart); + + dwFiles = DeleteFiles(szFullPath, dwFlags, dwAttrFlags); + if (dwFiles & 0x80000000) return dwFiles; + + if (*dwFlags & DEL_SUBDIR) + { + /* Get just the file name */ + pSearchPart = _tcsrchr(FileName,_T('\\')); + if (pSearchPart != NULL) + pSearchPart++; + else + pSearchPart = FileName; + + /* Get the full path to the file */ + GetFullPathName (FileName,MAX_PATH,szFullPath,NULL); + + /* strip the filename off of it */ + pFilePart = _tcsrchr(szFullPath, _T('\\')); + if (pFilePart == NULL) + { + pFilePart = szFullPath; + } + else + { + pFilePart++; + } + + _tcscpy(pFilePart, _T("*")); hFile = FindFirstFile(szFullPath, &f); if (hFile != INVALID_HANDLE_VALUE) { - do - { - bExclusion = FALSE; - - /*if it is going to be excluded by - no need to check attrs*/ - if(*dwFlags & DEL_ATTRIBUTES && !bExclusion) - { - - /*save if file attr check if user doesnt care about that attr anyways*/ - if(dwAttrFlags & ATTR_ARCHIVE && !(f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_HIDDEN && !(f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_SYSTEM && !(f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_READ_ONLY && !(f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_N_ARCHIVE && (f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_N_HIDDEN && (f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_N_SYSTEM && (f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_N_READ_ONLY && (f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - bExclusion = TRUE; - } - if(bExclusion) - continue; - - /* ignore directories */ - if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - - - _tcscpy (pFilePart, f.cFileName); - - /* We cant delete ourselves */ - if(!_tcscmp (CMDPath,szFullPath)) - continue; - - - TRACE("Full filename: %s\n", debugstr_aw(szFullPath)); - - /* ask for deleting */ - if (*dwFlags & DEL_PROMPT) - { - ConErrResPrintf(STRING_DEL_ERROR5, szFullPath); - - res = FilePromptYN (STRING_DEL_ERROR6); - - if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) - { - nErrorLevel = 0; - continue; - } - } - - /*user cant ask it to be quiet and tell you what it did*/ - if (!(*dwFlags & DEL_QUIET) && !(*dwFlags & DEL_TOTAL)) - { - ConErrResPrintf(STRING_DEL_ERROR7, szFullPath); - } - - /* delete the file */ - if(*dwFlags & DEL_NOTHING) - continue; - - if(RemoveFile (szFullPath, *dwFlags, &f)) - dwFiles++; - else + do + { + if (!(f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || + !_tcscmp(f.cFileName, _T(".")) || + !_tcscmp(f.cFileName, _T(".."))) + continue; + + _tcscpy(pFilePart, f.cFileName); + _tcscat(pFilePart, _T("\\")); + _tcscat(pFilePart, pSearchPart); + + dwFiles +=ProcessDirectory(szFullPath, dwFlags, dwAttrFlags); + if (dwFiles & 0x80000000) + { + break; + } + } + while (FindNextFile (hFile, &f)); + FindClose (hFile); + } + } + return dwFiles; +} + + + +INT CommandDelete (LPTSTR param) +{ + /*cmd is the command that was given, in this case it will always be "del" or "delete" + param is whatever is given after the command*/ + + LPTSTR *arg = NULL; + INT args; + INT i; + INT nEvalArgs = 0; /* nunber of evaluated arguments */ + DWORD dwFlags = 0; + DWORD dwAttrFlags = 0; + DWORD dwFiles = 0; + LONG ch; + TCHAR szOrginalArg[MAX_PATH]; + + /*checks the first two chars of param to see if it is /? + this however allows the following command to not show help + "del frog.txt /?" */ + + if (!StringsLoaded) + { + LoadStrings(); + } + + if (!_tcsncmp (param, _T("/?"), 2)) + { + ConOutResPaging(TRUE,STRING_DEL_HELP1); + return 0; + } + + nErrorLevel = 0; + + arg = split (param, &args, FALSE, FALSE); + + if (args == 0) + { + /* only command given */ + error_req_param_missing (); + freep (arg); + return 1; + } + /* check for options anywhere in command line */ + for (i = 0; i < args; i++) + { + if (*arg[i] == _T('/')) + { + /*found a command, but check to make sure it has something after it*/ + if (_tcslen (arg[i]) >= 2) + { + ch = _totupper (arg[i][1]); + if (ch == _T('N')) + { + dwFlags |= DEL_NOTHING; + } + else if (ch == _T('P')) + { + dwFlags |= DEL_PROMPT; + } + else if (ch == _T('Q')) + { + dwFlags |= DEL_QUIET; + } + else if (ch == _T('F')) + { + dwFlags |= DEL_FORCE; + } + else if (ch == _T('S')) + { + dwFlags |= DEL_SUBDIR; + } + else if (ch == _T('T')) + { + dwFlags |= DEL_TOTAL; + } + else if (ch == _T('W')) + { + dwFlags |= DEL_WIPE; + } + else if (ch == _T('Y')) + { + dwFlags |= DEL_YES; + } + else if (ch == _T('A')) + { + dwFlags |= DEL_ATTRIBUTES; + /*the proper syntax for /A has a min of 4 chars + i.e. /A:R or /A:-H */ + if (_tcslen (arg[i]) < 4) + { + error_invalid_parameter_format(arg[i]); + return 0; + } + ch = _totupper (arg[i][3]); + if (_tcslen (arg[i]) == 4) + { + if (ch == _T('A')) { - ErrorMessage (GetLastError(), _T("")); -// FindClose(hFile); -// return -1; - } - } - while (FindNextFile (hFile, &f)); - FindClose (hFile); - } - else error_sfile_not_found(szFullPath); - return dwFiles; + dwAttrFlags |= ATTR_ARCHIVE; + } + if (ch == _T('H')) + { + dwAttrFlags |= ATTR_HIDDEN; + } + if (ch == _T('S')) + { + dwAttrFlags |= ATTR_SYSTEM; + } + if (ch == _T('R')) + { + dwAttrFlags |= ATTR_READ_ONLY; + } + } + if (_tcslen (arg[i]) == 5) + { + if (ch == _T('-')) + { + ch = _totupper (arg[i][4]); + if (ch == _T('A')) + { + dwAttrFlags |= ATTR_N_ARCHIVE; + } + if (ch == _T('H')) + { + dwAttrFlags |= ATTR_N_HIDDEN; + } + if (ch == _T('S')) + { + dwAttrFlags |= ATTR_N_SYSTEM; + } + if (ch == _T('R')) + { + dwAttrFlags |= ATTR_N_READ_ONLY; + } + } + } + } + } + + nEvalArgs++; + } + } + + /* there are only options on the command line --> error!!! + there is the same number of args as there is flags, so none of the args were filenames*/ + if (args == nEvalArgs) + { + error_req_param_missing (); + freep (arg); + return 1; + } + + /* keep quiet within batch files */ + if (bc != NULL) dwFlags |= DEL_QUIET; + + /* check for filenames anywhere in command line */ + for (i = 0; i < args && !(dwFiles & 0x80000000); i++) + { + /*this checks to see if it is a flag; if it isn't, we assume it is a file name*/ + if ((*arg[i] == _T('/')) || (*arg[i] == _T('-'))) + continue; + + /* We want to make a copies of the argument */ + if (_tcslen(arg[i]) == 2 && arg[i][1] == _T(':')) + { + /* Check for C: D: ... */ + GetRootPath(arg[i], szOrginalArg, MAX_PATH); + } + else + { + _tcscpy(szOrginalArg,arg[i]); + } + dwFiles += ProcessDirectory(szOrginalArg, &dwFlags, dwAttrFlags); + } + + freep (arg); + + /*Based on MS cmd, we only tell what files are being deleted when /S is used */ + if (dwFlags & DEL_TOTAL) + { + dwFiles &= 0x7fffffff; + if (dwFiles < 2) + { + ConOutResPrintf(STRING_DEL_HELP3, dwFiles); + } + else + { + ConOutResPrintf(STRING_DEL_HELP4, dwFiles); + } + } + + return 0; } -static DWORD -ProcessDirectory(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) -{ - TCHAR szFullPath[MAX_PATH]; - LPTSTR pFilePart; - LPTSTR pSearchPart; - HANDLE hFile; - WIN32_FIND_DATA f; - DWORD dwFiles = 0; - - GetFullPathName (FileName, - MAX_PATH, - szFullPath, - &pFilePart); - - dwFiles = DeleteFiles(szFullPath, dwFlags, dwAttrFlags); - if (dwFiles & 0x80000000) - return dwFiles; - - if (*dwFlags & DEL_SUBDIR) - { - /* Get just the file name */ - pSearchPart = _tcsrchr(FileName,_T('\\')); - if(pSearchPart != NULL) - pSearchPart++; - else - pSearchPart = FileName; - - /* Get the full path to the file */ - GetFullPathName (FileName,MAX_PATH,szFullPath,NULL); - - /* strip the filename off of it */ - pFilePart = _tcsrchr(szFullPath, _T('\\')); - if (pFilePart == NULL) - { - pFilePart = szFullPath; - } - else - { - pFilePart++; - } - - _tcscpy(pFilePart, _T("*")); - - hFile = FindFirstFile(szFullPath, &f); - if (hFile != INVALID_HANDLE_VALUE) - { - do - { - if (!(f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !_tcscmp(f.cFileName, _T(".")) || - !_tcscmp(f.cFileName, _T(".."))) - continue; - - _tcscpy(pFilePart, f.cFileName); - _tcscat(pFilePart, _T("\\")); - _tcscat(pFilePart, pSearchPart); - - dwFiles +=ProcessDirectory(szFullPath, dwFlags, dwAttrFlags); - if (dwFiles & 0x80000000) - { - break; - } - } - while (FindNextFile (hFile, &f)); - FindClose (hFile); - } - } - return dwFiles; -} - - - -INT CommandDelete (LPTSTR param) -{ - /*cmd is the command that was given, in this case it will always be "del" or "delete" - param is whatever is given after the command*/ - - LPTSTR *arg = NULL; - INT args; - INT i; - INT nEvalArgs = 0; /* nunber of evaluated arguments */ - DWORD dwFlags = 0; - DWORD dwAttrFlags = 0; - DWORD dwFiles = 0; - LONG ch; - TCHAR szOrginalArg[MAX_PATH]; - - /*checks the first two chars of param to see if it is /? - this however allows the following command to not show help - "del frog.txt /?" */ - - if (!StringsLoaded) - { - LoadStrings(); - } - - if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutResPaging(TRUE,STRING_DEL_HELP1); - return 0; - } - - nErrorLevel = 0; - - arg = split (param, &args, FALSE, FALSE); - - if (args == 0) - { - /* only command given */ - error_req_param_missing (); - freep (arg); - return 1; - } - /* check for options anywhere in command line */ - for (i = 0; i < args; i++) - { - if (*arg[i] == _T('/')) - { - /*found a command, but check to make sure it has something after it*/ - if (_tcslen (arg[i]) >= 2) - { - ch = _totupper (arg[i][1]); - if (ch == _T('N')) - { - dwFlags |= DEL_NOTHING; - } - else if (ch == _T('P')) - { - dwFlags |= DEL_PROMPT; - } - else if (ch == _T('Q')) - { - dwFlags |= DEL_QUIET; - } - else if (ch == _T('F')) - { - dwFlags |= DEL_FORCE; - } - else if (ch == _T('S')) - { - dwFlags |= DEL_SUBDIR; - } - else if (ch == _T('T')) - { - dwFlags |= DEL_TOTAL; - } - else if (ch == _T('W')) - { - dwFlags |= DEL_WIPE; - } - else if (ch == _T('Y')) - { - dwFlags |= DEL_YES; - } - else if (ch == _T('A')) - { - - dwFlags |= DEL_ATTRIBUTES; - /*the proper syntax for /A has a min of 4 chars - i.e. /A:R or /A:-H */ - if (_tcslen (arg[i]) < 4) - { - error_invalid_parameter_format(arg[i]); - return 0; - } - ch = _totupper (arg[i][3]); - if (_tcslen (arg[i]) == 4) - { - if(ch == _T('A')) - { - dwAttrFlags |= ATTR_ARCHIVE; - } - if(ch == _T('H')) - { - dwAttrFlags |= ATTR_HIDDEN; - } - if(ch == _T('S')) - { - dwAttrFlags |= ATTR_SYSTEM; - } - if(ch == _T('R')) - { - dwAttrFlags |= ATTR_READ_ONLY; - } - } - if (_tcslen (arg[i]) == 5) - { - if(ch == _T('-')) - { - ch = _totupper (arg[i][4]); - if(ch == _T('A')) - { - dwAttrFlags |= ATTR_N_ARCHIVE; - } - if(ch == _T('H')) - { - dwAttrFlags |= ATTR_N_HIDDEN; - } - if(ch == _T('S')) - { - dwAttrFlags |= ATTR_N_SYSTEM; - } - if(ch == _T('R')) - { - dwAttrFlags |= ATTR_N_READ_ONLY; - } - } - } - } - } - - nEvalArgs++; - } - } - - /* there are only options on the command line --> error!!! - there is the same number of args as there is flags, so none of the args were filenames*/ - if (args == nEvalArgs) - { - error_req_param_missing (); - freep (arg); - return 1; - } - - /* keep quiet within batch files */ - if (bc != NULL) - dwFlags |= DEL_QUIET; - - /* check for filenames anywhere in command line */ - for (i = 0; i < args && !(dwFiles & 0x80000000); i++) - { - - /*this checks to see if it is a flag; if it isn't, we assume it is a file name*/ - if((*arg[i] == _T('/')) || (*arg[i] == _T('-'))) - continue; - - /* We want to make a copies of the argument */ - if(_tcslen(arg[i]) == 2 && arg[i][1] == _T(':')) - { - /* Check for C: D: ... */ - GetRootPath(arg[i],szOrginalArg,MAX_PATH); - } - else - { - _tcscpy(szOrginalArg,arg[i]); - } - dwFiles += ProcessDirectory(szOrginalArg, &dwFlags, dwAttrFlags); - - } - - freep (arg); - - /*Based on MS cmd, we only tell what files are being deleted when /S is used */ - if (dwFlags & DEL_TOTAL) - { - dwFiles &= 0x7fffffff; - if (dwFiles < 2) - { - ConOutResPrintf(STRING_DEL_HELP3, dwFiles); - } - else - { - ConOutResPrintf(STRING_DEL_HELP4, dwFiles); - } - } - - return 0; -} - #endif

1 0

[hbelusca] 59385: [CMD] Fix whitespace (part 5/6) (convert tabs into 4-space indent).
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 12:38:11 2013 New Revision: 59385 URL: http://svn.reactos.org/svn/reactos?rev=59385&view=rev Log: [CMD] Fix whitespace (part 5/6) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/chcp.c trunk/reactos/base/shell/cmd/date.c trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] Sun Jun 30 12:38:11 2013 @@ -73,7 +73,6 @@ } freep (arg); - return 0; } Modified: trunk/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/date.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/date.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/date.c [iso-8859-1] Sun Jun 30 12:38:11 2013 @@ -27,8 +27,8 @@ * 04-Feb-1999 (Eric Kohl) * Fixed date input bug. * - * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) - * Remove all hardcode string to En.rc + * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * Remove all hardcoded strings in En.rc */ #include "precomp.h" @@ -38,227 +38,222 @@ static WORD awMonths[2][13] = { - {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, - {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} + {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} }; static VOID PrintDateString (VOID) { - switch (nDateFormat) - { - case 0: /* mmddyy */ - default: - ConOutResPrintf(STRING_DATE_HELP1, cDateSeparator, cDateSeparator); - break; - - case 1: /* ddmmyy */ - ConOutResPrintf(STRING_DATE_HELP2, cDateSeparator, cDateSeparator); - break; - - case 2: /* yymmdd */ - ConOutResPrintf(STRING_DATE_HELP3, cDateSeparator, cDateSeparator); - break; - } -} - + switch (nDateFormat) + { + case 0: /* mmddyy */ + default: + ConOutResPrintf(STRING_DATE_HELP1, cDateSeparator, cDateSeparator); + break; + + case 1: /* ddmmyy */ + ConOutResPrintf(STRING_DATE_HELP2, cDateSeparator, cDateSeparator); + break; + + case 2: /* yymmdd */ + ConOutResPrintf(STRING_DATE_HELP3, cDateSeparator, cDateSeparator); + break; + } +} static BOOL ReadNumber (LPTSTR *s, LPWORD lpwValue) { - if (_istdigit (**s)) - { - while (_istdigit (**s)) - { - *lpwValue = *lpwValue * 10 + **s - _T('0'); - (*s)++; - } - return TRUE; - } - return FALSE; -} - + if (_istdigit (**s)) + { + while (_istdigit (**s)) + { + *lpwValue = *lpwValue * 10 + **s - _T('0'); + (*s)++; + } + return TRUE; + } + return FALSE; +} static BOOL ReadSeparator (LPTSTR *s) { - if (**s == _T('/') || **s == _T('-') || **s == cDateSeparator) - { - (*s)++; - return TRUE; - } - return FALSE; -} - + if (**s == _T('/') || **s == _T('-') || **s == cDateSeparator) + { + (*s)++; + return TRUE; + } + return FALSE; +} static BOOL ParseDate (LPTSTR s) { - SYSTEMTIME d; - unsigned char leap; - LPTSTR p = s; - - if (!*s) - return TRUE; - - GetLocalTime (&d); - - d.wYear = 0; - d.wDay = 0; - d.wMonth = 0; - - switch (nDateFormat) - { - case 0: /* mmddyy */ - default: - if (!ReadNumber (&p, &d.wMonth)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wDay)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wYear)) - return FALSE; - break; - - case 1: /* ddmmyy */ - if (!ReadNumber (&p, &d.wDay)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wMonth)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wYear)) - return FALSE; - break; - - case 2: /* yymmdd */ - if (!ReadNumber (&p, &d.wYear)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wMonth)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wDay)) - return FALSE; - break; - } - - /* if only entered two digits: */ - /* assume 2000's if value less than 80 */ - /* assume 1900's if value greater or equal 80 */ - if (d.wYear <= 99) - { - if (d.wYear >= 80) - d.wYear = 1900 + d.wYear; - else - d.wYear = 2000 + d.wYear; - } - - leap = (!(d.wYear % 4) && (d.wYear % 100)) || !(d.wYear % 400); - - if ((d.wMonth >= 1 && d.wMonth <= 12) && - (d.wDay >= 1 && d.wDay <= awMonths[leap][d.wMonth]) && - (d.wYear >= 1980 && d.wYear <= 2099)) - { - SetLocalTime (&d); - return TRUE; - } - - return FALSE; + SYSTEMTIME d; + unsigned char leap; + LPTSTR p = s; + + if (!*s) + return TRUE; + + GetLocalTime (&d); + + d.wYear = 0; + d.wDay = 0; + d.wMonth = 0; + + switch (nDateFormat) + { + case 0: /* mmddyy */ + default: + if (!ReadNumber (&p, &d.wMonth)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wDay)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wYear)) + return FALSE; + break; + + case 1: /* ddmmyy */ + if (!ReadNumber (&p, &d.wDay)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wMonth)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wYear)) + return FALSE; + break; + + case 2: /* yymmdd */ + if (!ReadNumber (&p, &d.wYear)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wMonth)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wDay)) + return FALSE; + break; + } + + /* if only entered two digits: */ + /* assume 2000's if value less than 80 */ + /* assume 1900's if value greater or equal 80 */ + if (d.wYear <= 99) + { + if (d.wYear >= 80) + d.wYear = 1900 + d.wYear; + else + d.wYear = 2000 + d.wYear; + } + + leap = (!(d.wYear % 4) && (d.wYear % 100)) || !(d.wYear % 400); + + if ((d.wMonth >= 1 && d.wMonth <= 12) && + (d.wDay >= 1 && d.wDay <= awMonths[leap][d.wMonth]) && + (d.wYear >= 1980 && d.wYear <= 2099)) + { + SetLocalTime (&d); + return TRUE; + } + + return FALSE; } INT cmd_date (LPTSTR param) { - LPTSTR *arg; - INT argc; - INT i; - BOOL bPrompt = TRUE; - INT nDateString = -1; - - if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutResPaging(TRUE,STRING_DATE_HELP4); - return 0; - } - - nErrorLevel = 0; - - /* build parameter array */ - arg = split (param, &argc, FALSE, FALSE); - - /* check for options */ - for (i = 0; i < argc; i++) - { - if (_tcsicmp (arg[i], _T("/t")) == 0) - bPrompt = FALSE; - if ((*arg[i] != _T('/')) && (nDateString == -1)) - nDateString = i; - } - - if (nDateString == -1) - ConOutPrintf(_T("%s"), GetDateString()); - - if (!bPrompt) - { - freep (arg); - return 0; - } - - if (nDateString == -1) - { - while (TRUE) /* forever loop */ - { - TCHAR s[40]; - - PrintDateString (); - ConInString (s, 40); - TRACE ("\'%s\'\n", debugstr_aw(s)); - while (*s && s[_tcslen (s) - 1] < _T(' ')) - s[_tcslen (s) - 1] = _T('\0'); - if (ParseDate (s)) - { - freep (arg); - return 0; - } - ConErrResPuts(STRING_DATE_ERROR); - - } - } - else - { - if (!ParseDate (arg[nDateString])) - { - while (TRUE) /* forever loop */ - { - TCHAR s[40]; - ConErrResPuts(STRING_DATE_ERROR); - - PrintDateString (); - ConInString (s, 40); - - while (*s && s[_tcslen (s) - 1] < _T(' ')) - s[_tcslen (s) - 1] = _T('\0'); - if (ParseDate (s)) - { - freep (arg); - return 0; - } - } - } - } - - freep (arg); - - return 0; + LPTSTR *arg; + INT argc; + INT i; + BOOL bPrompt = TRUE; + INT nDateString = -1; + + if (!_tcsncmp (param, _T("/?"), 2)) + { + ConOutResPaging(TRUE,STRING_DATE_HELP4); + return 0; + } + + nErrorLevel = 0; + + /* build parameter array */ + arg = split (param, &argc, FALSE, FALSE); + + /* check for options */ + for (i = 0; i < argc; i++) + { + if (_tcsicmp (arg[i], _T("/t")) == 0) + bPrompt = FALSE; + if ((*arg[i] != _T('/')) && (nDateString == -1)) + nDateString = i; + } + + if (nDateString == -1) + ConOutPrintf(_T("%s"), GetDateString()); + + if (!bPrompt) + { + freep (arg); + return 0; + } + + if (nDateString == -1) + { + while (TRUE) /* forever loop */ + { + TCHAR s[40]; + + PrintDateString (); + ConInString (s, 40); + TRACE ("\'%s\'\n", debugstr_aw(s)); + while (*s && s[_tcslen (s) - 1] < _T(' ')) + s[_tcslen (s) - 1] = _T('\0'); + if (ParseDate (s)) + { + freep (arg); + return 0; + } + ConErrResPuts(STRING_DATE_ERROR); + } + } + else + { + if (!ParseDate (arg[nDateString])) + { + while (TRUE) /* forever loop */ + { + TCHAR s[40]; + ConErrResPuts(STRING_DATE_ERROR); + + PrintDateString (); + ConInString (s, 40); + + while (*s && s[_tcslen (s) - 1] < _T(' ')) + s[_tcslen (s) - 1] = _T('\0'); + if (ParseDate (s)) + { + freep (arg); + return 0; + } + } + } + } + + freep (arg); + return 0; } #endif /* INCLUDE_CMD_DATE */ Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sun Jun 30 12:38:11 2013 @@ -1048,32 +1048,32 @@ * The function that prints in bare format */ static VOID -DirPrintBareList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The number of files */ - LPTSTR lpCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ -{ - DWORD i; - - for (i = 0; i < dwCount && !bCtrlBreak; i++) - { - if ((_tcscmp(ptrFiles[i]->cFileName, _T(".")) == 0) || - (_tcscmp(ptrFiles[i]->cFileName, _T("..")) == 0)) - { - /* at bare format we don't print "." and ".." folder */ - continue; - } - if (lpFlags->bRecursive) - { - /* at recursive mode we print full path of file */ - DirPrintf(lpFlags, _T("%s\\%s\n"), lpCurPath, ptrFiles[i]->cFileName); - } - else - { - /* if we are not in recursive mode we print the file names */ - DirPrintf(lpFlags, _T("%s\n"), ptrFiles[i]->cFileName); - } - } +DirPrintBareList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ + DWORD dwCount, /* [IN] The number of files */ + LPTSTR lpCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ +{ + DWORD i; + + for (i = 0; i < dwCount && !bCtrlBreak; i++) + { + if ((_tcscmp(ptrFiles[i]->cFileName, _T(".")) == 0) || + (_tcscmp(ptrFiles[i]->cFileName, _T("..")) == 0)) + { + /* at bare format we don't print "." and ".." folder */ + continue; + } + if (lpFlags->bRecursive) + { + /* at recursive mode we print full path of file */ + DirPrintf(lpFlags, _T("%s\\%s\n"), lpCurPath, ptrFiles[i]->cFileName); + } + else + { + /* if we are not in recursive mode we print the file names */ + DirPrintf(lpFlags, _T("%s\n"), ptrFiles[i]->cFileName); + } + } } @@ -1083,57 +1083,55 @@ * The functions that prints the files list */ static VOID -DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ - - /* Print trailing backslash for root directory of drive */ - _tcscpy(szTemp, szCurPath); - if (_tcslen(szTemp) == 2 && szTemp[1] == _T(':')) - _tcscat(szTemp, _T("\\")); - - /* Condition to print header: - We are not printing in bare format - and if we are in recursive mode... we must have results */ - if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) - { - LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); - if (DirPrintf(lpFlags, szMsg, szTemp)) - return; - } - - if (lpFlags->bBareFormat) - { - /* Bare format */ - DirPrintBareList(ptrFiles, dwCount, szCurPath, lpFlags); - } - else if(lpFlags->bShortName) - { - /* New list style / Short names */ - DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); - } - else if(lpFlags->bWideListColSort || lpFlags->bWideList) - { - /* Wide list */ - DirPrintWideList(ptrFiles, dwCount, szCurPath, lpFlags); - } - else if (lpFlags->bNewLongList ) - { - /* New list style*/ - DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); - } - else - { - /* If nothing is selected old list is the default */ - DirPrintOldList(ptrFiles, dwCount, szCurPath, lpFlags); - } -} - - +DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ + DWORD dwCount, /* [IN] The quantity of files */ + TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ + + /* Print trailing backslash for root directory of drive */ + _tcscpy(szTemp, szCurPath); + if (_tcslen(szTemp) == 2 && szTemp[1] == _T(':')) + _tcscat(szTemp, _T("\\")); + + /* Condition to print header: + We are not printing in bare format + and if we are in recursive mode... we must have results */ + if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) + { + LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); + if (DirPrintf(lpFlags, szMsg, szTemp)) + return; + } + + if (lpFlags->bBareFormat) + { + /* Bare format */ + DirPrintBareList(ptrFiles, dwCount, szCurPath, lpFlags); + } + else if(lpFlags->bShortName) + { + /* New list style / Short names */ + DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); + } + else if(lpFlags->bWideListColSort || lpFlags->bWideList) + { + /* Wide list */ + DirPrintWideList(ptrFiles, dwCount, szCurPath, lpFlags); + } + else if (lpFlags->bNewLongList ) + { + /* New list style*/ + DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); + } + else + { + /* If nothing is selected old list is the default */ + DirPrintOldList(ptrFiles, dwCount, szCurPath, lpFlags); + } +} /* * CompareFiles @@ -1141,99 +1139,99 @@ * Compares 2 files based on the order criteria */ static BOOL -CompareFiles(LPWIN32_FIND_DATA lpFile1, /* [IN] A pointer to WIN32_FIND_DATA of file 1 */ - LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ +CompareFiles(LPWIN32_FIND_DATA lpFile1, /* [IN] A pointer to WIN32_FIND_DATA of file 1 */ + LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ { ULARGE_INTEGER u64File1; ULARGE_INTEGER u64File2; int i; - long iComp = 0; /* The comparison result */ - - /* Calculate critiries by order given from user */ - for (i = 0;i < lpFlags->stOrderBy.sCriteriaCount;i++) - { - - /* Calculate criteria */ - switch(lpFlags->stOrderBy.eCriteria[i]) - { - case ORDER_SIZE: /* Order by size /o:s */ - /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->nFileSizeLow; - u64File1.HighPart = lpFile1->nFileSizeHigh; - u64File2.LowPart = lpFile2->nFileSizeLow; - u64File2.HighPart = lpFile2->nFileSizeHigh; - - /* In case that differnce is too big for a long */ - if (u64File1.QuadPart < u64File2.QuadPart) - iComp = -1; - else if (u64File1.QuadPart > u64File2.QuadPart) - iComp = 1; - else - iComp = 0; - break; - - case ORDER_DIRECTORY: /* Order by directory attribute /o:g */ - iComp = ((lpFile2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)- - (lpFile1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)); - break; - - case ORDER_EXTENSION: /* Order by extension name /o:e */ - iComp = _tcsicmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); - break; - - case ORDER_NAME: /* Order by filename /o:n */ - iComp = _tcsicmp(lpFile1->cFileName, lpFile2->cFileName); - break; - - case ORDER_TIME: /* Order by file's time /o:t */ - /* We compare files based on the time field selected by /t */ - switch(lpFlags->stTimeField.eTimeField) - { - case TF_CREATIONDATE: - /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftCreationTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftCreationTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftCreationTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftCreationTime.dwHighDateTime ; - break; - case TF_LASTACCESSEDDATE : - /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftLastAccessTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftLastAccessTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftLastAccessTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftLastAccessTime.dwHighDateTime ; - break; - case TF_MODIFIEDDATE: - /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftLastWriteTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftLastWriteTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftLastWriteTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftLastWriteTime.dwHighDateTime ; - break; - } - - /* In case that differnce is too big for a long */ - if (u64File1.QuadPart < u64File2.QuadPart) - iComp = -1; - else if (u64File1.QuadPart > u64File2.QuadPart) - iComp = 1; - else - iComp = 0; - break; - } - - /* Reverse if desired */ - if (lpFlags->stOrderBy.bCriteriaRev[i]) - iComp *= -1; - - /* If that criteria was enough for distinguishing - the files/dirs,there is no need to calculate the others*/ - if (iComp != 0) break; - } - - /* Translate the value of iComp to boolean */ - return iComp > 0; + long iComp = 0; /* The comparison result */ + + /* Calculate critiries by order given from user */ + for (i = 0;i < lpFlags->stOrderBy.sCriteriaCount;i++) + { + + /* Calculate criteria */ + switch(lpFlags->stOrderBy.eCriteria[i]) + { + case ORDER_SIZE: /* Order by size /o:s */ + /* concat the 32bit integers to a 64bit */ + u64File1.LowPart = lpFile1->nFileSizeLow; + u64File1.HighPart = lpFile1->nFileSizeHigh; + u64File2.LowPart = lpFile2->nFileSizeLow; + u64File2.HighPart = lpFile2->nFileSizeHigh; + + /* In case that differnce is too big for a long */ + if (u64File1.QuadPart < u64File2.QuadPart) + iComp = -1; + else if (u64File1.QuadPart > u64File2.QuadPart) + iComp = 1; + else + iComp = 0; + break; + + case ORDER_DIRECTORY: /* Order by directory attribute /o:g */ + iComp = ((lpFile2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)- + (lpFile1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)); + break; + + case ORDER_EXTENSION: /* Order by extension name /o:e */ + iComp = _tcsicmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); + break; + + case ORDER_NAME: /* Order by filename /o:n */ + iComp = _tcsicmp(lpFile1->cFileName, lpFile2->cFileName); + break; + + case ORDER_TIME: /* Order by file's time /o:t */ + /* We compare files based on the time field selected by /t */ + switch(lpFlags->stTimeField.eTimeField) + { + case TF_CREATIONDATE: + /* concat the 32bit integers to a 64bit */ + u64File1.LowPart = lpFile1->ftCreationTime.dwLowDateTime; + u64File1.HighPart = lpFile1->ftCreationTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->ftCreationTime.dwLowDateTime; + u64File2.HighPart = lpFile2->ftCreationTime.dwHighDateTime ; + break; + case TF_LASTACCESSEDDATE : + /* concat the 32bit integers to a 64bit */ + u64File1.LowPart = lpFile1->ftLastAccessTime.dwLowDateTime; + u64File1.HighPart = lpFile1->ftLastAccessTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->ftLastAccessTime.dwLowDateTime; + u64File2.HighPart = lpFile2->ftLastAccessTime.dwHighDateTime ; + break; + case TF_MODIFIEDDATE: + /* concat the 32bit integers to a 64bit */ + u64File1.LowPart = lpFile1->ftLastWriteTime.dwLowDateTime; + u64File1.HighPart = lpFile1->ftLastWriteTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->ftLastWriteTime.dwLowDateTime; + u64File2.HighPart = lpFile2->ftLastWriteTime.dwHighDateTime ; + break; + } + + /* In case that differnce is too big for a long */ + if (u64File1.QuadPart < u64File2.QuadPart) + iComp = -1; + else if (u64File1.QuadPart > u64File2.QuadPart) + iComp = 1; + else + iComp = 0; + break; + } + + /* Reverse if desired */ + if (lpFlags->stOrderBy.bCriteriaRev[i]) + iComp *= -1; + + /* If that criteria was enough for distinguishing + the files/dirs,there is no need to calculate the others*/ + if (iComp != 0) break; + } + + /* Translate the value of iComp to boolean */ + return iComp > 0; } /* @@ -1242,44 +1240,42 @@ * Sort files by the order criterias using quicksort method */ static VOID -QsortFiles(LPWIN32_FIND_DATA ptrArray[], /* [IN/OUT] The array with file info pointers */ - int i, /* [IN] The index of first item in array */ - int j, /* [IN] The index to last item in array */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we will use to sort */ -{ - LPWIN32_FIND_DATA lpTemp; /* A temporary pointer */ - BOOL Way; - - if (i < j) - { - int First = i, Last = j, Temp; - Way = TRUE; - while (i != j) - { - if (Way == CompareFiles(ptrArray[i], ptrArray[j], lpFlags)) - { - /* Swap the pointers of the array */ - lpTemp = ptrArray[i]; - ptrArray[i]= ptrArray[j]; - ptrArray[j] = lpTemp; - - /* Swap the indexes for inverting sorting */ - Temp = i; - i = j; - j =Temp; - - Way = !Way; - } - - j += (!Way - Way); - } - - QsortFiles(ptrArray,First, i-1, lpFlags); - QsortFiles(ptrArray,i+1,Last, lpFlags); - } -} - - +QsortFiles(LPWIN32_FIND_DATA ptrArray[], /* [IN/OUT] The array with file info pointers */ + int i, /* [IN] The index of first item in array */ + int j, /* [IN] The index to last item in array */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we will use to sort */ +{ + LPWIN32_FIND_DATA lpTemp; /* A temporary pointer */ + BOOL Way; + + if (i < j) + { + int First = i, Last = j, Temp; + Way = TRUE; + while (i != j) + { + if (Way == CompareFiles(ptrArray[i], ptrArray[j], lpFlags)) + { + /* Swap the pointers of the array */ + lpTemp = ptrArray[i]; + ptrArray[i]= ptrArray[j]; + ptrArray[j] = lpTemp; + + /* Swap the indexes for inverting sorting */ + Temp = i; + i = j; + j =Temp; + + Way = !Way; + } + + j += (!Way - Way); + } + + QsortFiles(ptrArray,First, i-1, lpFlags); + QsortFiles(ptrArray,i+1,Last, lpFlags); + } +} /* * DirList @@ -1287,244 +1283,243 @@ * The functions that does everything except for printing results */ static INT -DirList(LPTSTR szPath, /* [IN] The path that dir starts */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ -{ - BOOL fPoint; /* If szPath is a file with extension fPoint will be True*/ - HANDLE hSearch; /* The handle of the search */ - HANDLE hRecSearch; /* The handle for searching recursivly */ - WIN32_FIND_DATA wfdFileInfo; /* The info of file that found */ - LPWIN32_FIND_DATA * ptrFileArray; /* An array of pointers with all the files */ - PDIRFINDLISTNODE ptrStartNode; /* The pointer to the first node */ - PDIRFINDLISTNODE ptrNextNode; /* A pointer used for relatives refernces */ - TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing \ */ - TCHAR szSubPath[MAX_PATH]; - LPTSTR pszFilePart; - DWORD dwCount; /* A counter of files found in directory */ - DWORD dwCountFiles; /* Counter for files */ - DWORD dwCountDirs; /* Counter for directories */ - ULONGLONG u64CountBytes; /* Counter for bytes */ - ULARGE_INTEGER u64Temp; /* A temporary counter */ - - /* Initialize Variables */ - ptrStartNode = NULL; - ptrNextNode = NULL; - dwCount = 0; - dwCountFiles = 0; - dwCountDirs = 0; - u64CountBytes = 0; - fPoint= FALSE; - - /* Create szFullPath */ - if (GetFullPathName(szPath, sizeof(szFullPath) / sizeof(TCHAR), szFullPath, &pszFilePart) == 0) - { - _tcscpy (szFullPath, szPath); - pszFilePart = NULL; - } - - /* If no wildcard or file was specified and this is a directory, then - display all files in it */ - if (pszFilePart == NULL || IsExistingDirectory(szFullPath)) - { - pszFilePart = &szFullPath[_tcslen(szFullPath)]; - if (pszFilePart[-1] != _T('\\')) - *pszFilePart++ = _T('\\'); - _tcscpy(pszFilePart, _T("*")); - } - - /* Prepare the linked list, first node is allocated */ - ptrStartNode = cmd_alloc(sizeof(DIRFINDLISTNODE)); - if (ptrStartNode == NULL) - { - WARN("DEBUG: Cannot allocate memory for ptrStartNode!\n"); - return 1; /* Error cannot allocate memory for 1st object */ - } - ptrNextNode = ptrStartNode; - - /*Checking ir szPath is a File with/wout extension*/ - if (szPath[_tcslen(szPath) - 1] == _T('.')) - fPoint= TRUE; - - /* Collect the results for the current folder */ - hSearch = FindFirstFile(szFullPath, &wfdFileInfo); - if (hSearch != INVALID_HANDLE_VALUE) - { - do - { - /*If retrieved FileName has extension,and szPath doesnt have extension then JUMP the retrieved FileName*/ - if(_tcschr(wfdFileInfo.cFileName,_T('.'))&&(fPoint==TRUE)) - { - continue; - /* Here we filter all the specified attributes */ - }else if ((wfdFileInfo.dwFileAttributes & lpFlags->stAttribs.dwAttribMask ) - == (lpFlags->stAttribs.dwAttribMask & lpFlags->stAttribs.dwAttribVal )) - { - ptrNextNode->ptrNext = cmd_alloc(sizeof(DIRFINDLISTNODE)); - if (ptrNextNode->ptrNext == NULL) - { - WARN("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\n"); - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; - } - FindClose(hSearch); - return 1; - } - - /* If cmd_alloc fails we go to next file in hope it works, - without braking the linked list! */ - if (ptrNextNode->ptrNext) - { - /* Copy the info of search at linked list */ - memcpy(&ptrNextNode->ptrNext->stFindInfo, - &wfdFileInfo, - sizeof(WIN32_FIND_DATA)); - - /* If lower case is selected do it here */ - if (lpFlags->bLowerCase) - { - _tcslwr(ptrNextNode->ptrNext->stFindInfo.cAlternateFileName); - _tcslwr(ptrNextNode->ptrNext->stFindInfo.cFileName); - } - - /* Continue at next node at linked list */ - ptrNextNode = ptrNextNode->ptrNext; - dwCount ++; - - /* Grab statistics */ - if (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - /* Directory */ - dwCountDirs++; - } - else - { - /* File */ - dwCountFiles++; - u64Temp.HighPart = wfdFileInfo.nFileSizeHigh; - u64Temp.LowPart = wfdFileInfo.nFileSizeLow; - u64CountBytes += u64Temp.QuadPart; - } - } - } - } while (FindNextFile(hSearch, &wfdFileInfo)); - FindClose(hSearch); - } - - /* Terminate list */ - ptrNextNode->ptrNext = NULL; - - /* Calculate and allocate space need for making an array of pointers */ - ptrFileArray = cmd_alloc(sizeof(LPWIN32_FIND_DATA) * dwCount); - if (ptrFileArray == NULL) - { - WARN("DEBUG: Cannot allocate memory for ptrFileArray!\n"); - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; - } - return 1; - } - - /* - * Create an array of pointers from the linked list - * this will be used to sort and print data, rather than the list - */ - ptrNextNode = ptrStartNode; - dwCount = 0; - while (ptrNextNode->ptrNext) - { - *(ptrFileArray + dwCount) = &ptrNextNode->ptrNext->stFindInfo; - ptrNextNode = ptrNextNode->ptrNext; - dwCount++; - } - - /* Sort Data if requested*/ - if (lpFlags->stOrderBy.sCriteriaCount > 0) - QsortFiles(ptrFileArray, 0, dwCount-1, lpFlags); - - /* Print Data */ - pszFilePart[-1] = _T('\0'); /* truncate to directory name only */ - DirPrintFiles(ptrFileArray, dwCount, szFullPath, lpFlags); - pszFilePart[-1] = _T('\\'); - - if (lpFlags->bRecursive) - { - PrintSummary(szFullPath, - dwCountFiles, - dwCountDirs, - u64CountBytes, - lpFlags, - FALSE); - } - - /* Free array */ - cmd_free(ptrFileArray); - /* Free linked list */ - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; - } - - if (CheckCtrlBreak(BREAK_INPUT)) - return 1; - - - /* Add statistics to recursive statistics*/ - recurse_dir_cnt += dwCountDirs; - recurse_file_cnt += dwCountFiles; - recurse_bytes += u64CountBytes; - - /* Do the recursive job if requested - the recursive is be done on ALL(indepent of their attribs) - directoried of the current one.*/ - if (lpFlags->bRecursive) - { - /* The new search is involving any *.* file */ - memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); - _tcscpy(&szSubPath[pszFilePart - szFullPath], _T("*.*")); - - hRecSearch = FindFirstFile (szSubPath, &wfdFileInfo); - if (hRecSearch != INVALID_HANDLE_VALUE) - { - do - { - /* We search for directories other than "." and ".." */ - if ((_tcsicmp(wfdFileInfo.cFileName, _T(".")) != 0) && - (_tcsicmp(wfdFileInfo.cFileName, _T("..")) != 0 ) && - (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - { - /* Concat the path and the directory to do recursive */ - memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); - _tcscpy(&szSubPath[pszFilePart - szFullPath], wfdFileInfo.cFileName); - _tcscat(szSubPath, _T("\\")); - _tcscat(szSubPath, pszFilePart); - - /* We do the same for the folder */ - if (DirList(szSubPath, lpFlags) != 0) - { - FindClose(hRecSearch); - return 1; - } - } - } while(FindNextFile(hRecSearch, &wfdFileInfo)); - } - FindClose(hRecSearch); - } - - return 0; -} - - +DirList(LPTSTR szPath, /* [IN] The path that dir starts */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ +{ + BOOL fPoint; /* If szPath is a file with extension fPoint will be True*/ + HANDLE hSearch; /* The handle of the search */ + HANDLE hRecSearch; /* The handle for searching recursivly */ + WIN32_FIND_DATA wfdFileInfo; /* The info of file that found */ + LPWIN32_FIND_DATA * ptrFileArray; /* An array of pointers with all the files */ + PDIRFINDLISTNODE ptrStartNode; /* The pointer to the first node */ + PDIRFINDLISTNODE ptrNextNode; /* A pointer used for relatives refernces */ + TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing \ */ + TCHAR szSubPath[MAX_PATH]; + LPTSTR pszFilePart; + DWORD dwCount; /* A counter of files found in directory */ + DWORD dwCountFiles; /* Counter for files */ + DWORD dwCountDirs; /* Counter for directories */ + ULONGLONG u64CountBytes; /* Counter for bytes */ + ULARGE_INTEGER u64Temp; /* A temporary counter */ + + /* Initialize Variables */ + ptrStartNode = NULL; + ptrNextNode = NULL; + dwCount = 0; + dwCountFiles = 0; + dwCountDirs = 0; + u64CountBytes = 0; + fPoint= FALSE; + + /* Create szFullPath */ + if (GetFullPathName(szPath, sizeof(szFullPath) / sizeof(TCHAR), szFullPath, &pszFilePart) == 0) + { + _tcscpy (szFullPath, szPath); + pszFilePart = NULL; + } + + /* If no wildcard or file was specified and this is a directory, then + display all files in it */ + if (pszFilePart == NULL || IsExistingDirectory(szFullPath)) + { + pszFilePart = &szFullPath[_tcslen(szFullPath)]; + if (pszFilePart[-1] != _T('\\')) + *pszFilePart++ = _T('\\'); + _tcscpy(pszFilePart, _T("*")); + } + + /* Prepare the linked list, first node is allocated */ + ptrStartNode = cmd_alloc(sizeof(DIRFINDLISTNODE)); + if (ptrStartNode == NULL) + { + WARN("DEBUG: Cannot allocate memory for ptrStartNode!\n"); + return 1; /* Error cannot allocate memory for 1st object */ + } + ptrNextNode = ptrStartNode; + + /*Checking ir szPath is a File with/wout extension*/ + if (szPath[_tcslen(szPath) - 1] == _T('.')) + fPoint= TRUE; + + /* Collect the results for the current folder */ + hSearch = FindFirstFile(szFullPath, &wfdFileInfo); + if (hSearch != INVALID_HANDLE_VALUE) + { + do + { + /*If retrieved FileName has extension,and szPath doesnt have extension then JUMP the retrieved FileName*/ + if(_tcschr(wfdFileInfo.cFileName,_T('.'))&&(fPoint==TRUE)) + { + continue; + /* Here we filter all the specified attributes */ + } + else if ((wfdFileInfo.dwFileAttributes & lpFlags->stAttribs.dwAttribMask ) + == (lpFlags->stAttribs.dwAttribMask & lpFlags->stAttribs.dwAttribVal )) + { + ptrNextNode->ptrNext = cmd_alloc(sizeof(DIRFINDLISTNODE)); + if (ptrNextNode->ptrNext == NULL) + { + WARN("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\n"); + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount--; + } + FindClose(hSearch); + return 1; + } + + /* If cmd_alloc fails we go to next file in hope it works, + without braking the linked list! */ + if (ptrNextNode->ptrNext) + { + /* Copy the info of search at linked list */ + memcpy(&ptrNextNode->ptrNext->stFindInfo, + &wfdFileInfo, + sizeof(WIN32_FIND_DATA)); + + /* If lower case is selected do it here */ + if (lpFlags->bLowerCase) + { + _tcslwr(ptrNextNode->ptrNext->stFindInfo.cAlternateFileName); + _tcslwr(ptrNextNode->ptrNext->stFindInfo.cFileName); + } + + /* Continue at next node at linked list */ + ptrNextNode = ptrNextNode->ptrNext; + dwCount ++; + + /* Grab statistics */ + if (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + /* Directory */ + dwCountDirs++; + } + else + { + /* File */ + dwCountFiles++; + u64Temp.HighPart = wfdFileInfo.nFileSizeHigh; + u64Temp.LowPart = wfdFileInfo.nFileSizeLow; + u64CountBytes += u64Temp.QuadPart; + } + } + } + } while (FindNextFile(hSearch, &wfdFileInfo)); + FindClose(hSearch); + } + + /* Terminate list */ + ptrNextNode->ptrNext = NULL; + + /* Calculate and allocate space need for making an array of pointers */ + ptrFileArray = cmd_alloc(sizeof(LPWIN32_FIND_DATA) * dwCount); + if (ptrFileArray == NULL) + { + WARN("DEBUG: Cannot allocate memory for ptrFileArray!\n"); + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount --; + } + return 1; + } + + /* + * Create an array of pointers from the linked list + * this will be used to sort and print data, rather than the list + */ + ptrNextNode = ptrStartNode; + dwCount = 0; + while (ptrNextNode->ptrNext) + { + *(ptrFileArray + dwCount) = &ptrNextNode->ptrNext->stFindInfo; + ptrNextNode = ptrNextNode->ptrNext; + dwCount++; + } + + /* Sort Data if requested*/ + if (lpFlags->stOrderBy.sCriteriaCount > 0) + QsortFiles(ptrFileArray, 0, dwCount-1, lpFlags); + + /* Print Data */ + pszFilePart[-1] = _T('\0'); /* truncate to directory name only */ + DirPrintFiles(ptrFileArray, dwCount, szFullPath, lpFlags); + pszFilePart[-1] = _T('\\'); + + if (lpFlags->bRecursive) + { + PrintSummary(szFullPath, + dwCountFiles, + dwCountDirs, + u64CountBytes, + lpFlags, + FALSE); + } + + /* Free array */ + cmd_free(ptrFileArray); + /* Free linked list */ + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount --; + } + + if (CheckCtrlBreak(BREAK_INPUT)) + return 1; + + + /* Add statistics to recursive statistics*/ + recurse_dir_cnt += dwCountDirs; + recurse_file_cnt += dwCountFiles; + recurse_bytes += u64CountBytes; + + /* Do the recursive job if requested + the recursive is be done on ALL(indepent of their attribs) + directoried of the current one.*/ + if (lpFlags->bRecursive) + { + /* The new search is involving any *.* file */ + memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); + _tcscpy(&szSubPath[pszFilePart - szFullPath], _T("*.*")); + + hRecSearch = FindFirstFile (szSubPath, &wfdFileInfo); + if (hRecSearch != INVALID_HANDLE_VALUE) + { + do + { + /* We search for directories other than "." and ".." */ + if ((_tcsicmp(wfdFileInfo.cFileName, _T(".")) != 0) && + (_tcsicmp(wfdFileInfo.cFileName, _T("..")) != 0 ) && + (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + /* Concat the path and the directory to do recursive */ + memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); + _tcscpy(&szSubPath[pszFilePart - szFullPath], wfdFileInfo.cFileName); + _tcscat(szSubPath, _T("\\")); + _tcscat(szSubPath, pszFilePart); + + /* We do the same for the folder */ + if (DirList(szSubPath, lpFlags) != 0) + { + FindClose(hRecSearch); + return 1; + } + } + } while(FindNextFile(hRecSearch, &wfdFileInfo)); + } + FindClose(hRecSearch); + } + + return 0; +} /* * dir @@ -1534,147 +1529,155 @@ INT CommandDir(LPTSTR rest) { - TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ - TCHAR path[MAX_PATH]; - TCHAR prev_volume[MAX_PATH]; - LPTSTR* params = NULL; - LPTSTR pszFilePart; - INT entries = 0; - UINT loop = 0; - DIRSWITCHFLAGS stFlags; - INT ret = 1; - BOOL ChangedVolume; - - /* Initialize Switch Flags < Default switches are setted here!> */ - stFlags.b4Digit = TRUE; - stFlags.bBareFormat = FALSE; - stFlags.bLowerCase = FALSE; - stFlags.bNewLongList = TRUE; - stFlags.bPause = FALSE; - stFlags.bRecursive = FALSE; - stFlags.bShortName = FALSE; - stFlags.bTSeperator = TRUE; - stFlags.bUser = FALSE; - stFlags.bWideList = FALSE; - stFlags.bWideListColSort = FALSE; - stFlags.stTimeField.eTimeField = TF_MODIFIEDDATE; - stFlags.stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; - stFlags.stAttribs.dwAttribVal = 0L; - stFlags.stOrderBy.sCriteriaCount = 0; - - nErrorLevel = 0; - - /* read the parameters from the DIRCMD environment variable */ - if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) - if (!DirReadParam(dircmd, &params, &entries, &stFlags)) - { - nErrorLevel = 1; - goto cleanup; - } - - /* read the parameters */ - if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) - { - nErrorLevel = 1; - goto cleanup; - } - - /* default to current directory */ - if(entries == 0) { - if(!add_entry(&entries, &params, _T("*"))) { - nErrorLevel = 1; - goto cleanup; - } - } - - prev_volume[0] = _T('\0'); - - /* Reset paging state */ - if (stFlags.bPause) - ConOutPrintfPaging(TRUE, _T("")); - - for(loop = 0; loop < (UINT)entries; loop++) - { - if (CheckCtrlBreak(BREAK_INPUT)) - { - nErrorLevel = 1; - goto cleanup; - } - - recurse_dir_cnt = 0L; - recurse_file_cnt = 0L; - recurse_bytes = 0; - - /* <Debug :> - Uncomment this to show the final state of switch flags*/ - { - int i; - TRACE("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); - TRACE("(B) Bare format : %i\n", stFlags.bBareFormat ); - TRACE("(C) Thousand : %i\n", stFlags.bTSeperator ); - TRACE("(W) Wide list : %i\n", stFlags.bWideList ); - TRACE("(D) Wide list sort by column : %i\n", stFlags.bWideListColSort ); - TRACE("(L) Lowercase : %i\n", stFlags.bLowerCase ); - TRACE("(N) New : %i\n", stFlags.bNewLongList ); - TRACE("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount ); - for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) - TRACE(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); - TRACE("(P) Pause : %i\n", stFlags.bPause ); - TRACE("(Q) Owner : %i\n", stFlags.bUser ); - TRACE("(S) Recursive : %i\n", stFlags.bRecursive ); - TRACE("(T) Time field : %i\n", stFlags.stTimeField.eTimeField ); - TRACE("(X) Short names : %i\n", stFlags.bShortName ); - TRACE("Parameter : %s\n", debugstr_aw(params[loop]) ); - } - - /* Print the drive header if the volume changed */ - ChangedVolume = TRUE; - - if (!stFlags.bBareFormat && - GetVolumePathName(params[loop], path, sizeof(path) / sizeof(TCHAR))) - { - if (!_tcscmp(path, prev_volume)) - ChangedVolume = FALSE; - else - _tcscpy(prev_volume, path); - } - else if (GetFullPathName(params[loop], sizeof(path) / sizeof(TCHAR), path, &pszFilePart) != 0) - { - if (pszFilePart != NULL) - *pszFilePart = _T('\0'); - } - else - _tcscpy(path, params[loop]); - - if (ChangedVolume && !stFlags.bBareFormat) { - if (!PrintDirectoryHeader (params[loop], &stFlags)) { - nErrorLevel = 1; - goto cleanup; - } - } - - /* do the actual dir */ - if (DirList (params[loop], &stFlags)) - { - nErrorLevel = 1; - goto cleanup; - } - - /* print the footer */ - PrintSummary(path, - recurse_file_cnt, - recurse_dir_cnt, - recurse_bytes, - &stFlags, - TRUE); - } - - ret = 0; + TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ + TCHAR path[MAX_PATH]; + TCHAR prev_volume[MAX_PATH]; + LPTSTR* params = NULL; + LPTSTR pszFilePart; + INT entries = 0; + UINT loop = 0; + DIRSWITCHFLAGS stFlags; + INT ret = 1; + BOOL ChangedVolume; + + /* Initialize Switch Flags < Default switches are setted here!> */ + stFlags.b4Digit = TRUE; + stFlags.bBareFormat = FALSE; + stFlags.bLowerCase = FALSE; + stFlags.bNewLongList = TRUE; + stFlags.bPause = FALSE; + stFlags.bRecursive = FALSE; + stFlags.bShortName = FALSE; + stFlags.bTSeperator = TRUE; + stFlags.bUser = FALSE; + stFlags.bWideList = FALSE; + stFlags.bWideListColSort = FALSE; + stFlags.stTimeField.eTimeField = TF_MODIFIEDDATE; + stFlags.stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; + stFlags.stAttribs.dwAttribVal = 0L; + stFlags.stOrderBy.sCriteriaCount = 0; + + nErrorLevel = 0; + + /* read the parameters from the DIRCMD environment variable */ + if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) + { + if (!DirReadParam(dircmd, &params, &entries, &stFlags)) + { + nErrorLevel = 1; + goto cleanup; + } + } + + /* read the parameters */ + if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) + { + nErrorLevel = 1; + goto cleanup; + } + + /* default to current directory */ + if (entries == 0) + { + if (!add_entry(&entries, &params, _T("*"))) + { + nErrorLevel = 1; + goto cleanup; + } + } + + prev_volume[0] = _T('\0'); + + /* Reset paging state */ + if (stFlags.bPause) + ConOutPrintfPaging(TRUE, _T("")); + + for(loop = 0; loop < (UINT)entries; loop++) + { + if (CheckCtrlBreak(BREAK_INPUT)) + { + nErrorLevel = 1; + goto cleanup; + } + + recurse_dir_cnt = 0L; + recurse_file_cnt = 0L; + recurse_bytes = 0; + + /* <Debug :> + Uncomment this to show the final state of switch flags*/ + { + int i; + TRACE("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); + TRACE("(B) Bare format : %i\n", stFlags.bBareFormat ); + TRACE("(C) Thousand : %i\n", stFlags.bTSeperator ); + TRACE("(W) Wide list : %i\n", stFlags.bWideList ); + TRACE("(D) Wide list sort by column : %i\n", stFlags.bWideListColSort ); + TRACE("(L) Lowercase : %i\n", stFlags.bLowerCase ); + TRACE("(N) New : %i\n", stFlags.bNewLongList ); + TRACE("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount ); + for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) + TRACE(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); + TRACE("(P) Pause : %i\n", stFlags.bPause ); + TRACE("(Q) Owner : %i\n", stFlags.bUser ); + TRACE("(S) Recursive : %i\n", stFlags.bRecursive ); + TRACE("(T) Time field : %i\n", stFlags.stTimeField.eTimeField ); + TRACE("(X) Short names : %i\n", stFlags.bShortName ); + TRACE("Parameter : %s\n", debugstr_aw(params[loop]) ); + } + + /* Print the drive header if the volume changed */ + ChangedVolume = TRUE; + + if (!stFlags.bBareFormat && + GetVolumePathName(params[loop], path, sizeof(path) / sizeof(TCHAR))) + { + if (!_tcscmp(path, prev_volume)) + ChangedVolume = FALSE; + else + _tcscpy(prev_volume, path); + } + else if (GetFullPathName(params[loop], sizeof(path) / sizeof(TCHAR), path, &pszFilePart) != 0) + { + if (pszFilePart != NULL) + *pszFilePart = _T('\0'); + } + else + { + _tcscpy(path, params[loop]); + } + + if (ChangedVolume && !stFlags.bBareFormat) + { + if (!PrintDirectoryHeader (params[loop], &stFlags)) + { + nErrorLevel = 1; + goto cleanup; + } + } + + /* do the actual dir */ + if (DirList (params[loop], &stFlags)) + { + nErrorLevel = 1; + goto cleanup; + } + + /* print the footer */ + PrintSummary(path, + recurse_file_cnt, + recurse_dir_cnt, + recurse_bytes, + &stFlags, + TRUE); + } + + ret = 0; cleanup: - freep(params); - - return ret; + freep(params); + + return ret; } #endif

1 0

[dreimer] 59384: Oops, mea culpa. Fix Link
by dreimer＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: dreimer Date: Sun Jun 30 12:35:54 2013 New Revision: 59384 URL: http://svn.reactos.org/svn/reactos?rev=59384&view=rev Log: Oops, mea culpa. Fix Link Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Sun Jun 30 12:35:54 2013 @@ -8,7 +8,7 @@ Size = 21.88MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://get.videolan.org/vlc/2.0.7/win32/vlc-2.0.7-win32.exe +URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.0.7/win32/vlc-2.0.7-win32.exe CDPath = none [Section.0407]

1 0

[hbelusca] 59383: [CMD] Fix whitespace (part 4/x) (convert tabs into 4-space indent).
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 12:27:18 2013 New Revision: 59383 URL: http://svn.reactos.org/svn/reactos?rev=59383&view=rev Log: [CMD] Fix whitespace (part 4/x) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/history.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/mklink.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/parser.c trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/set.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=5… Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… Modified: trunk/reactos/base/shell/cmd/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/history.c?r… Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… Modified: trunk/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/mklink.c?re… Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=5… Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=5…

1 0

[dreimer] 59382: Updated rapps database and added Lazarus IDE. CORE-6914 #resolve #comment Added to Rapps. Thx
by dreimer＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: dreimer Date: Sun Jun 30 12:24:34 2013 New Revision: 59382 URL: http://svn.reactos.org/svn/reactos?rev=59382&view=rev Log: Updated rapps database and added Lazarus IDE. CORE-6914 #resolve #comment Added to Rapps. Thx Added: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/npp.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = 7-Zip -Version = 9.25 +Version = 9.30a Licence = LGPL Description = Utility to create and open 7zip, zip, tar, rar and other archive files. -Size = 1.03MB +Size = 1.1MB Category = 12 URLSite = http://www.7-zip.org/ -URLDownload = http://dl.7-zip.org/7z925.exe +URLDownload = http://dl.7-zip.org/7z930.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,10 +2,10 @@ [Section] Name = Abyss Web server X1 -Version = 2.8 +Version = 2.9 Licence = Freeware Description = Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle. -Size = 1.94MB +Size = 2.1MB Category = 5 URLSite = http://www.aprelium.com/ URLDownload = http://www.aprelium.com/data/abwsx1.exe Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = Double Commander -Version = 0.5.4 +Version = 0.5.5 Licence = GPL Description = Double Commander is an open source file manager with two panels side by side. You need 7-Zip or a similar Utility to extract it. -Size = 6.5MB +Size = 7.5MB Category = 12 URLSite = http://doublecmd.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%… +URLDownload = http://freefr.dl.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = Fox Audio Player -Version = 0.9.2 +Version = 0.10.0 Licence = GPL Description = Simple and lightweight audio player. -Size = 1.86MB +Size = 1.89MB Category = 1 URLSite = http://foxaudioplayer.sourceforge.net/ -URLDownload = http://svn.reactos.org/packages/fap-0.9.2-win32-bin.exe +URLDownload = http://svn.reactos.org/packages/fap-0.10.0-win32-bin.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Lecteur audio simple et lÃ©ger. -Size = 1,86 Mo +Size = 1,89 Mo [Section.0410] Description = Un semplice e leggero lettore audio. @@ -32,7 +32,7 @@ [Section.0418] Description = Un lector audio simplu Èi uÈor. -Size = 1,86 Mo +Size = 1,89 Mo [Section.0422] Description = ÐÑÐ¾ÑÑÐ¸Ð¹ ÑÐ° Ð¼Ð°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ Ð°ÑÐ´ÑÐ¾ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -1,78 +1,78 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Firefox 21 -Version = 21.0 +Name = Mozilla Firefox 22 +Version = 22.0 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 20.3MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/en-US/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/en-US/Fi… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 20.17MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/de/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/de/Firef… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 20.13MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/es-ES/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/es-ES/Fi… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 20,46 Mo URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/fr/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/fr/Firef… [Section.0410] Description = Il piÃ¹ popolare e uno dei migliori web browser gratuiti. Size = 20.1MB URLSite = http://www.mozilla-europe.org/it/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/it/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/it/Firef… [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. Size = 20.82MB URLSite = http://www.mozilla-europe.org/nl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/nl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/nl/Firef… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 20.18MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/nb-NO/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/nb-NO/Fi… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 21.03MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/pl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/pl/Firef… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. Size = 20,65 Mo URLSite = http://www.mozilla-europe.org/ro/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/ro/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/ro/Firef… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 20.59MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/ru/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/ru/Firef… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 20.84MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/sk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/sk/Firef… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 20.6MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/21.0/win32/uk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/uk/Firef… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = FreeBASIC -Version = 0.24.0 +Version = 0.90.0 Licence = GPL/LGPL Description = Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC. -Size = 8.65MB +Size = 7.3MB Category = 7 URLSite = http://www.freebasic.net/ -URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC… +URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC… CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Compilateur BASIC open source. La syntaxe du BASIC est compatible avec le QBASIC. -Size = 8,65 Mo +Size = 7,3 Mo [Section.0410] Description = Compilatore BASIC open source. La sintassi del BASIC Ã¨ compatibile con il QBASIC. @@ -29,7 +29,7 @@ [Section.0419] Description = Compilator (open-source) BASIC. Sintaxa BASIC este compatibilÄ cu QBASIC. -Size = 8,65 Mo +Size = 7,3 Mo [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ¾Ð¼Ð¿ÑÐ»ÑÑÐ¾Ñ BASIC. Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ ÑÑÐ¼ÑÑÐ½Ð¸Ð¹ Ð· QBASIC. Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = IrfanView -Version = 4.35 +Version = 4.36 Licence = Freeware (for personal use) Description = Viewer for all kinds of graphics/audio files/video files. -Size = 1.57MB +Size = 1.77MB Category = 3 URLSite = http://www.irfanview.com/ -URLDownload = http://irfanview.tuwien.ac.at/iview435_setup.exe +URLDownload = http://ring.maffin.ad.jp/archives/pc/forest/i/irfanview/10829/iview436_setu… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -8,7 +8,7 @@ Size = 9.85MB Category = 3 URLSite = http://www.irfanview.com/ -URLDownload = http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_435_setup.exe +URLDownload = http://ring.maffin.ad.jp/archives/pc/forest/i/irfanview/10830/irfanview_plu… CDPath = none [Section.0407] Added: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lazaruside.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Lazarus +Version = 1.0.10 +Licence = modified LGPL, GPL +Description = A cross-platform integrated development environment (IDE) that lets you create visual (GUI) and non-visual Object Pascal programs, and uses the Free Pascal compiler to generate your executable. +Size = 106MB +Category = 7 +URLSite = http://www.lazarus.freepascal.org/ +URLDownload = http://garr.dl.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bit… +CDPath = none + +[Section.0407] +Description = Eine plattformunabhÃ¤ngige, integrierte Entwicklungsumgebung (IDE), mit der man grafische (GUI) und nicht-grafische Pascal-Programme erstellen kann. Es verwendet den Free Pascal Compiler um die Programme zu erzeugen. Propchange: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 4.0.3 +Version = 4.0.4 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. Size = 182.5MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.0.3/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.0.4/win/x86/Lib… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.10.13 +Version = 0.10.14 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 2.81MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.13-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.14-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = Media Player Classic Home Cinema -Version = 1.6.7.7114 +Version = 1.6.8 Licence = GPL Description = A media player. Size = 7.08MB Category = 1 URLSite = http://mpc-hc.sourceforge.net/ -URLDownload = http://garr.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/… +URLDownload = http://garr.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = Notepad++ -Version = 6.3.3 +Version = 6.4.1 Licence = GPL Description = A text editor. -Size = 6.7MB +Size = 7.1MB Category = 6 URLSite = http://notepad-plus-plus.org/ -URLDownload = http://download.tuxfamily.org/notepadplus/6.3.3/npp.6.3.3.Installer.exe +URLDownload = http://download.tuxfamily.org/notepadplus/6.4.1/npp.6.4.1.Installer.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Un Ã©diteur de texte. -Size = 6,7 Mo +Size = 7,1 Mo [Section.0410] Description = Un editor di testo. @@ -32,7 +32,7 @@ [Section.0418] Description = A text editor. -Size = 6,7 Mo +Size = 7,1 Mo [Section.0419] Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = OpenTTD -Version = 1.3.0 +Version = 1.3.1 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. -Size = 4.74MB +Size = 4.9MB Category = 4 URLSite = http://www.openttd.org/ -URLDownload = http://binaries.openttd.org/releases/1.3.0/openttd-1.3.0-windows-win32.exe +URLDownload = http://binaries.openttd.org/releases/1.3.1/openttd-1.3.1-windows-win32.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Clone open source du moteur de jeu "Transport Tycoon Deluxe". Vous aurez besoin d'une copie de Transport Tycoon. -Size = 4,74 Mo +Size = 4,9 Mo [Section.0410] Description = Clone open source del motore di gioco di "Transport Tycoon Deluxe". Hai bisogno di una copia di Transport Tycoon. @@ -32,7 +32,7 @@ [Section.0418] Description = Clona (open-source a) motorului de joc "Transport Tycoon Deluxe". Este necesarÄ o copie a jocului Transport Tycoon. -Size = 4,74 Mo +Size = 4,9 Mo [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ»Ð¾Ð½ Ð´Ð²Ð¸Ð³ÑÐ½Ð° Ð³ÑÐ¸ "Transport Tycoon Deluxe". ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±Ð½Ð° ÐºÐ¾Ð¿ÑÑ Ð³ÑÐ¸ Transport Tycoon. Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 3.3.2 +Version = 3.3.3 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. -Size = 700kB +Size = 702kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.3.2/Sc332.exe +URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.3.3/Sc333.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = SciTE est un Ã©diteur de texte basÃ© sur SCIntilla. Originelement rÃ©alisÃ© pour montrer Scintilla, il a Ã©voluÃ© pour devenir un Ã©diteur gÃ©nÃ©ralement utile avec des options pour compiler et lancer des programmes. -Size = 700 ko +Size = 702 ko [Section.0410] Description = SciTE Ã¨ un editor di testo basato scintilla. Originariamente costruito per dimostrare Scintilla, Ã¨ cresciuto fino a essere un editor generalmente utile con strutture per la creazione e l'esecuzione di programmi. @@ -33,7 +33,7 @@ [Section.0418] Licence = GratuitÄ Description = SciTE este un editor de text bazat pe SCIntilla. Construit iniÈial pentru a demonstra Scintilla, a crescut ulterior Ã®ntr-un editor de uz general cu funcÈionalitÄÈi de compilare Èi execuÈie a programelor. -Size = 700 ko +Size = 702 ko [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = ScummVM -Version = 1.5.0 +Version = 1.6.0 Licence = GPL Description = Sam and Max, Day of the Tentacle, etc on ReactOS. Size = 6.28MB Category = 4 URLSite = http://scummvm.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/scummvm/scummvm/1.5.0/scummvm-1.5.… +URLDownload = http://heanet.dl.sourceforge.net/project/scummvm/scummvm/1.6.0/scummvm-1.6.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,65 +2,65 @@ [Section] Name = Mozilla Thunderbird 17 -Version = 17.0.6 +Version = 17.0.7 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 18.91MB Category = 5 URLSite = http://www.mozilla.org/en/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/en… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 18.77MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/de… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 18.73MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/es… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/es… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 19,06 Mo URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/fr… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/fr… [Section.0410] Description = Il piÃ¹ popolare e il migliore Clients mail gratuito. Size = 18.7MB URLSite = http://www.mozilla-europe.org/it/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/it… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/it… [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. Size = 19.28MB URLSite = http://www.mozilla-europe.org/nl/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/nl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/nl… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 19.62MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/pl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/pl… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. Size = 19,28 Mo URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/ro… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/ro… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 19.19MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/ru… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/ru… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 19.21MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.6/win32/uk… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/uk… Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Sun Jun 30 12:24:34 2013 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 2.0.6 +Version = 2.0.7 Licence = GPL Description = A media player. Size = 21.88MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://garr.dl.sourceforge.net/project/vlc/2.0.6/win32/vlc-2.0.6-win32.exe +URLDownload = http://get.videolan.org/vlc/2.0.7/win32/vlc-2.0.7-win32.exe CDPath = none [Section.0407]

1 0

[tfaber] 59381: [CMAKE] - Fix MSVC version detection in configure.cmd CORE-7337 #comment VS12 is not supported by CMake yet. With r59381, configure should at least give you a proper error message.
by tfaber＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: tfaber Date: Sun Jun 30 08:28:05 2013 New Revision: 59381 URL: http://svn.reactos.org/svn/reactos?rev=59381&view=rev Log: [CMAKE] - Fix MSVC version detection in configure.cmd CORE-7337 #comment VS12 is not supported by CMake yet. With r59381, configure should at least give you a proper error message. Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59381&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jun 30 08:28:05 2013 @@ -57,10 +57,10 @@ cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 - cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9 - cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 - cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11 + cl 2>&1 | find " 14." > NUL && set BUILD_ENVIRONMENT=VS8 + cl 2>&1 | find " 15." > NUL && set BUILD_ENVIRONMENT=VS9 + cl 2>&1 | find " 16." > NUL && set BUILD_ENVIRONMENT=VS10 + cl 2>&1 | find " 17." > NUL && set BUILD_ENVIRONMENT=VS11 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. exit /b

1 0

[tfaber] 59380: [EXPLORER] - Don't intentionally break on MSVC. I'm too lazy to change all of these to __REACTOS__, and it's a hack anyway... CORE-7335
by tfaber＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: tfaber Date: Sun Jun 30 05:49:53 2013 New Revision: 59380 URL: http://svn.reactos.org/svn/reactos?rev=59380&view=rev Log: [EXPLORER] - Don't intentionally break on MSVC. I'm too lazy to change all of these to __REACTOS__, and it's a hack anyway... CORE-7335 Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sun Jun 30 05:49:53 2013 @@ -5,6 +5,7 @@ add_definitions( -DWIN32 + -D__MINGW32__ -D__WINDRES__) #add_pch(explorer precomp.h)

1 0

[hbelusca] 59379: [CMD] Fix whitespace (part 3/x) (convert tabs into 4-space indent).
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 00:08:43 2013 New Revision: 59379 URL: http://svn.reactos.org/svn/reactos?rev=59379&view=rev Log: [CMD] Fix whitespace (part 3/x) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/alias.c trunk/reactos/base/shell/cmd/assoc.c trunk/reactos/base/shell/cmd/attrib.c trunk/reactos/base/shell/cmd/beep.c trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/chcp.c trunk/reactos/base/shell/cmd/choice.c trunk/reactos/base/shell/cmd/cls.c trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/color.c trunk/reactos/base/shell/cmd/delay.c trunk/reactos/base/shell/cmd/dirstack.c trunk/reactos/base/shell/cmd/echo.c trunk/reactos/base/shell/cmd/error.c trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/free.c trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/label.c trunk/reactos/base/shell/cmd/locale.c trunk/reactos/base/shell/cmd/memory.c trunk/reactos/base/shell/cmd/msgbox.c trunk/reactos/base/shell/cmd/parser.c trunk/reactos/base/shell/cmd/path.c trunk/reactos/base/shell/cmd/pause.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/alias.c?rev… Modified: trunk/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/assoc.c?rev… Modified: trunk/reactos/base/shell/cmd/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/attrib.c?re… Modified: trunk/reactos/base/shell/cmd/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/beep.c?rev=… Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… Modified: trunk/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=… Modified: trunk/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/choice.c?re… Modified: trunk/reactos/base/shell/cmd/cls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cls.c?rev=5… Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… Modified: trunk/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/color.c?rev… Modified: trunk/reactos/base/shell/cmd/delay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/delay.c?rev… Modified: trunk/reactos/base/shell/cmd/dirstack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dirstack.c?… Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=5… Modified: trunk/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/free.c?rev=… Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=59… Modified: trunk/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/label.c?rev… Modified: trunk/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/locale.c?re… Modified: trunk/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/memory.c?re… Modified: trunk/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/msgbox.c?re… Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… Modified: trunk/reactos/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/path.c?rev=… Modified: trunk/reactos/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/pause.c?rev…

1 0

[hbelusca] 59378: [CMD] Fix whitespace (part 2/x) (convert tabs into 4-space indent).
by hbelusca＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: hbelusca Date: Sat Jun 29 23:50:13 2013 New Revision: 59378 URL: http://svn.reactos.org/svn/reactos?rev=59378&view=rev Log: [CMD] Fix whitespace (part 2/x) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/prompt.c trunk/reactos/base/shell/cmd/redir.c trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/replace.c trunk/reactos/base/shell/cmd/screen.c trunk/reactos/base/shell/cmd/set.c trunk/reactos/base/shell/cmd/setlocal.c trunk/reactos/base/shell/cmd/shift.c trunk/reactos/base/shell/cmd/start.c trunk/reactos/base/shell/cmd/strtoclr.c trunk/reactos/base/shell/cmd/time.c trunk/reactos/base/shell/cmd/timer.c trunk/reactos/base/shell/cmd/title.c trunk/reactos/base/shell/cmd/type.c trunk/reactos/base/shell/cmd/ver.c trunk/reactos/base/shell/cmd/verify.c trunk/reactos/base/shell/cmd/vol.c trunk/reactos/base/shell/cmd/where.c trunk/reactos/base/shell/cmd/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=5… Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… Modified: trunk/reactos/base/shell/cmd/redir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/redir.c?rev… Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=5… Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… Modified: trunk/reactos/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/screen.c?re… Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=5… Modified: trunk/reactos/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/setlocal.c?… Modified: trunk/reactos/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/shift.c?rev… Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… Modified: trunk/reactos/base/shell/cmd/strtoclr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/strtoclr.c?… Modified: trunk/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/time.c?rev=… Modified: trunk/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/timer.c?rev… Modified: trunk/reactos/base/shell/cmd/title.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/title.c?rev… Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=5… Modified: trunk/reactos/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/verify.c?re… Modified: trunk/reactos/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/vol.c?rev=5… Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… Modified: trunk/reactos/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/window.c?re…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs