Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some man page problems Scott Kostyshak pointed out.
[rsync/rsync.git]
/
batch.c
diff --git
a/batch.c
b/batch.c
index
033368a
..
b63f0c5
100644
(file)
--- a/
batch.c
+++ b/
batch.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 1999 Weiss
* Copyright (C) 2004 Chris Shoemaker
*
* Copyright (C) 1999 Weiss
* Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004-200
8
Wayne Davison
+ * Copyright (C) 2004-200
9
Wayne Davison
*
* 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
*
* 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
@@
-43,7
+43,7
@@
extern char *batch_name;
extern char *iconv_opt;
#endif
extern char *iconv_opt;
#endif
-extern
struct filter_list_struc
t filter_list;
+extern
filter_rule_lis
t filter_list;
int batch_stream_flags;
int batch_stream_flags;
@@
-135,7
+135,7
@@
void check_batch_flags(void)
set ? "Please" : "Do not");
exit_cleanup(RERR_SYNTAX);
}
set ? "Please" : "Do not");
exit_cleanup(RERR_SYNTAX);
}
- if (
verbose
) {
+ if (
INFO_GTE(MISC, 1)
) {
rprintf(FINFO,
"%sing the %s option to match the batchfile.\n",
set ? "Sett" : "Clear", flag_name[i]);
rprintf(FINFO,
"%sing the %s option to match the batchfile.\n",
set ? "Sett" : "Clear", flag_name[i]);
@@
-156,40
+156,50
@@
void check_batch_flags(void)
append_mode = 2;
}
append_mode = 2;
}
-static
void
write_arg(int fd, char *arg)
+static
int
write_arg(int fd, char *arg)
{
char *x, *s;
{
char *x, *s;
+ int len, ret = 0;
if (*arg == '-' && (x = strchr(arg, '=')) != NULL) {
if (*arg == '-' && (x = strchr(arg, '=')) != NULL) {
- write(fd, arg, x - arg + 1);
+ if (write(fd, arg, x - arg + 1) != x - arg + 1)
+ ret = -1;
arg += x - arg + 1;
}
if (strpbrk(arg, " \"'&;|[]()$#!*?^\\") != NULL) {
arg += x - arg + 1;
}
if (strpbrk(arg, " \"'&;|[]()$#!*?^\\") != NULL) {
- write(fd, "'", 1);
+ if (write(fd, "'", 1) != 1)
+ ret = -1;
for (s = arg; (x = strchr(s, '\'')) != NULL; s = x + 1) {
for (s = arg; (x = strchr(s, '\'')) != NULL; s = x + 1) {
- write(fd, s, x - s + 1);
- write(fd, "'", 1);
+ if (write(fd, s, x - s + 1) != x - s + 1
+ || write(fd, "'", 1) != 1)
+ ret = -1;
}
}
- write(fd, s, strlen(s));
- write(fd, "'", 1);
- return;
+ len = strlen(s);
+ if (write(fd, s, len) != len
+ || write(fd, "'", 1) != 1)
+ ret = -1;
+ return ret;
}
}
- write(fd, arg, strlen(arg));
+ len = strlen(arg);
+ if (write(fd, arg, len) != len)
+ ret = -1;
+
+ return ret;
}
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");
for (ent = filter_list.head; ent; ent = ent->next) {
unsigned int plen;
write_sbuf(fd, " <<'#E#'\n");
for (ent = filter_list.head; ent; ent = ent->next) {
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_sbuf(fd, ent->pattern);
write_buf(fd, p, plen);
write_sbuf(fd, ent->pattern);
- if (ent->
match_flags & MATCHFLG
_DIRECTORY)
+ if (ent->
rflags & FILTRULE
_DIRECTORY)
write_byte(fd, '/');
write_byte(fd, eol_nulls ? 0 : '\n');
}
write_byte(fd, '/');
write_byte(fd, eol_nulls ? 0 : '\n');
}
@@
-205,7
+215,7
@@
static void write_filter_rules(int fd)
* (hopefully) work. */
void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
{
* (hopefully) work. */
void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
{
- int fd, i, len;
+ int fd, i, len
, err = 0
;
char *p, filename[MAXPATHLEN];
stringjoin(filename, sizeof filename,
char *p, filename[MAXPATHLEN];
stringjoin(filename, sizeof filename,
@@
-219,7
+229,8
@@
void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
}
/* Write argvs info to BATCH.sh file */
}
/* Write argvs info to BATCH.sh file */
- write_arg(fd, argv[0]);
+ if (write_arg(fd, argv[0]) < 0)
+ err = 1;
if (filter_list.head) {
if (protocol_version >= 29)
write_sbuf(fd, " --filter=._-");
if (filter_list.head) {
if (protocol_version >= 29)
write_sbuf(fd, " --filter=._-");
@@
-240,25
+251,31
@@
void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
i++;
continue;
}
i++;
continue;
}
- write(fd, " ", 1);
+ if (write(fd, " ", 1) != 1)
+ err = 1;
if (strncmp(p, "--write-batch", len = 13) == 0
|| strncmp(p, "--only-write-batch", len = 18) == 0) {
if (strncmp(p, "--write-batch", len = 13) == 0
|| strncmp(p, "--only-write-batch", len = 18) == 0) {
- write(fd, "--read-batch", 12);
+ if (write(fd, "--read-batch", 12) != 12)
+ err = 1;
if (p[len] == '=') {
if (p[len] == '=') {
- write(fd, "=", 1);
- write_arg(fd, p + len + 1);
+ if (write(fd, "=", 1) != 1
+ || write_arg(fd, p + len + 1) < 0)
+ err = 1;
}
}
- } else
- write_arg(fd, p);
+ } else {
+ if (write_arg(fd, p) < 0)
+ err = 1;
+ }
}
if (!(p = check_for_hostspec(argv[argc - 1], &p, &i)))
p = argv[argc - 1];
}
if (!(p = check_for_hostspec(argv[argc - 1], &p, &i)))
p = argv[argc - 1];
- write(fd, " ${1:-", 6);
- write_arg(fd, p);
+ if (write(fd, " ${1:-", 6) != 6
+ || write_arg(fd, p) < 0)
+ err = 1;
write_byte(fd, '}');
if (filter_list.head)
write_filter_rules(fd);
write_byte(fd, '}');
if (filter_list.head)
write_filter_rules(fd);
- if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
+ if (write(fd, "\n", 1) != 1 || close(fd) < 0
|| err
) {
rsyserr(FERROR, errno, "Batch file %s write error",
filename);
exit_cleanup(RERR_FILEIO);
rsyserr(FERROR, errno, "Batch file %s write error",
filename);
exit_cleanup(RERR_FILEIO);