dblog.c file has a compile problem, it's probably my fault...)
---- README-ODBC 2004-02-13 17:08:33.000000000 -0800
+--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ README-ODBC 2004-04-07 22:42:28.000000000 -0700
@@ -0,0 +1,80 @@
+This patch adds the following options:
} else {
rprintf(FINFO,"rsync %s %s from %s (%s)\n",
am_sender?"on":"to",
---- configure.in 9 Apr 2004 18:09:16 -0000 1.190
+--- configure.in 17 Apr 2004 18:40:16 -0000 1.191
+++ configure.in 15 Apr 2004 18:51:14 -0000
@@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
[ --with-rsync-path=PATH set default --rsync-path to PATH (default: rsync)],
fi
AC_MSG_CHECKING([whether to use included libpopt])
---- dblog.c 2004-02-13 17:08:33.000000000 -0800
+--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ dblog.c 2004-04-07 23:18:56.000000000 -0700
@@ -0,0 +1,352 @@
+/*
+ rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
+ }
+}
---- dblog-tables-mysql.sql 2004-02-13 17:08:33.000000000 -0800
+--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ dblog-tables-mysql.sql 2004-04-07 23:00:13.000000000 -0700
@@ -0,0 +1,43 @@
+drop table transfer;
+ Primary Key (id),
+ foreign key (session_id) references session (id)
+);
---- dblog-tables-postgresql.sql 2004-02-13 17:08:33.000000000 -0800
+--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ dblog-tables-postgresql.sql 2004-04-07 22:59:55.000000000 -0700
@@ -0,0 +1,45 @@
+drop table transfer;
if (f == -1 || !am_sender) return;
}
---- proto.h 14 Apr 2004 23:33:30 -0000 1.188
+--- proto.h 22 Apr 2004 09:58:09 -0000 1.189
+++ proto.h 15 Apr 2004 18:51:15 -0000
@@ -51,6 +51,12 @@ int start_daemon(int f_in, int f_out);
int daemon_main(void);
rprintf(FINFO, "flist->length=%.0f\n",
(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- flist.c 17 Apr 2004 17:14:12 -0000 1.214
+--- flist.c 22 Apr 2004 22:17:15 -0000 1.216
+++ flist.c 20 Apr 2004 23:44:17 -0000
@@ -58,6 +58,7 @@ extern int relative_paths;
extern int implied_dirs;
}
-@@ -323,6 +324,7 @@ void send_file_entry(struct file_struct
+@@ -326,6 +327,7 @@ void send_file_entry(struct file_struct
{
unsigned short flags;
static time_t modtime;
static mode_t mode;
static uint64 dev;
static dev_t rdev;
-@@ -338,7 +340,7 @@ void send_file_entry(struct file_struct
+@@ -341,7 +343,7 @@ void send_file_entry(struct file_struct
if (!file) {
write_byte(f, 0);
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -387,6 +389,12 @@ void send_file_entry(struct file_struct
+@@ -390,6 +392,12 @@ void send_file_entry(struct file_struct
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
#if SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -442,6 +450,8 @@ void send_file_entry(struct file_struct
+@@ -445,6 +453,8 @@ void send_file_entry(struct file_struct
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!numeric_ids)
add_uid(uid);
-@@ -515,6 +525,7 @@ void receive_file_entry(struct file_stru
+@@ -518,6 +528,7 @@ void receive_file_entry(struct file_stru
struct file_list *flist, int f)
{
static time_t modtime;
static mode_t mode;
static uint64 dev;
static dev_t rdev;
-@@ -531,7 +542,7 @@ void receive_file_entry(struct file_stru
+@@ -534,7 +545,7 @@ void receive_file_entry(struct file_stru
struct file_struct *file;
if (!fptr) {
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -585,6 +596,8 @@ void receive_file_entry(struct file_stru
+@@ -588,6 +599,8 @@ void receive_file_entry(struct file_stru
modtime = (time_t)read_int(f);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
-@@ -635,6 +648,7 @@ void receive_file_entry(struct file_stru
+@@ -638,6 +651,7 @@ void receive_file_entry(struct file_stru
file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -849,6 +863,7 @@ skip_excludes:
+@@ -852,6 +866,7 @@ skip_excludes:
file->flags = flags;
file->modtime = st.st_mtime;
if (preserve_perms)
argstr[x++] = 'p';
if (recurse)
---- proto.h 14 Apr 2004 23:33:30 -0000 1.188
+--- proto.h 22 Apr 2004 09:58:09 -0000 1.189
+++ proto.h 20 Apr 2004 23:44:17 -0000
@@ -242,7 +242,7 @@ int fd_pair(int fd[2]);
void print_child_argv(char **cmd);
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- rsync.h 17 Apr 2004 17:14:16 -0000 1.197
+--- rsync.h 22 Apr 2004 09:58:24 -0000 1.198
+++ rsync.h 20 Apr 2004 23:44:18 -0000
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
uid_t uid;
gid_t gid;
mode_t mode;
---- rsync.yo 17 Apr 2004 18:40:16 -0000 1.159
+--- rsync.yo 22 Apr 2004 21:35:45 -0000 1.161
+++ rsync.yo 20 Apr 2004 23:44:18 -0000
@@ -299,6 +299,7 @@ verb(
-g, --group preserve group
return 0;
}
---- util.c 17 Apr 2004 17:06:03 -0000 1.136
+--- util.c 22 Apr 2004 22:17:15 -0000 1.138
+++ util.c 20 Apr 2004 23:44:19 -0000
@@ -124,32 +124,40 @@ void overflow(char *str)
--- Makefile.in 10 Feb 2004 17:06:11 -0000 1.98
-+++ Makefile.in 20 Mar 2004 17:56:44 -0000
++++ Makefile.in 22 Apr 2004 23:39:42 -0000
@@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
main.o checksum.o match.o syscall.o log.o backup.o
OBJS3=progress.o pipe.o
DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
---- chmod.c 2004-02-13 17:08:33.000000000 -0800
-+++ chmod.c 2004-03-20 10:04:19.000000000 -0800
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ chmod.c 22 Apr 2004 23:39:43 -0000
@@ -0,0 +1,184 @@
+#include "rsync.h"
+
+ }
+ return 0;
+}
---- flist.c 14 Apr 2004 23:33:34 -0000 1.213
-+++ flist.c 15 Apr 2004 19:00:26 -0000
+--- flist.c 22 Apr 2004 22:17:15 -0000 1.216
++++ flist.c 22 Apr 2004 23:39:43 -0000
@@ -33,6 +33,7 @@ extern int verbose;
extern int do_progress;
extern int am_root;
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
extern struct exclude_list_struct local_exclude_list;
-@@ -850,7 +853,10 @@ skip_excludes:
+@@ -853,7 +856,10 @@ skip_excludes:
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->uid = st.st_uid;
file->gid = st.st_gid;
---- options.c 14 Apr 2004 23:33:34 -0000 1.146
-+++ options.c 15 Apr 2004 19:00:26 -0000
+--- options.c 17 Apr 2004 17:07:23 -0000 1.147
++++ options.c 22 Apr 2004 23:39:43 -0000
@@ -121,6 +121,7 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
}
if (files_from && (!am_sender || remote_filesfrom_file)) {
---- proto.h 14 Apr 2004 23:33:30 -0000 1.188
-+++ proto.h 15 Apr 2004 19:00:26 -0000
+--- proto.h 22 Apr 2004 09:58:09 -0000 1.189
++++ proto.h 22 Apr 2004 23:39:43 -0000
@@ -25,6 +25,9 @@ void file_checksum(char *fname,char *sum
void sum_init(void);
void sum_update(char *p, int len);
void close_all(void);
void _exit_cleanup(int code, const char *file, int line);
void cleanup_disable(void);
---- rsync.yo 15 Apr 2004 18:32:24 -0000 1.157
-+++ rsync.yo 15 Apr 2004 19:00:27 -0000
+--- rsync.yo 22 Apr 2004 21:35:45 -0000 1.161
++++ rsync.yo 22 Apr 2004 23:39:44 -0000
@@ -299,6 +299,7 @@ verb(
-g, --group preserve group
-D, --devices preserve devices (root only)
dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
instead it will just report the actions it would have taken.
---- testsuite/chmod.test 2004-02-13 17:08:33.000000000 -0800
-+++ testsuite/chmod.test Sat Mar 20 10:30:48 2004
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ testsuite/chmod.test 22 Apr 2004 23:39:44 -0000
@@ -0,0 +1,43 @@
+#! /bin/sh
+
--- rsync.c 23 Mar 2004 16:16:15 -0000 1.135
-+++ rsync.c 15 Apr 2004 19:14:12 -0000
++++ rsync.c 22 Apr 2004 23:43:44 -0000
@@ -235,6 +235,9 @@ void finish_transfer(char *fname, char *
if (make_backups && !make_backup(fname))
return;
}
}
---- t_stub.c 14 Apr 2004 23:33:34 -0000 1.6
-+++ t_stub.c 15 Apr 2004 19:14:12 -0000
+--- t_stub.c 22 Apr 2004 09:58:11 -0000 1.7
++++ t_stub.c 22 Apr 2004 23:43:44 -0000
@@ -26,6 +26,7 @@
* functions, so that module test harnesses can run standalone.
**/
int modify_window = 0;
int module_id = -1;
struct exclude_list_struct server_exclude_list;
---- util.c 14 Apr 2004 23:33:34 -0000 1.135
-+++ util.c 15 Apr 2004 19:14:13 -0000
+--- util.c 22 Apr 2004 22:17:15 -0000 1.138
++++ util.c 22 Apr 2004 23:43:44 -0000
@@ -28,6 +28,7 @@
#include "rsync.h"
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
--- Makefile.in 10 Feb 2004 17:06:11 -0000 1.98
-+++ Makefile.in 27 Feb 2004 08:57:09 -0000
++++ Makefile.in 22 Apr 2004 23:48:20 -0000
@@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
zlib/zutil.o zlib/adler32.o
fileio.o batch.o clientname.o
OBJS3=progress.o pipe.o
--- generator.c 15 Apr 2004 16:55:23 -0000 1.79
-+++ generator.c 15 Apr 2004 19:27:47 -0000
++++ generator.c 22 Apr 2004 23:48:20 -0000
@@ -50,6 +50,7 @@ extern int list_only;
extern int only_existing;
extern int orig_umask;
(double)st.st_size);
}
---- options.c 14 Apr 2004 23:33:34 -0000 1.146
-+++ options.c 15 Apr 2004 19:27:47 -0000
+--- options.c 17 Apr 2004 17:07:23 -0000 1.147
++++ options.c 22 Apr 2004 23:48:20 -0000
@@ -91,6 +91,7 @@ int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
*argc = ac;
return;
--- receiver.c 23 Mar 2004 16:50:40 -0000 1.75
-+++ receiver.c 15 Apr 2004 19:25:05 -0000
++++ receiver.c 22 Apr 2004 23:48:20 -0000
@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
extern int module_id;
extern int ignore_errors;
- - - - - - - - - - - - - - - - - - - - - - - - -
---- options.c 14 Apr 2004 23:33:34 -0000 1.146
-+++ options.c 15 Apr 2004 19:16:00 -0000
+--- options.c 17 Apr 2004 17:07:23 -0000 1.147
++++ options.c 22 Apr 2004 23:44:15 -0000
@@ -89,6 +89,7 @@ int opt_ignore_existing = 0;
int max_delete = 0;
int ignore_errors = 0;
if (keep_partial)
args[ac++] = "--partial";
---- util.c 14 Apr 2004 23:33:34 -0000 1.135
-+++ util.c 15 Apr 2004 19:16:00 -0000
+--- util.c 22 Apr 2004 22:17:15 -0000 1.138
++++ util.c 22 Apr 2004 23:44:15 -0000
@@ -924,6 +924,19 @@ int u_strcmp(const char *cs1, const char
{
const uchar *s1 = (const uchar *)cs1;
while (*s1 && *s2 && (*s1 == *s2)) {
s1++; s2++;
--- lib/wildmatch.c 14 Jul 2003 15:12:59 -0000 1.12
-+++ lib/wildmatch.c 23 Feb 2004 19:25:20 -0000
++++ lib/wildmatch.c 22 Apr 2004 23:44:15 -0000
@@ -76,8 +76,20 @@ static int domatch(const unsigned char *
ch = *++p;
/* FALLTHROUGH */
---- exclude.c 22 Apr 2004 09:58:15 -0000 1.70
+--- exclude.c 22 Apr 2004 22:17:15 -0000 1.71
+++ exclude.c 22 Apr 2004 10:32:52 -0000
@@ -27,15 +27,17 @@
#include "rsync.h"
}
static int check_one_exclude(char *name, struct exclude_struct *ex,
-@@ -215,21 +233,25 @@ static void report_exclude_result(char c
+@@ -215,22 +233,25 @@ static void report_exclude_result(char c
/*
* Return true if file NAME is defined to be excluded by the specified
-- * exclude list.
-+ * exclude list. Returns -1 for exclude, 0 for normal include, or 1
-+ * for super include.
+- * exclude list. Returns -1 for an exclude, 1 for an include, and 0 if
+- * no match.
++ * exclude list. Returns -1 for an exclude, 0 for a normal include, or 1
++ * for a super include.
*/
-int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir)
+int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir,
if (check_one_exclude(name, ent, name_is_dir)) {
report_exclude_result(name, ent, name_is_dir,
listp->debug_type);
-- return !ent->include;
+- return ent->include ? 1 : -1;
+ return ent->include - 1;
}
}
}
-@@ -255,10 +277,10 @@ static const char *get_exclude_tok(const
+@@ -256,10 +277,10 @@ static const char *get_exclude_tok(const
p = (const char *)s;
}
s += 2;
} else
*incl_ptr = xflags & XFLG_DEF_INCLUDE;
-@@ -390,8 +412,12 @@ void send_exclude_list(int f)
+@@ -391,8 +412,12 @@ void send_exclude_list(int f)
if (ent->include) {
write_int(f, l + 2);
write_int(f, l + 2);
write_buf(f, "- ", 2);
} else
---- flist.c 22 Apr 2004 09:58:18 -0000 1.215
+--- flist.c 22 Apr 2004 22:17:15 -0000 1.216
+++ flist.c 22 Apr 2004 10:32:52 -0000
@@ -40,6 +40,7 @@ extern int ignore_errors;
extern int numeric_ids;
extern struct exclude_list_struct local_exclude_list;
int io_error;
-@@ -211,6 +213,10 @@ int link_stat(const char *path, STRUCT_S
+@@ -211,7 +213,9 @@ int link_stat(const char *path, STRUCT_S
*/
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
{
+- int rc;
+ static struct exclude_list_struct *elist[] = {
+ &exclude_list, &perdir_exclude_list, &local_exclude_list, NULL };
+ int i, rc;
-+
+
#if 0 /* This currently never happens, so avoid a useless compare. */
if (exclude_level == NO_EXCLUDES)
- return 0;
-@@ -227,16 +233,18 @@ static int check_exclude_file(char *fnam
+@@ -229,17 +233,18 @@ static int check_exclude_file(char *fnam
}
}
if (server_exclude_list.head
-- && check_exclude(&server_exclude_list, fname, is_dir))
-+ && check_exclude(&server_exclude_list, fname, is_dir, 0) < 0)
+- && check_exclude(&server_exclude_list, fname, is_dir) < 0)
++ && check_exclude(&server_exclude_list, fname, is_dir, 0) < 0)
return 1;
if (exclude_level != ALL_EXCLUDES)
return 0;
-- if (exclude_list.head && check_exclude(&exclude_list, fname, is_dir))
-- return 1;
+- if (exclude_list.head
+- && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
+- return rc < 0;
- if (local_exclude_list.head
-- && check_exclude(&local_exclude_list, fname, is_dir))
+- && check_exclude(&local_exclude_list, fname, is_dir) < 0)
- return 1;
- return 0;
+ for (i = 0, rc = 0; elist[i]; i++) {
}
/* used by the one_file_system code */
-@@ -944,8 +952,12 @@ void send_file_name(int f, struct file_l
+@@ -947,8 +952,12 @@ void send_file_name(int f, struct file_l
if (recursive && S_ISDIR(file->mode)
&& !(file->flags & FLAG_MOUNT_POINT)) {
struct exclude_list_struct last_list = local_exclude_list;
free_exclude_list(&local_exclude_list);
local_exclude_list = last_list;
}
-@@ -991,6 +1003,18 @@ static void send_directory(int f, struct
+@@ -994,6 +1003,18 @@ static void send_directory(int f, struct
io_error |= IOERR_GENERAL;
rprintf(FINFO,
"cannot cvs-exclude in long-named directory %s\n",
char *debug_type;
};
---- rsync.yo 17 Apr 2004 18:40:16 -0000 1.159
+--- rsync.yo 22 Apr 2004 21:35:45 -0000 1.161
+++ rsync.yo 22 Apr 2004 10:32:54 -0000
@@ -331,6 +331,7 @@ verb(
--exclude-from=FILE exclude patterns listed in FILE
--files-from=FILE read FILE for list of source-file names
-0 --from0 all file lists are delimited by nulls
--version print version number
-@@ -672,6 +673,15 @@ dit(bf(--include-from=FILE)) This specif
+@@ -675,6 +676,15 @@ dit(bf(--include-from=FILE)) This specif
from a file.
If em(FILE) is bf(-) the list will be read from standard input.
dit(bf(--files-from=FILE)) Using this option allows you to specify the
exact list of files to transfer (as read from the specified FILE or "-"
for stdin). It also tweaks the default behavior of rsync to make
-@@ -711,7 +721,8 @@ was located on the remote "src" host.
+@@ -714,7 +724,8 @@ was located on the remote "src" host.
dit(bf(-0, --from0)) This tells rsync that the filenames it reads from a
file are terminated by a null ('\0') character, not a NL, CR, or CR+LF.
It does not affect --cvs-exclude (since all names read from a .cvsignore
file are split on whitespace).
-@@ -998,6 +1009,12 @@ itemize(
+@@ -1001,6 +1012,12 @@ itemize(
it() if the pattern starts with "- " (a minus followed by a space)
then it is always considered an exclude pattern, even if specified as
part of an include option. The prefix is discarded before matching.
{
/* This function doesn't really get called in this test context, so
* just return 0. */
---- util.c 22 Apr 2004 09:58:21 -0000 1.137
+--- util.c 22 Apr 2004 22:17:15 -0000 1.138
+++ util.c 22 Apr 2004 10:32:54 -0000
@@ -476,7 +476,7 @@ static int exclude_server_path(char *arg
if (server_exclude_list.head) {
for (s = arg; (s = strchr(s, '/')) != NULL; ) {
*s = '\0';
-- if (check_exclude(&server_exclude_list, arg, 1)) {
+- if (check_exclude(&server_exclude_list, arg, 1) < 0) {
+ if (check_exclude(&server_exclude_list, arg, 1, 0) < 0) {
/* We must leave arg truncated! */
return 1;
[Updated to latest CVS source by Wayne Davison.]
--- syscall.c 18 Feb 2004 22:33:21 -0000 1.30
-+++ syscall.c 23 Feb 2004 20:28:56 -0000
-@@ -58,9 +58,14 @@
++++ syscall.c 22 Apr 2004 23:48:45 -0000
+@@ -58,9 +58,14 @@ int do_symlink(char *fname1, char *fname
#if HAVE_LINK
int do_link(char *fname1, char *fname2)
{
}
#endif
---
-ciao,
-Marco
-
---- io.c 2004-01-16 11:31:47.000000000 -0500
+--- io.c 16 Jan 2004 16:31:47 -0000 1.119
+++ io.c 2004-04-19 16:07:57.000000000 -0400
@@ -47,6 +47,7 @@ static time_t last_io;
static int no_flush;
total += ret;
---- options.c 2004-04-17 13:07:23.000000000 -0400
+--- options.c 17 Apr 2004 17:07:23 -0000 1.147
+++ options.c 2004-04-19 16:07:57.000000000 -0400
@@ -83,6 +83,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
goto oom;
args[ac++] = arg;
}
---- proto.h 2004-04-14 19:33:30.000000000 -0400
+--- proto.h 22 Apr 2004 09:58:09 -0000 1.189
+++ proto.h 2004-04-19 16:07:57.000000000 -0400
@@ -266,6 +266,7 @@ int u_strcmp(const char *cs1, const char
int unsafe_symlink(const char *dest, const char *src);
int cmp_modtime(time_t file1, time_t file2);
int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6);
void *_new_array(unsigned int size, unsigned long num);
---- rsync.yo 17 Apr 2004 18:40:16 -0000 1.159
+--- rsync.yo 22 Apr 2004 21:35:45 -0000 1.161
+++ rsync.yo 19 Apr 2004 20:50:45 -0000
@@ -346,6 +346,7 @@ verb(
--log-format=FORMAT log file transfers using specified format
--write-batch=PREFIX write batch fileset starting with PREFIX
--read-batch=PREFIX read batch fileset starting with PREFIX
-h, --help show this help screen
-@@ -880,6 +881,10 @@ of rsync transfers, blocks of data are s
+@@ -883,6 +884,10 @@ of rsync transfers, blocks of data are s
transfer was too fast, it will wait before sending the next data block. The
result is an average transfer rate equaling the specified limit. A value
of zero specifies no limit.
dit(bf(--write-batch=PREFIX)) Generate a set of files that can be
transferred as a batch update. Each filename in the set starts with
---- util.c 2004-04-17 13:06:03.000000000 -0400
+--- util.c 22 Apr 2004 22:17:15 -0000 1.138
+++ util.c 2004-04-19 16:07:57.000000000 -0400
@@ -1049,6 +1049,21 @@ int msleep(int t)
return True;
--- loadparm.c 4 Feb 2004 07:31:29 -0000 1.50
-+++ loadparm.c 27 Feb 2004 18:18:38 -0000
++++ loadparm.c 22 Apr 2004 23:49:29 -0000
@@ -119,6 +119,7 @@ typedef struct
char *comment;
char *lock_file;
FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
--- main.c 10 Feb 2004 03:54:47 -0000 1.192
-+++ main.c 27 Feb 2004 18:18:38 -0000
++++ main.c 22 Apr 2004 23:49:29 -0000
@@ -370,6 +370,12 @@ static void do_server_sender(int f_in, i
(long)getpid());
}
if (!relative_paths && !push_dir(dir)) {
rprintf(FERROR, "push_dir %s failed: %s (3)\n",
full_fname(dir), strerror(errno));
---- proto.h 14 Apr 2004 23:33:30 -0000 1.188
-+++ proto.h 15 Apr 2004 19:29:43 -0000
+--- proto.h 22 Apr 2004 09:58:09 -0000 1.189
++++ proto.h 22 Apr 2004 23:49:29 -0000
@@ -132,6 +132,7 @@ char *lp_comment(int );
char *lp_path(int );
char *lp_lock_file(int );
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff