--- a/Archiver.st	Tue Nov 26 10:40:25 2002 +0100
+++ b/Archiver.st	Fri Nov 29 11:43:38 2002 +0100
@@ -70,18 +70,6 @@
     ^ ZipArchive
 ! !
 
-!Archiver class methodsFor:'common options'!
-
-MinusSign
-
-    ^ $-
-!
-
-PipeSign
-
-    ^ $>
-! !
-
 !Archiver class methodsFor:'queries'!
 
 canAddFiles
@@ -299,7 +287,7 @@
          #(#compressSize    1)  
          #(#size            1) 
          #(#ratio           1) 
-         #(#fileName        1)
+         #(#fileName        #rest)
     ) 
 ! !
 
@@ -418,10 +406,10 @@
     stream := WriteStream on:''.
     stream nextPutAll:self class GZipArchivZipCommand.
     stream space.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPut:self class GZipArchivZipListOption.
     stream space.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPut:self class GZipArchivZipVerboseOption.
     stream space.
     stream nextPutAll:self fileName baseName.
@@ -475,12 +463,12 @@
     stream := WriteStream on:''.
     stream nextPutAll:self class GZipArchivZipCommand.
     stream space.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPutAll:self class GZipArchivWriteToStdioOption.
     stream space.
     stream nextPutAll:aFile asString.
     stream space.
-    stream nextPut:self class PipeSign.
+    stream nextPut:$>.
     stream space.
     stream nextPutAll:newFile asString.
     cmd := stream contents.
@@ -497,7 +485,7 @@
          #(#ownerGroup      1)    
          #(#size            1)   
          #(#dateAndTime     2)  
-         #(#fileName        1)
+         #(#fileName        #rest)
     ) 
 ! !
 
@@ -721,7 +709,7 @@
         stream space.
         stream nextPutAll:self class TarArchivDeleteOption.
         stream space.
-        stream nextPut:self class MinusSign.
+        stream nextPut:$-.
         stream nextPutAll:self class TarArchivFileOption.
         stream space.
         stream nextPutAll:filename asString.
@@ -859,7 +847,7 @@
          #(#type            1)    
          #(#ratio           1)    
          #(#dateAndTime     2)  
-         #(#fileName        1)
+         #(#fileName        #rest)
     ) 
 ! !
 
@@ -1026,7 +1014,7 @@
         stream := WriteStream on:''.
         stream nextPutAll:self class ZipArchivCommand.
         stream space.
-        stream nextPut:self class MinusSign.
+        stream nextPut:$-.
         stream nextPut:self class ZipRecursiveOption.
         stream space.
         stream nextPutAll:archivFile asString.
@@ -1066,7 +1054,7 @@
     stream := WriteStream on:''.
     stream nextPutAll:self class ZipArchivCommand.
     stream space.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPut:self class ZipRecursiveOption.
     stream space.
     stream nextPutAll:self fileName asString.
@@ -1085,10 +1073,10 @@
     stream := WriteStream on:''.
     stream nextPutAll:self class ZipUnzipCommand.
     stream space.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPut:self class UnzipOverwriteExistingFilesOption.
     stream space.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPut:self class UnzipExtDirectoryOption.
     stream space.
     stream nextPutAll:dir asString.
@@ -1112,13 +1100,13 @@
     stream := WriteStream on:''.
     stream nextPutAll:self class ZipUnzipCommand.
     stream space.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPut:self class ZipListOption.
     stream space.
-    stream nextPut:self class MinusSign.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
+    stream nextPut:$-.
     stream nextPut:self class ZipHeaderOption.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPut:self class ZipTotalOption.
     stream space.
     stream nextPutAll:self fileName asString.
@@ -1140,7 +1128,7 @@
     stream := WriteStream on:''.
     stream nextPutAll:self class ZipArchivCommand.
     stream space.
-    stream nextPut:self class MinusSign.
+    stream nextPut:$-.
     stream nextPut:self class ZipDeleteOption.
     stream space.
     stream nextPutAll:self fileName asString.
@@ -1163,7 +1151,7 @@
         stream space.
         stream nextPutAll:self class TarArchivDeleteOption.
         stream space.
-        stream nextPut:self class MinusSign.
+        stream nextPut:$-.
         stream nextPutAll:self class TarArchivFileOption.
         stream space.
         stream nextPutAll:filename asString.
@@ -1178,5 +1166,5 @@
 !Archiver class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Archiver.st,v 1.7 2002-10-21 14:49:49 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Archiver.st,v 1.8 2002-11-29 10:43:38 cg Exp $'
 ! !