[BACK]Return to batch.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync

Diff for /embedaddon/rsync/batch.c between versions 1.1 and 1.1.1.2

version 1.1, 2012/02/17 15:09:30 version 1.1.1.2, 2013/10/14 07:51:14
Line 3 Line 3
  *   *
  * Copyright (C) 1999 Weiss   * Copyright (C) 1999 Weiss
  * Copyright (C) 2004 Chris Shoemaker   * Copyright (C) 2004 Chris Shoemaker
 * Copyright (C) 2004-2009 Wayne Davison * Copyright (C) 2004-2013 Wayne Davison
  *   *
  * This program is free software; you can redistribute it and/or modify   * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by   * it under the terms of the GNU General Public License as published by
Line 20 Line 20
  */   */
   
 #include "rsync.h"  #include "rsync.h"
#include "zlib/zlib.h"#include <zlib.h>
 #include <time.h>  #include <time.h>
   
 extern int eol_nulls;  extern int eol_nulls;
Line 43  extern char *batch_name; Line 43  extern char *batch_name;
 extern char *iconv_opt;  extern char *iconv_opt;
 #endif  #endif
   
extern struct filter_list_struct filter_list;extern filter_rule_list filter_list;
   
 int batch_stream_flags;  int batch_stream_flags;
   
Line 135  void check_batch_flags(void) Line 135  void check_batch_flags(void)
                                         set ? "Please" : "Do not");                                          set ? "Please" : "Do not");
                                 exit_cleanup(RERR_SYNTAX);                                  exit_cleanup(RERR_SYNTAX);
                         }                          }
                        if (verbose) {                        if (INFO_GTE(MISC, 1)) {
                                 rprintf(FINFO,                                  rprintf(FINFO,
                                         "%sing the %s option to match the batchfile.\n",                                          "%sing the %s option to match the batchfile.\n",
                                         set ? "Sett" : "Clear", flag_name[i]);                                          set ? "Sett" : "Clear", flag_name[i]);
Line 191  static int write_arg(int fd, char *arg) Line 191  static int write_arg(int fd, char *arg)
   
 static void write_filter_rules(int fd)  static void write_filter_rules(int fd)
 {  {
        struct filter_struct *ent;        filter_rule *ent;
   
         write_sbuf(fd, " <<'#E#'\n");          write_sbuf(fd, " <<'#E#'\n");
         for (ent = filter_list.head; ent; ent = ent->next) {          for (ent = filter_list.head; ent; ent = ent->next) {
                 unsigned int plen;                  unsigned int plen;
                char *p = get_rule_prefix(ent->match_flags, "- ", 0, &plen);                char *p = get_rule_prefix(ent, "- ", 0, &plen);
                 write_buf(fd, p, plen);                  write_buf(fd, p, plen);
                 write_sbuf(fd, ent->pattern);                  write_sbuf(fd, ent->pattern);
                if (ent->match_flags & MATCHFLG_DIRECTORY)                if (ent->rflags & FILTRULE_DIRECTORY)
                         write_byte(fd, '/');                          write_byte(fd, '/');
                 write_byte(fd, eol_nulls ? 0 : '\n');                  write_byte(fd, eol_nulls ? 0 : '\n');
         }          }
Line 221  void write_batch_shell_file(int argc, char *argv[], in Line 221  void write_batch_shell_file(int argc, char *argv[], in
         stringjoin(filename, sizeof filename,          stringjoin(filename, sizeof filename,
                    batch_name, ".sh", NULL);                     batch_name, ".sh", NULL);
         fd = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,          fd = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
                     S_IRUSR | S_IWUSR | S_IEXEC);                     S_IRUSR | S_IWUSR | S_IXUSR);
         if (fd < 0) {          if (fd < 0) {
                 rsyserr(FERROR, errno, "Batch file %s open error",                  rsyserr(FERROR, errno, "Batch file %s open error",
                         filename);                          filename);
Removed from v.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>