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
Do some simple tests with various read-only and set[ug]id files.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
563f043
..
d7d22af
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-23,7
+23,6
@@
extern int sanitize_paths;
extern int select_timeout;
extern int sanitize_paths;
extern int select_timeout;
-extern char curr_dir[MAXPATHLEN];
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
@@
-729,17
+728,17
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
if (sanitize_paths) {
int i;
for (i = *argc; i-- > 0; )
if (sanitize_paths) {
int i;
for (i = *argc; i-- > 0; )
- (*argv)[i] =
alloc_sanitize_path(
(*argv)[i], NULL);
+ (*argv)[i] =
sanitize_path(NULL,
(*argv)[i], NULL);
if (tmpdir)
if (tmpdir)
- tmpdir =
alloc_sanitize_path(tmpdir, curr_dir
);
+ tmpdir =
sanitize_path(NULL, tmpdir, ""
);
if (partial_dir)
if (partial_dir)
- partial_dir =
alloc_sanitize_path(partial_dir, curr_dir
);
+ partial_dir =
sanitize_path(NULL, partial_dir, ""
);
if (compare_dest)
if (compare_dest)
- compare_dest =
alloc_sanitize_path(compare_dest, curr_dir
);
+ compare_dest =
sanitize_path(NULL, compare_dest, ""
);
if (backup_dir)
if (backup_dir)
- backup_dir =
alloc_sanitize_path(backup_dir, curr_dir
);
+ backup_dir =
sanitize_path(NULL, backup_dir, ""
);
if (files_from)
if (files_from)
- files_from =
alloc_sanitize_path(files_from, curr_dir
);
+ files_from =
sanitize_path(NULL, files_from, ""
);
}
if (server_exclude_list.head && !am_sender) {
struct exclude_list_struct *elp = &server_exclude_list;
}
if (server_exclude_list.head && !am_sender) {
struct exclude_list_struct *elp = &server_exclude_list;