Commit bf4e725d authored by Martin Pool's avatar Martin Pool

Code that was meant to trim trailing slashes from mkdir() paths

actually did not; fix it.
parent 663717f4
...@@ -111,19 +111,27 @@ int do_rename(char *fname1, char *fname2) ...@@ -111,19 +111,27 @@ int do_rename(char *fname1, char *fname2)
} }
void trim_trailing_slashes(char *name)
{
char *p;
/* Some BSD systems cannot make a directory if the name
* contains a trailing slash.
* <http://www.opensource.apple.com/bugs/X/BSD%20Kernel/2734739.html> */
if (!*name)
return; /* empty string */
p = strchr(name, '\0') - 1;
while (p == '/') {
p-- = '\0';
}
}
int do_mkdir(char *fname, mode_t mode) int do_mkdir(char *fname, mode_t mode)
{ {
int l;
if (dry_run) if (dry_run)
return 0; return 0;
CHECK_RO; CHECK_RO;
trim_trailing_slashes(fname);
/* Some BSD systems cannot make a directory if the name
* contains a trailing slash.
* <http://www.opensource.apple.com/bugs/X/BSD%20Kernel/2734739.html> */
if ((l = strlen(fname)) && (fname[l-1] == '/'))
fname[l-1] = '/';
return mkdir(fname, mode); return mkdir(fname, mode);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment