Fix bug that prevented changing drives with a:

Fix to bug report #5 ( #5
). Both `a:` and `cd /d a:` are made functional again. There is however
no support of short paths such a `c:` to refer to the current directory
of drive C.

Author: darkbatcher

libpbat/file/pBat_Win32File.c

@@ -102,6 +102,7 @@ int pBat_DirExists(const char *ptrName)
     wchar_t* name;
     size_t conv;
 
+
     if ((name = (wchar_t*) libcu8_xconvert(LIBCU8_TO_U16, ptrName,
                 strlen(ptrName)+1, &conv)) == NULL)
         return 0;

libpbat/libpBat.h

@@ -399,7 +399,7 @@ LIBPBAT void            pBat_GetMousePos(FILE* f, char on_move, CONSOLECOORD* co
 #define PBAT_TEST_SEPARATOR(p) (*(p) == '/' || *(p) == '\\')
 #define PBAT_TEST_UNC_PATH(p)  (*(p) == '\\' && *(p+1) == '\\')
 #define PBAT_TEST_ROOT_PATH(p) (PBAT_TEST_SEPARATOR(p) && !PBAT_TEST_SEPARATOR(p+1))
-#define PBAT_TEST_DRIVE_PATH(p) (*(p) && *(p+1)==':' && PBAT_TEST_SEPARATOR(p+2))
+#define PBAT_TEST_DRIVE_PATH(p) (*(p) && *(p+1)==':' && (!*(p+2) || PBAT_TEST_SEPARATOR(p+2)))
 #define PBAT_TEST_ABSOLUTE_PATH(p) (PBAT_TEST_UNC_PATH(p) || PBAT_TEST_ROOT_PATH(p) \
                                 || PBAT_TEST_DRIVE_PATH(p))
 #define PBAT_DEF_DELIMITER "\\"

pbat/command/pBat_Cd.c

@@ -76,7 +76,7 @@ int __inline__ pBat_Canonicalize(char* path)
     /* If the path is UNC, just skip the very first part */
     if (PBAT_TEST_UNC_PATH(path)) {
         path += 2;
-	    
+
 	while (*path && !PBAT_TEST_SEPARATOR(path))
 		path ++;
 
@@ -171,8 +171,9 @@ int pBat_SetCurrentDir(char* lpLine)
         if (*lpLine == '/') {
 
             /* well, arguably lpCurrentDir[2] is a slash ...
-               unless lpCurrentDir refers to a unc path, but this
-               is not handled yet */
+               unless lpCurrentDir refers to a unc path
+               which is still unsupported  */
+
             strncpy(lpCurrentDir + 2, lpLine, FILENAME_MAX-2);
             lpCurrentDir[FILENAME_MAX-1] = '\0';
 
@@ -402,40 +403,30 @@ int pBat_CmdCd_win(char* lpLine)
 
         if (*pBat_SkipBlanks(lpLine+2) == '\0') {
 
-            /* only got a drive name */
-            varname[1] = *lpLine;
-
-            if (!(lpNext = pBat_GetEnv(lpeEnv, varname))) {
-
-                lpNext = lpLine;
+            /* If the only  argument is a drive letter eg `x:` do the following
+               steps :
+                    - check if `=x:` variable exists, if so change current directory to it
+                    - if no change directory to x:\ and set `=x:` accordingly */
 
-            }
+            force = TRUE;
 
-            if (pBat_SetCurrentDir(lpNext)) {
+            varname[1] = *lpLine;
 
-                pBat_ShowErrorMessage(PBAT_DIRECTORY_ERROR
-                                        | PBAT_PRINT_C_ERROR,
-                                      lpNext,
-                                      FALSE
-                                      );
+            if (!(lpLine = pBat_GetEnv(lpeEnv, varname))) {
 
-                status = PBAT_DIRECTORY_ERROR;
+                /* append a slash so this becomes a valid path */
+                lpLine = pBat_SkipBlanks(lpesStr->str);
 
             }
-
-            goto end;
-
         }
 
-
-        /* get current curent directory disk */
         passed = *lpLine;
 
     }
 
     if ((passed == 0)
         || (toupper(passed) == toupper(current))
-        || (force == TRUE)) {
+        || force) {
 
         /* change the current directory, yeah */
 
@@ -454,8 +445,7 @@ int pBat_CmdCd_win(char* lpLine)
     }
 
     varname[1] = (passed == 0) ? (current) : (passed);
-
-    pBat_SetEnv(lpeEnv, varname, lpLine);
+    pBat_SetEnv(lpeEnv, varname, (passed == 0) ? lpCurrentDir : lpLine);
 
 end:
     pBat_EsFree_Cached(lpesStr);

pbat/core/pBat_Globals.c

@@ -27,6 +27,9 @@ char* lpInitVar[]= {
 	"PBAT_VERSION", PBAT_VERSION,
 	"PBAT_OS", PBAT_OS,
 	NULL, NULL, /* PBAT_PATH is dinamically generated */
+#ifdef WIN32
+	NULL, NULL, /* used to initialize the %=x:% variable based on the current path*/
+#endif
     "PBAT_OS_TYPE", PBAT_OS_TYPE,
     "PBAT_START_SCRIPT", START_SCRIPT,
     "PROMPT","$P$G",

pbat/core/pBat_Run.c

@@ -132,7 +132,8 @@ int pBat_ExecOperators(PARSED_LINE** lpLine)
 
 
     /* If we get to this, it is because the first command of the
-       pipe sequence has not be executed, so skip*/
+       pipe sequence has not been executed, so skip
+       eg. a || b | c and a fails.*/
 	case PARSED_STREAM_NODE_PIPE:
         status |= EXECOPERATORS_SKIP;
 
@@ -229,7 +230,7 @@ void pBat_LaunchPipe(struct pipe_launch_data_t* infos)
 
        as this function executes the left hand side of a pipe.
 
-       */
+    */
     pBat_ExecOutput(infos->stream);
 
     pBat_RunCommand(infos->str, NULL);
@@ -328,6 +329,7 @@ void pBat_RunParsedLine(PARSED_LINE* line)
 	int lock, ok;
 	char *pch;
 
+	/* loop though operators */
 	do {
 
 		lock = pBat_GetStreamStackLockState(lppsStreamStack);

pbat/init/pBat_Init.c

@@ -179,12 +179,20 @@ void pBat_Init(void)
        Example if LC_NUMERIC is french, then 1.1 becomes 1,1 */
     setlocale(LC_NUMERIC, "C");
 
-
-
     /* Set the value of %PBAT_PATH% */
     lpInitVar[4]="PBAT_PATH";
     lpInitVar[5]=lppBatPath;
 
+#ifdef WIN32
+    char drive_var[] = "=x:";
+
+    /* initialize the current %=x:% drive variable with current dir */
+    drive_var[1] = *lpCurrentDir;
+    lpInitVar[6] = drive_var;
+    lpInitVar[7] = lpCurrentDir;
+
+#endif // WIN32
+
     /* Set the default pBat vars */
     pBat_InitVar(lpInitVar);