Jason Edmeades : cmd.exe: Support del /a[:].

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b822e73263c0f9ed3c6c8588b4dd6dc093aea27d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b822e73263c0f9ed3c6c8588b4dd6dc093aea27d

Author: Jason Edmeades <us at edmeades.me.uk>
Date:   Tue Feb 27 23:20:55 2007 +0000

cmd.exe: Support del /a[:].

---

 programs/cmd/builtins.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 1 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 6b214e1..3c93231 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -224,6 +224,12 @@ void WCMD_create_dir (void) {
  *
  * Delete a file or wildcarded set.
  *
+ * Note on /A:
+ *  - Testing shows /A is repeatable, eg. /a-r /ar matches all files
+ *  - Each set is a pattern, eg /ahr /as-r means
+ *         readonly+hidden OR nonreadonly system files
+ *  - The '-' applies to a single field, ie /a:-hr means read only
+ *         non-hidden files
  */
 
 void WCMD_delete (int recurse) {
@@ -292,9 +298,66 @@ char *p;
       else strcpy (fpath, fd.cFileName);
       if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
         BOOL  ok = TRUE;
+        char *nextA = strstr (quals, "/A");
+
+        /* Handle attribute matching (/A) */
+        if (nextA != NULL) {
+          ok = FALSE;
+          while (nextA != NULL && !ok) {
+
+            char *thisA = (nextA+2);
+            BOOL  stillOK = TRUE;
+
+            /* Skip optional : */
+            if (*thisA == ':') thisA++;
+
+            /* Parse each of the /A[:]xxx in turn */
+            while (*thisA && *thisA != '/') {
+              BOOL negate    = FALSE;
+              BOOL attribute = FALSE;
+
+              /* Match negation of attribute first */
+              if (*thisA == '-') {
+                negate=TRUE;
+                thisA++;
+              }
+
+              /* Match attribute */
+              switch (*thisA) {
+              case 'R': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY);
+                        break;
+              case 'H': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN);
+                        break;
+              case 'S': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM);
+                        break;
+              case 'A': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE);
+                        break;
+              default:
+                  WCMD_output ("Syntax error\n");
+              }
+
+              /* Now check result, keeping a running boolean about whether it
+                 matches all parsed attribues so far                         */
+              if (attribute && !negate) {
+                  stillOK = stillOK;
+              } else if (!attribute && negate) {
+                  stillOK = stillOK;
+              } else {
+                  stillOK = FALSE;
+              }
+              thisA++;
+            }
+
+            /* Save the running total as the final result */
+            ok = stillOK;
+
+            /* Step on to next /A set */
+            nextA = strstr (nextA+1, "/A");
+          }
+        }
 
         /* /P means prompt for each file */
-        if (strstr (quals, "/P") != NULL) {
+        if (ok && strstr (quals, "/P") != NULL) {
           char  question[MAXSTRING];
 
           /* Ask for confirmation */