Alexandre Julliard : cabarc: Add support for starting a new folder with a ' +' file name.

Alexandre Julliard julliard at winehq.org
Tue Feb 15 11:29:24 CST 2011


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Feb 14 17:27:29 2011 +0100

cabarc: Add support for starting a new folder with a '+' file name.

---

 programs/cabarc/cabarc.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c
index 6528d70..2d1de8a 100644
--- a/programs/cabarc/cabarc.c
+++ b/programs/cabarc/cabarc.c
@@ -549,6 +549,7 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name )
 
 static int new_cabinet( char *cab_dir )
 {
+    static const WCHAR plusW[] = {'+',0};
     WCHAR **file;
     ERF erf;
     BOOL ret = FALSE;
@@ -573,7 +574,12 @@ static int new_cabinet( char *cab_dir )
                      fci_write, fci_close, fci_lseek, fci_delete, fci_get_temp, &cab, NULL );
 
     for (file = opt_files; *file; file++)
-        if (!(ret = add_file_or_directory( fci, *file ))) break;
+    {
+        if (!strcmpW( *file, plusW ))
+            FCIFlushFolder( fci, fci_get_next_cab, fci_status );
+        else
+            if (!(ret = add_file_or_directory( fci, *file ))) break;
+    }
 
     if (ret)
     {




More information about the wine-cvs mailing list