Important protocol change -- see kes29Oct02

[bacula/bacula] / bacula / src / findlib / match.c

diff --git a/bacula/src/findlib/match.c b/bacula/src/findlib/match.c
index 2b01f3d10041afe83ed6c9158bedb8eafd25052e..9d3aee96a19116492278e01eb82c3ff0d064c8b6 100644 (file)
--- a/bacula/src/findlib/match.c
+++ b/bacula/src/findlib/match.c
@@ -104,22 +104,32 @@ void add_fname_to_include_list(FF_PKT *ff, int prefixed, char *fname)
    if (prefixed) {
       for (p=fname; *p && *p != ' '; p++) {
         switch (*p) {
-            case '0':                  /* no option */
+            case 'a':                 /* alway replace */
+            case '0':                 /* no option */
               break;
-            case 'M':                  /* MD5 */
+            case 'w':
+              inc->options |= OPT_replace_if_newer;
+              break;
+            case 'n':
+              inc->options |= OPT_never_replace;
+              break;
+            case 'M':                 /* MD5 */
               inc->options |= OPT_compute_MD5;
               break;
-            case 'Z':                  /* gzip compression */
+            case 'Z':                 /* gzip compression */
               inc->options |= OPT_GZIP_compression;
                inc->level = *++p - '0';
                Dmsg1(200, "Compression level=%d\n", inc->level);
               break;
-            case 'h':                  /* no recursion */
+            case 'h':                 /* no recursion */
               inc->options |= OPT_no_recursion;
               break;
             case 'f':
               inc->options |= OPT_multifs;
               break;
+            case 's':
+              inc->options |= OPT_sparse;
+              break;
             case 'V':                  /* verify options */
               /* Copy Verify Options */
                for (j=0; *p && *p != ':'; p++) {
@@ -203,6 +213,7 @@ struct s_included_file *get_next_included_file(FF_PKT *ff, struct s_included_fil
       inc = ainc->next;
    }
    if (inc) {
+      ff->flags = inc->options;
       if (inc->options & OPT_compute_MD5) {
         ff->compute_MD5 = 1;
       } else {