ebl update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4370 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/patches/testing/breg.c b/bacula/patches/testing/breg.c
new file mode 100644 (file)
index 0000000..a62482e
--- /dev/null
+++ b/bacula/patches/testing/breg.c
@@ -0,0 +1,276 @@
+/*
+ * Manipulation routines for BREGEXP list
+ *
+ *  Eric Bollengier, Mars 2007
+ *
+ *  Version $Id$
+ *
+ */
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2006-2006 Free Software Foundation Europe e.V.
+
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+
+
+#include "bacula.h"
+
+#include "breg.h"
+#include "mem_pool.h"
+
+BREGEXP *new_bregexp(const char *motif)
+{
+   Dmsg0(500, "bregexp: creating new bregexp object\n");
+   BREGEXP *self = (BREGEXP *)malloc(sizeof(BREGEXP));
+   memset(self, 0, sizeof(BREGEXP));
+   
+   self->nmatch = 20;
+
+   if (!self->extract_regexp(motif)) {
+//      Dmsg0(100, "bregexp: extract_regexp error\n");
+      printf("bregexp: extract_regexp error\n");
+      free_bregexp(self);
+      return NULL;
+   }
+
+   self->result = get_pool_memory(PM_FNAME);
+
+   return self;
+}
+
+bool BREGEXP::extract_regexp(const char *motif)
+{
+   
+   if (!motif) {
+      return false;
+   }
+   char sep = motif[0];
+   char *search = (char *) motif + 1;
+   char *replace;
+   int options = REG_EXTENDED;
+   bool ok = false;
+   bool found_motif = false;
+
+   /* extract 1st part */
+   char *dest = expr = bstrdup(motif);
+
+   while (*search && !ok) {
+      if (*search == '\\' && *dest == sep) {
+        *dest++ = *++search;       /* we skip separator */ 
+      } else if (*search == sep) {
+        *dest++ = '\0';
+
+        if (subst) {   /* already have found motif */
+           ok = true;
+        } else {
+           *dest++ = *++search; /* we skip separator */ 
+           subst = dest;        /* get replaced string */
+        }
+      } else {
+        *dest++ = *search++;
+      }
+   }
+   *dest = '\0';               /* in case of */
+   
+   if (!ok || !subst) {
+      /* bad regexp */
+      return false;
+   }
+
+   /* find options */
+   while (*search) {
+      if (*search == 'i') {
+        options |= REG_ICASE;
+      }
+      search++;
+   }
+
+   int rc = regcomp(&preg, expr, options);
+   if (rc != 0) {
+      char prbuf[500];
+      regerror(rc, &preg, prbuf, sizeof(prbuf));
+      printf("bregexp: compile error: %s\n", prbuf);
+//      Dmsg1(100, "bregexp: compile error: %s\n", prbuf);
+      return false;
+   }
+   
+   return true;
+}
+
+
+void free_bregexp(BREGEXP *self)
+{
+   Dmsg0(500, "bregexp: freeing BREGEXP object\n");
+
+   if (self->expr) {
+      free(self->expr);
+   }
+   if (self->result) {
+      free_pool_memory(self->result);
+   }
+   regfree(&self->preg);
+   free(self);
+}
+
+void free_bregexps(alist *bregexps)
+{
+   Dmsg0(500, "bregexp: freeing all BREGEXP object\n");
+
+   BREGEXP *elt;
+   foreach_alist(elt, bregexps) {
+      free_bregexp(elt);
+   }
+}
+
+/* return regexp->result */
+char *BREGEXP::replace(const char *fname)
+{
+   struct re_registers regs;
+   int flen = strlen(fname);
+   int rc = re_search(&preg, fname, flen, 0, flen, &regs);
+
+   if (rc < 0) {
+      printf("E: regex mismatch\n");
+      return return_fname(fname, flen);
+   }
+
+   int len = compute_dest_len(fname, &regs);
+
+   if (len) {
+      result = check_pool_memory_size(result, len);
+      edit_subst(fname, &regs);
+
+   } else {                    /* error in substitution */
+      printf("E: error in substitution\n");
+      return return_fname(fname, flen);
+   }
+
+   return result;
+} 
+
+char *BREGEXP::return_fname(const char *fname, int len)
+{
+   result = check_pool_memory_size(result, len+1);
+   strcpy(result,fname);
+   return result;
+}
+
+int BREGEXP::compute_dest_len(const char *fname, struct re_registers *regs)
+{
+   int len=0;
+   char *p;
+   char *psubst = subst;
+   int no;
+
+   if (!fname || !regs) {
+      return 0;
+   }
+
+   /* match failed ? */
+   if (regs->start[0] < 0) {
+      return 0;
+   }
+
+   for (p = psubst++; *p ; p = psubst++) {
+      /* match $1 \1 back references */
+      if ((*p == '$' || *p == '\\') && ('0' <= *psubst && *psubst <= '9')) {
+        no = *psubst++ - '0';
+
+        /* we check if the back reference exists */
+        if (regs->start[no] >= 0 && regs->end[no] >= 0) { 
+           len += regs->end[no] - regs->start[no];
+        } else {
+           return 0; /* back reference missing */
+        }
+      } else {
+        len++;
+      }
+   }
+
+   /* $0 is replaced by subst */
+   len -= regs->end[0] - regs->start[0];
+   len += strlen(fname) + 1;
+
+   return len;
+}
+
+char *BREGEXP::edit_subst(const char *fname, struct re_registers *regs)
+{
+   int i;
+   char *p;
+   char *psubst = subst;
+   int no;
+   int len;
+
+   /* il faut recopier fname dans dest
+    *  on recopie le debut fname -> regs->start[0]
+    */
+   
+   for (i = 0; i < regs->start[0] ; i++) {
+      result[i] = fname[i];
+   }
+
+   /* on recopie le motif de remplacement (avec tous les $x) */
+
+   for (p = psubst++; *p ; p = psubst++) {
+      /* match $1 \1 back references */
+      if ((*p == '$' || *p == '\\') && ('0' <= *psubst && *psubst <= '9')) {
+        no = *psubst++ - '0';
+
+        len = regs->end[no] - regs->start[no];
+        bstrncpy(result + i, fname + regs->start[no], len + 1);
+        i += len ;
+
+      } else {
+        result[i++] = *p;
+      }
+   }
+
+   strcpy(result + i, fname + regs->end[0]);
+
+   return result;
+}
+
+void BREGEXP::debug()
+{
+   printf("expr=[%s]\n", expr);
+   printf("subst=[%s]\n", subst);
+   printf("result=%s\n", result?result:"(null)");
+}
+
+int main(int argc, char **argv)
+{
+   BREGEXP *reg;
+   
+   reg = new_bregexp(argv[1]);
+
+   if (reg) {
+      reg->replace(argv[2]);
+      reg->debug();
+      printf("%s => %s\n", argv[1], reg->result);
+   }
+   exit(0);
+}
+

diff --git a/bacula/patches/testing/breg.h b/bacula/patches/testing/breg.h
new file mode 100644 (file)
index 0000000..e8d2e8d
--- /dev/null
+++ b/bacula/patches/testing/breg.h
@@ -0,0 +1,87 @@
+/*
+ * Bacula BREGEXP Structure definition for FileDaemon
+ * Eric Bollengier Mars 2007
+ * Version $Id$
+ */
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2006-2006 Free Software Foundation Europe e.V.
+
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+
+
+#ifndef __BREG_H_
+#define __BREG_H_ 1
+
+//#include "bregex.h"
+#include <regex.h>
+
+/* Usage:
+ *
+ * #include "lib/breg.h"
+ * 
+ * BREGEXP *breg = new_bregexp("!/prod!/test!");
+ * char *filename = breg->replace("/prod/data.dat");
+ *   or
+ * filename = breg->result;
+ * free_bregexp(breg);
+ */
+
+/*
+ * Structure for BREGEXP ressource
+ */
+class BREGEXP {
+public:
+   POOLMEM *result;            /* match result */
+   char *replace(const char *fname);
+   void debug();
+
+
+   /* private */
+   POOLMEM *expr;              /* search epression */
+   POOLMEM *subst;             /* substitution */
+   regex_t preg;               /* regex_t result of regcomp() */
+   
+   int nmatch;
+   
+   char *return_fname(const char *fname, int len); /* return fname as result */
+   char *edit_subst(const char *fname, struct re_registers *regs);
+   int compute_dest_len(const char *fname, struct re_registers *regs);
+   bool extract_regexp(const char *motif);
+};
+
+/* create new BREGEXP and compile regex_t */
+BREGEXP *new_bregexp(const char *motif); 
+
+/* launch each bregexp on filename */
+int run_bregexp(alist *bregexps, const char *fname); 
+
+/* free BREGEXP (and all POOLMEM) */
+void free_bregexp(BREGEXP *script);
+
+/* foreach_alist free RUNSCRIPT */
+void free_bregexps(alist *bregexps); /* you have to free alist */
+
+#endif /* __BREG_H_ */