From b067add8893a30e8ccceb15826b8508dbfd85c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 29 Jun 2013 23:18:27 +0000 Subject: [PATCH] [CMD] Fix some whitespace and misspellings (part 1/x) svn path=/trunk/; revision=59377 --- reactos/base/shell/cmd/cmd.rc | 28 ++++++++++++++-------------- reactos/base/shell/cmd/readme.txt | 4 +--- reactos/base/shell/cmd/ren.txt | 26 +++++++++++++------------- reactos/base/shell/cmd/todo.txt | 14 +++++++------- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/reactos/base/shell/cmd/cmd.rc b/reactos/base/shell/cmd/cmd.rc index cbc10e09fef..802390ee497 100644 --- a/reactos/base/shell/cmd/cmd.rc +++ b/reactos/base/shell/cmd/cmd.rc @@ -3,28 +3,28 @@ #include "resource.h" #include "cmdver.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Command Processor\0" -#define REACTOS_STR_INTERNAL_NAME "cmd\0" -#define REACTOS_STR_ORIGINAL_FILENAME "cmd.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Command Processor\0" +#define REACTOS_STR_INTERNAL_NAME "cmd\0" +#define REACTOS_STR_ORIGINAL_FILENAME "cmd.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0" #define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2006 Eric Kohl and others\0" #include STRINGTABLE DISCARDABLE BEGIN - STRING_FREEDOS_DEV, " Tim Norman Matt Rains\n\ - Evan Jeffrey Steffen Kaiser\n\ - Svante Frey Oliver Mueller\n\ - Aaron Kaufman Marc Desrochers\n\ - Rob Lake John P Price\n\ - Hans B Pufal\n" + STRING_FREEDOS_DEV, " Tim Norman Matt Rains\n\ + Evan Jeffrey Steffen Kaiser\n\ + Svante Frey Oliver Mueller\n\ + Aaron Kaufman Marc Desrochers\n\ + Rob Lake John P Price\n\ + Hans B Pufal\n" - STRING_REACTOS_DEV, " Eric Kohl Emanuele Aliberti\n\ - Paolo Pantaleo Phillip Susi\n\ - Sylvain Petreolle\n" + STRING_REACTOS_DEV, " Eric Kohl Emanuele Aliberti\n\ + Paolo Pantaleo Phillip Susi\n\ + Sylvain Petreolle\n" END -1 ICON DISCARDABLE res/terminal.ico +1 ICON DISCARDABLE res/terminal.ico #include "rsrc.rc" diff --git a/reactos/base/shell/cmd/readme.txt b/reactos/base/shell/cmd/readme.txt index 6597d357e47..9cdb5701d7e 100644 --- a/reactos/base/shell/cmd/readme.txt +++ b/reactos/base/shell/cmd/readme.txt @@ -47,9 +47,7 @@ ReactOS developers: Brandon Turner - Bugs ~~~~ -There is still many bugs ;) +There are still many bugs ;) Please report bugs to ReactOS team or to JIRA at www.reactos.org - diff --git a/reactos/base/shell/cmd/ren.txt b/reactos/base/shell/cmd/ren.txt index 3cbcec7e98a..72b1aea0d1e 100644 --- a/reactos/base/shell/cmd/ren.txt +++ b/reactos/base/shell/cmd/ren.txt @@ -47,16 +47,16 @@ dstFILE: here is stored FILE re-name(hi.txt) 2)If srcPattern contains "\" then: - -we activate bPath, since srcPattern has a path inside of it. - -we explit the srcPattern to srcFile and srcPath. - -Now we check the dstPattern żdoes it contain a Path?: - -If does: we divide it in dstPath and dstFile.AND ALSO CHECK THAT dstPath and srcPath it´s the same(see syntax error).If they aren the same we launch an error. - -If doesnt then we copy srcPath to dstPath(see #way2) and also saving dstPattern as dstFile. + -we activate bPath, since srcPattern has a path inside of it. + -we explit the srcPattern to srcFile and srcPath. + -Now we check the dstPattern żdoes it contain a Path?: + -If does: we divide it in dstPath and dstFile.AND ALSO CHECK THAT dstPath and srcPath it´s the same(see syntax error).If they aren the same we launch an error. + -If doesnt then we copy srcPath to dstPath(see #way2) and also saving dstPattern as dstFile. 3)If srcPattern doesnt contain "\" then: - -srcPattern is copied in srcFile(we dont need a previous split,because it´s just a name) - -Now we check the dstPattern żdoes it contains a Path? - -If does: we launch an error (see syntax error 2) - -If doesnt: we copy dstPattern to dstFile(we dont need a previous split because it´s just a name) + -srcPattern is copied in srcFile(we dont need a previous split,because it´s just a name) + -Now we check the dstPattern żdoes it contains a Path? + -If does: we launch an error (see syntax error 2) + -If doesnt: we copy dstPattern to dstFile(we dont need a previous split because it´s just a name) 4)Now we are entering in the do...while: @@ -74,11 +74,11 @@ If we are just renaming one file,then we dont make the while loop.The do..while 5)Now we have to check our Boolean. bPath==TRUE means that Source Argument was a Path so now we have to Join again the Path with the Name File: - -srcFINAL: srcPath+f.cFileName - -dstFINAL: dstPath+dstFile + -srcFINAL: srcPath+f.cFileName + -dstFINAL: dstPath+dstFile bPath==False then Souce wasn a Path an we dont need to join anything. - -srcFINAL:f.cFileName - -dstFINAL:dstFile + -srcFINAL:f.cFileName + -dstFINAL:dstFile At last we just make a MoveFile(srcFinal, dstFinal)): diff --git a/reactos/base/shell/cmd/todo.txt b/reactos/base/shell/cmd/todo.txt index a67a2b55a4c..f73d70591b5 100644 --- a/reactos/base/shell/cmd/todo.txt +++ b/reactos/base/shell/cmd/todo.txt @@ -1,21 +1,21 @@ Things to do ~~~~~~~~~~~~ -*Implmenet Set /P -This is pretty straight forward. When doing this make sure to take into account the way MS handles "set /A /P foo=5" compared to "set /P /A foo=5". +*Implement Set /P +This is pretty straightforward. When doing this, make sure to take into account the way MS handles "set /A /P foo=5" compared to "set /P /A foo=5". *Compile as unicode -Not sure what is wrong with it, put probably more then just one thing blocking this. For sure pipes break when it is compiled as unicode. +Not sure what is wrong with it, but probably more than just one thing blocking this. For sure pipes break when it is compiled as unicode. *Move.c code clean up -It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isn't a bug anymore. +It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isn't a bug anymore. *If rewrite -It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on. +It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on. *Remove Hardcoded buffers -This is mostly done thanks to Greatlord(cmd.c is the hardest spot that is left). ANytime when you are handling a string that is taken from the commandline there should be no limit to the size. +This is mostly done thanks to Greatlord (cmd.c is the hardest spot that is left). Anytime when you are handling a string that is taken from the commandline there should be no limit to the size. -*Implment & and && +*Implement & and && & runs two commands no matter what. && runs the 2nd command only if the first was a success Not sure where to put this code even