Ticket #1870: expanderHang.diff

src/apps/expander/ExpanderRules.cpp

@@ -45 +45 @@
     fList.AddItem(new ExpanderRule("application/x-tar",             ".tar",     "tar -tvf %s",                  "tar -xf %s"));
     fList.AddItem(new ExpanderRule("application/x-gzip",            ".gz",      "echo %s | sed 's/.gz$//g'",    "gunzip %s"));
     fList.AddItem(new ExpanderRule("application/x-bzip2",           ".bz2",     "echo %s | sed 's/.bz2$//g'",   "bunzip2 %s"));
-    fList.AddItem(new ExpanderRule("application/zip",               ".zip",     "unzip -l %s",                  "unzip -o %s"));
-    fList.AddItem(new ExpanderRule("application/x-zip-compressed",  ".zip",     "unzip -l %s",                  "unzip -o %s"));
+    //echo n sends an no to the question write error (disk full?).  Continue? (y/n/^C)
+    fList.AddItem(new ExpanderRule("application/zip",               ".zip",     "unzip -l %s",                  "echo n|unzip -o %s"));
+    fList.AddItem(new ExpanderRule("application/x-zip-compressed",  ".zip",     "unzip -l %s",                  "echo n|unzip -o %s"));
     fList.AddItem(new ExpanderRule("application/x-rar",             ".rar",     "unrar v %s",                   "unrar x -y %s"));
 
     BFile file;