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
Let's go with "delta transfer algorithm" (thanks, Matt).
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
c876325
..
06b5ae3
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-6,8
+6,9
@@
* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,8
+16,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* 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.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
@@
-34,8
+34,8
@@
extern int msg_fd_out;
extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
-extern int
preserve_uid
;
-extern int
preserve_gid
;
+extern int
uid_ndx
;
+extern int
gid_ndx
;
extern int stdout_format_has_i;
extern int stdout_format_has_o_or_i;
extern int logfile_format_has_i;
extern int stdout_format_has_i;
extern int stdout_format_has_o_or_i;
extern int logfile_format_has_i;
@@
-52,6
+52,7
@@
extern iconv_t ic_chck;
extern iconv_t ic_send, ic_recv;
#endif
extern char curr_dir[];
extern iconv_t ic_send, ic_recv;
#endif
extern char curr_dir[];
+extern char *module_dir;
extern unsigned int module_dirlen;
static int log_initialised;
extern unsigned int module_dirlen;
static int log_initialised;
@@
-481,18
+482,18
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
n = buf2;
break;
case 'U':
n = buf2;
break;
case 'U':
- strlcat(fmt, "
ld
", sizeof fmt);
+ strlcat(fmt, "
u
", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
snprintf(buf2, sizeof buf2, fmt,
-
preserve_uid ? (long)F_UID
(file) : 0);
+
uid_ndx ? F_OWNER
(file) : 0);
n = buf2;
break;
case 'G':
n = buf2;
break;
case 'G':
- if (!
preserve_gid || F_GID(file) == GID_NONE
)
+ if (!
gid_ndx || file->flags & FLAG_SKIP_GROUP
)
n = "DEFAULT";
else {
n = "DEFAULT";
else {
- strlcat(fmt, "
ld
", sizeof fmt);
+ strlcat(fmt, "
u
", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
snprintf(buf2, sizeof buf2, fmt,
-
(long)F_GID
(file));
+
F_GROUP
(file));
n = buf2;
}
break;
n = buf2;
}
break;
@@
-580,7
+581,7
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
n = timestring(time(NULL));
break;
case 'P':
n = timestring(time(NULL));
break;
case 'P':
- n =
lp_path(module_id)
;
+ n =
module_dir
;
break;
case 'u':
n = auth_user;
break;
case 'u':
n = auth_user;