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
Call read_stream_flags() as soon as we open the batch file for
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
5129c35
..
8d05771
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-28,6
+28,9
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
+extern int dry_run;
+extern int module_id;
+extern int modify_window;
extern struct exclude_list_struct server_exclude_list;
int sanitize_paths = 0;
extern struct exclude_list_struct server_exclude_list;
int sanitize_paths = 0;
@@
-126,13
+129,12
@@
void overflow(char *str)
int set_modtime(char *fname, time_t modtime)
{
int set_modtime(char *fname, time_t modtime)
{
- extern int dry_run;
if (dry_run)
return 0;
if (verbose > 2) {
rprintf(FINFO, "set modtime of %s to (%ld) %s",
if (dry_run)
return 0;
if (verbose > 2) {
rprintf(FINFO, "set modtime of %s to (%ld) %s",
- fname, (long)
modtime,
+ fname, (long)modtime,
asctime(localtime(&modtime)));
}
asctime(localtime(&modtime)));
}
@@
-252,49
+254,46
@@
int copy_file(char *source, char *dest, mode_t mode)
ifd = do_open(source, O_RDONLY, 0);
if (ifd == -1) {
ifd = do_open(source, O_RDONLY, 0);
if (ifd == -1) {
- rprintf(FERROR,"open %s: %s\n",
- full_fname(source), strerror(errno));
+ rsyserr(FERROR, errno, "open %s", full_fname(source));
return -1;
}
if (robust_unlink(dest) && errno != ENOENT) {
return -1;
}
if (robust_unlink(dest) && errno != ENOENT) {
- rprintf(FERROR,"unlink %s: %s\n",
- full_fname(dest), strerror(errno));
+ rsyserr(FERROR, errno, "unlink %s", full_fname(dest));
return -1;
}
ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
if (ofd == -1) {
return -1;
}
ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
if (ofd == -1) {
- rprintf(FERROR,"open %s: %s\n",
- full_fname(dest), strerror(errno));
+ rsyserr(FERROR, errno, "open %s", full_fname(dest));
close(ifd);
return -1;
}
while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
if (full_write(ofd, buf, len) < 0) {
close(ifd);
return -1;
}
while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
if (full_write(ofd, buf, len) < 0) {
- rprintf(FERROR,"write %s: %s\n",
- full_fname(dest), strerror(errno));
+ rsyserr(FERROR, errno, "write %s", full_fname(dest));
close(ifd);
close(ofd);
return -1;
}
}
close(ifd);
close(ofd);
return -1;
}
}
- if (close(ifd) < 0) {
- rprintf(FINFO, "close failed on %s: %s\n",
- full_fname(source), strerror(errno));
+ if (len < 0) {
+ rsyserr(FERROR, errno, "read %s", full_fname(source));
+ close(ifd);
+ close(ofd);
+ return -1;
}
}
- if (close(ofd) < 0) {
- rprintf(FERROR, "close failed on %s: %s\n",
- full_fname(dest), strerror(errno));
- return -1;
+ if (close(ifd) < 0) {
+ rsyserr(FINFO, errno, "close failed on %s",
+ full_fname(source));
}
}
- if (
len
< 0) {
- r
printf(FERROR,"read %s: %s\n
",
- full_fname(
source), strerror(errno
));
+ if (
close(ofd)
< 0) {
+ r
syserr(FERROR, errno, "close failed on %s
",
+ full_fname(
dest
));
return -1;
}
return -1;
}
@@
-440,7
+439,8
@@
void kill_all(int sig)
int name_to_uid(char *name, uid_t *uid)
{
struct passwd *pass;
int name_to_uid(char *name, uid_t *uid)
{
struct passwd *pass;
- if (!name || !*name) return 0;
+ if (!name || !*name)
+ return 0;
pass = getpwnam(name);
if (pass) {
*uid = pass->pw_uid;
pass = getpwnam(name);
if (pass) {
*uid = pass->pw_uid;
@@
-453,7
+453,8
@@
int name_to_uid(char *name, uid_t *uid)
int name_to_gid(char *name, gid_t *gid)
{
struct group *grp;
int name_to_gid(char *name, gid_t *gid)
{
struct group *grp;
- if (!name || !*name) return 0;
+ if (!name || !*name)
+ return 0;
grp = getgrnam(name);
if (grp) {
*gid = grp->gr_gid;
grp = getgrnam(name);
if (grp) {
*gid = grp->gr_gid;
@@
-494,75
+495,91
@@
static int exclude_server_path(char *arg)
return 0;
}
return 0;
}
-static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
+static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
+ int *maxargs_ptr)
{
{
+ char **argv = *argv_ptr;
+ int argc = *argc_ptr;
+ int maxargs = *maxargs_ptr;
#if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H))
#if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H))
- if (!*s) s = ".";
- s = argv[*argc] = strdup(s);
+ if (argc == maxargs) {
+ maxargs += MAX_ARGS;
+ if (!(argv = realloc_array(argv, char *, maxargs)))
+ out_of_memory("glob_expand_one");
+ *argv_ptr = argv;
+ *maxargs_ptr = maxargs;
+ }
+ if (!*s)
+ s = ".";
+ s = argv[argc++] = strdup(s);
exclude_server_path(s);
exclude_server_path(s);
- (*argc)++;
#else
#else
- extern int sanitize_paths;
glob_t globbuf;
int i;
glob_t globbuf;
int i;
- if (!*s) s = ".";
+ if (maxargs <= argc)
+ return;
+ if (!*s)
+ s = ".";
- s =
argv[*argc] =
strdup(s);
- if (sanitize_paths)
{
+ s = strdup(s);
+ if (sanitize_paths)
sanitize_path(s, NULL);
sanitize_path(s, NULL);
- }
memset(&globbuf, 0, sizeof globbuf);
if (!exclude_server_path(s))
glob(s, 0, NULL, &globbuf);
memset(&globbuf, 0, sizeof globbuf);
if (!exclude_server_path(s))
glob(s, 0, NULL, &globbuf);
- if (globbuf.gl_pathc == 0) {
- (*argc)++;
- globfree(&globbuf);
- return;
+ if (MAX((int)globbuf.gl_pathc, 1) > maxargs - argc) {
+ maxargs += globbuf.gl_pathc + MAX_ARGS;
+ if (!(argv = realloc_array(argv, char *, maxargs)))
+ out_of_memory("glob_expand_one");
+ *argv_ptr = argv;
+ *maxargs_ptr = maxargs;
}
}
- for (i = 0; i < maxargs - *argc && i < (int)globbuf.gl_pathc; i++) {
- if (i == 0)
- free(s);
- argv[*argc + i] = strdup(globbuf.gl_pathv[i]);
- if (!argv[*argc + i])
- out_of_memory("glob_expand");
+ if (globbuf.gl_pathc == 0)
+ argv[argc++] = s;
+ else {
+ int j = globbuf.gl_pathc;
+ free(s);
+ for (i = 0; i < j; i++) {
+ if (!(argv[argc++] = strdup(globbuf.gl_pathv[i])))
+ out_of_memory("glob_expand_one");
+ }
}
globfree(&globbuf);
}
globfree(&globbuf);
- *argc += i;
#endif
#endif
+ *argc_ptr = argc;
}
/* This routine is only used in daemon mode. */
}
/* This routine is only used in daemon mode. */
-void glob_expand(char *base1, char **
argv, int *argc, int maxargs
)
+void glob_expand(char *base1, char **
*argv_ptr, int *argc_ptr, int *maxargs_ptr
)
{
{
- char *s =
argv[*argc
];
+ char *s =
(*argv_ptr)[*argc_ptr
];
char *p, *q;
char *base = base1;
int base_len = strlen(base);
char *p, *q;
char *base = base1;
int base_len = strlen(base);
- if (!s || !*s) return;
+ if (!s || !*s)
+ return;
if (strncmp(s, base, base_len) == 0)
s += base_len;
if (strncmp(s, base, base_len) == 0)
s += base_len;
- s = strdup(s);
-
if (!s)
out_of_memory("glob_expand");
+ if (!(s = strdup(s)))
+
out_of_memory("glob_expand");
- if (asprintf(&base," %s/", base1) <= 0) out_of_memory("glob_expand");
+ if (asprintf(&base," %s/", base1) <= 0)
+ out_of_memory("glob_expand");
base_len++;
base_len++;
- q = s;
- while ((p = strstr(q,base)) != NULL && *argc < maxargs) {
- /* split it at this point */
-
*p = 0
;
- glob_expand_one(q, argv, argc, maxargs);
-
q = p + base_len
;
+ for (q = s; *q; q = p + base_len) {
+ if ((p = strstr(q, base)) != NULL)
+
*p = '\0';
/* split it at this point */
+
glob_expand_one(q, argv_ptr, argc_ptr, maxargs_ptr)
;
+ if (!p)
+
break
;
}
}
- if (*q && *argc < maxargs)
- glob_expand_one(q, argv, argc, maxargs);
-
free(s);
free(base);
}
free(s);
free(base);
}
@@
-573,8
+590,8
@@
void glob_expand(char *base1, char **argv, int *argc, int maxargs)
void strlower(char *s)
{
while (*s) {
void strlower(char *s)
{
while (*s) {
- if (isupper(*
(unsigned char *)
s))
- *s = tolower(*
(unsigned char *)
s);
+ if (isupper(*
(unsigned char *)
s))
+ *s = tolower(*
(unsigned char *)
s);
s++;
}
}
s++;
}
}
@@
-637,7
+654,8
@@
void clean_fname(char *name)
int l;
int modified = 1;
int l;
int modified = 1;
- if (!name) return;
+ if (!name)
+ return;
while (modified) {
modified = 0;
while (modified) {
modified = 0;
@@
-706,9
+724,12
@@
void sanitize_path(char *p, char *reldir)
int allowdotdot = 0;
if (reldir) {
int allowdotdot = 0;
if (reldir) {
-
depth++
;
+
int new_component = 1
;
while (*reldir) {
while (*reldir) {
- if (*reldir++ == '/') {
+ if (*reldir++ == '/')
+ new_component = 1;
+ else if (new_component) {
+ new_component = 0;
depth++;
}
}
depth++;
}
}
@@
-884,9
+905,8
@@
int pop_dir(char *dir)
* The string " (in MODNAME)" may also be appended. The returned pointer
* remains valid until the next time full_fname() is called.
**/
* The string " (in MODNAME)" may also be appended. The returned pointer
* remains valid until the next time full_fname() is called.
**/
-char *full_fname(char *fn)
+char *full_fname(c
onst c
har *fn)
{
{
- extern int module_id;
static char *result = NULL;
char *m1, *m2, *m3;
char *p1, *p2;
static char *result = NULL;
char *m1, *m2, *m3;
char *p1, *p2;
@@
-971,7
+991,8
@@
int unsafe_symlink(const char *dest, const char *src)
int depth = 0;
/* all absolute and null symlinks are unsafe */
int depth = 0;
/* all absolute and null symlinks are unsafe */
- if (!dest || !*dest || *dest == '/') return 1;
+ if (!dest || !*dest || *dest == '/')
+ return 1;
/* find out what our safety margin is */
for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) {
/* find out what our safety margin is */
for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) {
@@
-1039,7
+1060,6
@@
int msleep(int t)
struct timeval tval, t1, t2;
gettimeofday(&t1, NULL);
struct timeval tval, t1, t2;
gettimeofday(&t1, NULL);
- gettimeofday(&t2, NULL);
while (tdiff < t) {
tval.tv_sec = (t-tdiff)/1000;
while (tdiff < t) {
tval.tv_sec = (t-tdiff)/1000;
@@
-1070,13
+1090,13
@@
int msleep(int t)
**/
int cmp_modtime(time_t file1, time_t file2)
{
**/
int cmp_modtime(time_t file1, time_t file2)
{
- extern int modify_window;
-
if (file2 > file1) {
if (file2 > file1) {
- if (file2 - file1 <= modify_window) return 0;
+ if (file2 - file1 <= modify_window)
+ return 0;
return -1;
}
return -1;
}
- if (file1 - file2 <= modify_window) return 0;
+ if (file1 - file2 <= modify_window)
+ return 0;
return 1;
}
return 1;
}