X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/654175798bdbdd6403e10c8fa74e8586b3612ea1..ec9df38086a5d450e206ff95d006164e4e34f51b:/util.c?ds=sidebyside
diff --git a/util.c b/util.c
index 001694b1..59b3feb9 100644
--- a/util.c
+++ b/util.c
@@ -579,6 +579,55 @@ void clean_fname(char *name)
}
}
+/*
+ * Make path appear as if a chroot had occurred:
+ * 0. call clean_fname on it.
+ * 1. remove leading "/" (or replace with "." if at end)
+ * 2. remove leading ".." components
+ * 3. delete any other "
/.." (recursively)
+ * Return a malloc'ed copy.
+ * Contributed by Dave Dykstra
+ */
+
+char *sanitize_path(char *p)
+{
+ char *copy, *copyp;
+
+ clean_fname(p);
+
+ copy = (char *) malloc(strlen(p)+1);
+ copyp = copy;
+ while (*p != '\0') {
+ if ((*p == '/') && (copyp == copy)) {
+ /* remove leading slash */
+ p++;
+ }
+ else if ((*p == '.') && (*(p+1) == '.') &&
+ ((*(p+2) == '/') || (*(p+2) == '\0'))) {
+ /* remove .. followed by slash or end */
+ p += 2;
+ if (copyp != copy) {
+ /* backup the copy one level */
+ while ((--copyp != copy) && (*copyp == '/'))
+ /* skip trailing slashes */
+ ;
+ while ((copyp != copy) && (*copyp != '/'))
+ /* skip back through slash */
+ copyp--;
+ }
+ } else {
+ /* copy one component */
+ while (1) {
+ *copyp++ = *p++;
+ if ((*p == '\0') || (*(p-1) == '/'))
+ break;
+ }
+ }
+ }
+ *copyp = '\0';
+ return(copy);
+}
+
static char curr_dir[MAXPATHLEN];
@@ -716,52 +765,6 @@ int unsafe_symlink(char *dest, char *src)
return (depth < 0);
}
-/*
- * Make path appear as if a chroot had occurred:
- * 1. remove leading "/" (or replace with "." if at end)
- * 2. remove leading ".." components
- * 3. delete any other "/.." (recursively)
- * Return a malloc'ed copy.
- * Contributed by Dave Dykstra
- */
-
-char *sanitize_path(char *p)
-{
- char *copy, *copyp;
-
- copy = (char *) malloc(strlen(p)+1);
- copyp = copy;
- while (*p != '\0') {
- if ((*p == '/') && (copyp == copy)) {
- /* remove leading slash */
- p++;
- }
- else if ((*p == '.') && (*(p+1) == '.') &&
- ((*(p+2) == '/') || (*(p+2) == '\0'))) {
- /* remove .. followed by slash or end */
- p += 2;
- if (copyp != copy) {
- /* backup the copy one level */
- while ((--copyp != copy) && (*copyp == '/'))
- /* skip trailing slashes */
- ;
- while ((copyp != copy) && (*copyp != '/'))
- /* skip back through slash */
- copyp--;
- }
- } else {
- /* copy one component */
- while (1) {
- *copyp++ = *p++;
- if ((*p == '\0') || (*(p-1) == '/'))
- break;
- }
- }
- }
- *copyp = '\0';
- return(copy);
-}
-
/****************************************************************************
return the date and time as a string