cmd: Fix some issues with ~ modifier expansion.

programs/cmd/batch.c

@@ -430,11 +430,6 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable,
   modifierLen = lastModifier - firstModifier;
   finaloutput[0] = 0x00;
 
-  /* Useful for debugging purposes: */
-  /*printf("Modifier string '%*.*s' and variable is %c\n Param starts as '%s'\n",
-             (modifierLen), (modifierLen), firstModifier, *lastModifier,
-             outputparam);*/
-
   /* 1. Handle '~' : Strip surrounding quotes */
   if (outputparam[0]=='"' &&
       memchrW(firstModifier, '~', modifierLen) != NULL) {
@@ -477,12 +472,13 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable,
     exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard,
                                   &fileInfo);
 
-    /* 2. Handle 'a' : Output attributes */
+    /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */
-    if (exists &&
+    if (memchrW(firstModifier, 'a', modifierLen) != NULL) {
-        memchrW(firstModifier, 'a', modifierLen) != NULL) {
 
       WCHAR defaults[] = {'-','-','-','-','-','-','-','-','-','\0'};
       doneModifier = TRUE;
+
+      if (exists) {
         strcpyW(thisoutput, defaults);
         if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
           thisoutput[0]='d';
@@ -501,15 +497,17 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable,
           thisoutput[8]='l';
         strcatW(finaloutput, thisoutput);
       }
+    }
 
-    /* 3. Handle 't' : Date+time */
+    /* 3. Handle 't' : Date+time (File doesn't have to exist) */
-    if (exists &&
+    if (memchrW(firstModifier, 't', modifierLen) != NULL) {
-        memchrW(firstModifier, 't', modifierLen) != NULL) {
 
       SYSTEMTIME systime;
       int datelen;
 
       doneModifier = TRUE;
+
+      if (exists) {
         if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW);
 
         /* Format the time */
@@ -522,20 +520,22 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable,
                           NULL, (thisoutput+datelen), MAX_PATH-datelen);
         strcatW(finaloutput, thisoutput);
       }
+    }
 
-    /* 4. Handle 'z' : File length */
+    /* 4. Handle 'z' : File length (File doesn't have to exist) */
-    if (exists &&
+    if (memchrW(firstModifier, 'z', modifierLen) != NULL) {
-        memchrW(firstModifier, 'z', modifierLen) != NULL) {
       /* FIXME: Output full 64 bit size (sprintf does not support I64 here) */
       ULONG/*64*/ fullsize = /*(fileInfo.nFileSizeHigh << 32) +*/
                                   fileInfo.nFileSizeLow;
       static const WCHAR fmt[] = {'%','u','\0'};
 
       doneModifier = TRUE;
+      if (exists) {
         if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW);
         wsprintfW(thisoutput, fmt, fullsize);
         strcatW(finaloutput, thisoutput);
       }
+    }
 
     /* 4. Handle 's' : Use short paths (File doesn't have to exist) */
     if (memchrW(firstModifier, 's', modifierLen) != NULL) {
@@ -557,14 +557,18 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable,
       WCHAR fname[MAX_PATH];
       WCHAR ext[MAX_PATH];
       BOOL doneFileModifier = FALSE;
-
+      BOOL addSpace = (finaloutput[0] != 0x00);
-      if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW);
 
       /* Split into components */
       WCMD_splitpath(fullfilename, drive, dir, fname, ext);
 
       /* 5. Handle 'd' : Drive Letter */
       if (memchrW(firstModifier, 'd', modifierLen) != NULL) {
+        if (addSpace) {
+          strcatW(finaloutput, spaceW);
+          addSpace = FALSE;
+        }
+
         strcatW(finaloutput, drive);
         doneModifier = TRUE;
         doneFileModifier = TRUE;
@@ -572,6 +576,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable,
 
       /* 6. Handle 'p' : Path */
       if (memchrW(firstModifier, 'p', modifierLen) != NULL) {
+        if (addSpace) {
+          strcatW(finaloutput, spaceW);
+          addSpace = FALSE;
+        }
+
         strcatW(finaloutput, dir);
         doneModifier = TRUE;
         doneFileModifier = TRUE;
@@ -579,6 +588,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable,
 
       /* 7. Handle 'n' : Name */
       if (memchrW(firstModifier, 'n', modifierLen) != NULL) {
+        if (addSpace) {
+          strcatW(finaloutput, spaceW);
+          addSpace = FALSE;
+        }
+
         strcatW(finaloutput, fname);
         doneModifier = TRUE;
         doneFileModifier = TRUE;
@@ -586,6 +600,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable,
 
       /* 8. Handle 'x' : Ext */
       if (memchrW(firstModifier, 'x', modifierLen) != NULL) {
+        if (addSpace) {
+          strcatW(finaloutput, spaceW);
+          addSpace = FALSE;
+        }
+
         strcatW(finaloutput, ext);
         doneModifier = TRUE;
         doneFileModifier = TRUE;

programs/cmd/tests/test_builtins.cmd

@@ -347,6 +347,7 @@ rem file attribute
 for %%i in ("U V" W) do echo '%%~ai'
 echo foo> foo
 for %%i in (foo) do echo '%%~ai'
+for %%i in (foo) do echo '%%~zi'
 del foo
 rem file date/time
 rem Not fully testable, until we can grep dir's output to get foo's creation time in an envvar...

programs/cmd/tests/test_builtins.cmd.exp

@@ -303,13 +303,14 @@ N
 @todo_wine@'@drive@@shortpath@R S'@or_broken@''
 @todo_wine@'@drive@@shortpath@T'@or_broken@''
 @todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@''
-@todo_wine@''@or_broken@'%~ai'
+''@or_broken@'%~ai'
-@todo_wine@''@or_broken@'%~ai'
+''@or_broken@'%~ai'
-@todo_wine@'--a------'@or_broken@'%~ai'
+'--a------'@or_broken@'%~ai'
-@todo_wine@''@or_broken@'%~ti'
+'5'@or_broken@'%~zi'
-@todo_wine@''@or_broken@'%~ti'
+''@or_broken@'%~ti'
-@todo_wine@''@or_broken@'%~zi'
+''@or_broken@'%~ti'
-@todo_wine@''@or_broken@'%~zi'
+''@or_broken@'%~zi'
+''@or_broken@'%~zi'
 @drive@@path@
 @drive@@path@
 @drive@