Imported Debian patch 2.4.5p1-2

[debian/amanda] / client-src / sendbackup-dump.c

diff --git a/client-src/sendbackup-dump.c b/client-src/sendbackup-dump.c
index f0a3af5f366937d9e4b247d17effd14ecae4aace..f6f232f41e03bf23752b817b3e7b57842bc4f3fb 100644 (file)
--- a/client-src/sendbackup-dump.c
+++ b/client-src/sendbackup-dump.c
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /* 
- * $Id: sendbackup-dump.c,v 1.65.2.5.4.2.2.9 2003/02/05 02:11:26 martinea Exp $
+ * $Id: sendbackup-dump.c,v 1.65.2.5.4.2.2.9.2.1 2005/09/20 18:13:08 jrjackson Exp $
  *
  * send backup data using BSD dump
  */
@@ -59,7 +59,7 @@ static regex_t re_table[] = {
 
   AM_SIZE_RE("DUMP: [0-9][0-9]* blocks \\([0-9][0-9]*\\.[0-9][0-9]*MB\\) on [0-9][0-9]* volume",
             512),
-  AM_SIZE_RE("DUMP: [0-9][0-9]* blocks", 512),
+  AM_SIZE_RE("DUMP: [0-9][0-9]* blocks", 1024),
   AM_SIZE_RE("DUMP: [0-9][0-9]* bytes were dumped", 1),
   /* OSF's vdump */
   AM_SIZE_RE("vdump: Dumped  [0-9][0-9]* of [0-9][0-9]* bytes", 1),
@@ -95,6 +95,7 @@ static regex_t re_table[] = {
   AM_NORMAL_RE("^vdump:"),                             /* OSF/1 */
   AM_NORMAL_RE("^ *vxdump:"),                          /* HPUX10 */
   AM_NORMAL_RE("^ *vxfs *vxdump:"),                    /* Solaris */
+  AM_NORMAL_RE("^Dumping .* to stdout"),               /* Solaris vxdump */
   AM_NORMAL_RE("^xfsdump:"),                           /* IRIX xfs */
   AM_NORMAL_RE("^ *VXDUMP:"),                          /* Sinix */
   AM_NORMAL_RE("^ *UFSDUMP:"),                         /* Sinix */