Synchronize with trunk.

[reactos.git] / base / shell / cmd / goto.c

diff --git a/base/shell/cmd/goto.c b/base/shell/cmd/goto.c
index 0e90449..99a04cb 100644 (file)
--- a/base/shell/cmd/goto.c
+++ b/base/shell/cmd/goto.c
@@ -22,8 +22,8 @@
  *    27-Jan-1999 (Eric Kohl)
  *        Added help text ("/?").
  *
- *    28-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
- *        Remove all hardcode string to En.rc
+ *    28-Apr-2005 (Magnus Olsen <magnus@greatlord.com>)
+ *        Remove all hardcoded strings in En.rc
  */
 
 #include "precomp.h"
@@ -38,82 +38,82 @@
 
 INT cmd_goto (LPTSTR param)
 {
-       LPTSTR tmp, tmp2;
-
-       TRACE ("cmd_goto (\'%s\')\n", debugstr_aw(param));
-
-       if (!_tcsncmp (param, _T("/?"), 2))
-       {
-               ConOutResPaging(TRUE,STRING_GOTO_HELP1);
-               return 0;
-       }
-
-       /* if not in batch -- error!! */
-       if (bc == NULL)
-       {
-               return 1;
-       }
-
-       if (*param == _T('\0'))
-       {
-               ConErrResPrintf(STRING_GOTO_ERROR1);
-               ExitBatch();
-               return 1;
-       }
-
-       /* terminate label at first space char */
-       tmp = param+1;
-       while (!_istcntrl (*tmp) && !_istspace (*tmp) &&  (*tmp != _T(':')))
-               tmp++;
-       *(tmp) = _T('\0');
-
-       /* jump to end of the file */
-       if ( _tcsicmp( param, _T(":eof"))==0)
-       {
-               bc->mempos=bc->memsize;         /* position at the end of the batchfile */
-               return 0;
-       }
-
-       /* jump to begin of the file */
-       bc->mempos=0;
-
-       while (BatchGetString (textline, sizeof(textline) / sizeof(textline[0])))
-       {
-               int pos;
-               INT_PTR size;
-
-               /* Strip out any trailing spaces or control chars */
-               tmp = textline + _tcslen (textline) - 1;
-
-               while (_istcntrl (*tmp) || _istspace (*tmp) ||  (*tmp == _T(':')))
-                       tmp--;
-               *(tmp + 1) = _T('\0');
-
-               /* Then leading spaces... */
-               tmp = textline;
-               while (_istspace (*tmp))
-                       tmp++;
-
-               /* All space after leading space terminate the string */
-               size = _tcslen(tmp) -1;
-               pos=0;
-               while (tmp+pos < tmp+size)
-               {
-                       if (_istspace(tmp[pos]))
-                               tmp[pos]=_T('\0');
-                       pos++;
-               }
-
-               tmp2 = param;
-               /* use whole label name */
-               if ((*tmp == _T(':')) && ((_tcsicmp (++tmp, param) == 0) || (_tcsicmp (tmp, ++tmp2) == 0)))
-                       return 0;
-
-       }
-
-       ConErrResPrintf(STRING_GOTO_ERROR2, param);
-       ExitBatch();
-       return 1;
+    LPTSTR tmp, tmp2;
+
+    TRACE ("cmd_goto (\'%s\')\n", debugstr_aw(param));
+
+    if (!_tcsncmp (param, _T("/?"), 2))
+    {
+        ConOutResPaging(TRUE,STRING_GOTO_HELP1);
+        return 0;
+    }
+
+    /* if not in batch -- error!! */
+    if (bc == NULL)
+    {
+        return 1;
+    }
+
+    if (*param == _T('\0'))
+    {
+        ConErrResPrintf(STRING_GOTO_ERROR1);
+        ExitBatch();
+        return 1;
+    }
+
+    /* terminate label at first space char */
+    tmp = param+1;
+    while (!_istcntrl (*tmp) && !_istspace (*tmp) &&  (*tmp != _T(':')))
+        tmp++;
+    *(tmp) = _T('\0');
+
+    /* jump to end of the file */
+    if ( _tcsicmp( param, _T(":eof"))==0)
+    {
+        bc->mempos=bc->memsize;                /* position at the end of the batchfile */
+        return 0;
+    }
+
+    /* jump to begin of the file */
+    bc->mempos=0;
+
+    while (BatchGetString (textline, sizeof(textline) / sizeof(textline[0])))
+    {
+        int pos;
+        INT_PTR size;
+
+        /* Strip out any trailing spaces or control chars */
+        tmp = textline + _tcslen (textline) - 1;
+
+        while (_istcntrl (*tmp) || _istspace (*tmp) ||  (*tmp == _T(':')))
+            tmp--;
+        *(tmp + 1) = _T('\0');
+
+        /* Then leading spaces... */
+        tmp = textline;
+        while (_istspace (*tmp))
+            tmp++;
+
+        /* All space after leading space terminate the string */
+        size = _tcslen(tmp) -1;
+        pos=0;
+        while (tmp+pos < tmp+size)
+        {
+            if (_istspace(tmp[pos]))
+                tmp[pos]=_T('\0');
+            pos++;
+        }
+
+        tmp2 = param;
+        /* use whole label name */
+        if ((*tmp == _T(':')) && ((_tcsicmp (++tmp, param) == 0) || (_tcsicmp (tmp, ++tmp2) == 0)))
+            return 0;
+
+    }
+
+    ConErrResPrintf(STRING_GOTO_ERROR2, param);
+    ExitBatch();
+    return 1;
 }
 
 /* EOF */