trailing slash. This caused a problem when using "use chroot" and sources
that contained a trailing slash (which prevents the last filename component
of the source from being included in the destination). Instead, have
sanitize_path() remove "." components and duplicated slashes ("//") itself.
/*
* Make path appear as if a chroot had occurred:
/*
* 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 "<dir>/.." (recursively)
* 1. remove leading "/" (or replace with "." if at end)
* 2. remove leading ".." components
* 3. delete any other "<dir>/.." (recursively)
+ * While we're at it, remove double slashes and "." components like
+ * clean_fname does(), but DON'T remove a trailing slash because that
+ * is sometimes significant on command line arguments.
* Return a malloc'ed copy.
* Contributed by Dave Dykstra <dwd@bell-labs.com>
*/
* Return a malloc'ed copy.
* Contributed by Dave Dykstra <dwd@bell-labs.com>
*/
copy = (char *) malloc(strlen(p)+1);
copyp = copy;
copy = (char *) malloc(strlen(p)+1);
copyp = copy;
+ while (*p == '/') {
+ /* remove leading slashes */
+ p++;
+ }
- if ((*p == '/') && (copyp == copy)) {
- /* remove leading slash */
- p++;
- }
- else if ((*p == '.') && (*(p+1) == '.') &&
+ /* this loop iterates once per filename component in p.
+ * both p (and copyp if the original had a slash) should
+ * always be left pointing after a slash
+ */
+ if ((*p == '.') && ((*(p+1) == '/') || (*(p+1) == '\0'))) {
+ /* skip "." component */
+ while (*++p == '/') {
+ /* skip following slashes */
+ ;
+ }
+ } else if ((*p == '.') && (*(p+1) == '.') &&
((*(p+2) == '/') || (*(p+2) == '\0'))) {
((*(p+2) == '/') || (*(p+2) == '\0'))) {
- /* remove .. followed by slash or end */
+ /* skip ".." component followed by slash or end */
- /* backup the copy one level */
- while ((--copyp != copy) && (*copyp == '/'))
- /* skip trailing slashes */
- ;
- while ((copyp != copy) && (*copyp != '/'))
- /* skip back through slash */
+ /* back up the copy one level */
+ --copyp; /* now pointing at slash */
+ while ((copyp > copy) && (*(copyp - 1) != '/')) {
+ /* skip back up to slash */
- /* copy one component */
+ /* copy one component through next slash */
- if ((*p == '\0') || (*(p-1) == '/'))
+ if ((*p == '\0') || (*(p-1) == '/')) {
+ while (*p == '/') {
+ /* skip multiple slashes */
+ p++;
+ }
+ if (copyp == copy) {
+ /* ended up with nothing, so put in "." component */
+ *copyp++ = '.';
+ }
*copyp = '\0';
return(copy);
}
*copyp = '\0';
return(copy);
}