From 34de7925a923fbeb972b5b767293d04c438635d1 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 26 Feb 2003 16:51:33 +0000 Subject: [PATCH] Additional message plus exclusion fix git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@354 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/filed/job.c | 11 ++--------- bacula/src/stored/dircmd.c | 9 ++++++--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 88ad1569df..c696ba285b 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -318,19 +318,12 @@ static int include_cmd(JCR *jcr) static int exclude_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; - char *p; while (bnet_recv(dir) >= 0) { dir->msg[dir->msglen] = 0; strip_trailing_junk(dir->msg); - /* Skip leading options */ - for (p=dir->msg; *p && *p != ' '; p++) - { } - /* Skip spaces */ - for ( ; *p && *p == ' '; p++) - { } - add_fname_to_exclude_list((FF_PKT *)jcr->ff, p); - Dmsg1(110, "msg); + add_fname_to_exclude_list((FF_PKT *)jcr->ff, dir->msg); + Dmsg1(110, "msg); } return bnet_fsend(dir, OKexc); diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c index 92182bd9cb..6d8dbf71b9 100644 --- a/bacula/src/stored/dircmd.c +++ b/bacula/src/stored/dircmd.c @@ -468,7 +468,8 @@ static int mount_cmd(JCR *jcr) bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"), dev->dev_name, dev->VolHdr.VolName); } else { - bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"), + bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n" + "Try unmounting and remounting the Volume.\n"), dev->dev_name); } break; @@ -488,7 +489,8 @@ static int mount_cmd(JCR *jcr) bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"), dev->dev_name, dev->VolHdr.VolName); } else { - bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"), + bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n" + "Try unmounting and remounting the Volume.\n"), dev->dev_name); } } else { @@ -506,7 +508,8 @@ static int mount_cmd(JCR *jcr) bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"), dev->dev_name, dev->VolHdr.VolName); } else { - bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"), + bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n" + "Try unmounting and remounting the Volume.\n"), dev->dev_name); } } -- 2.39.5