- STRUCT_STAT st;
- STRUCT_STAT *st2;
- char fullpath[MAXPATHLEN];
- extern int orig_umask;
- char *p;
- char *q;
-
- while(strncmp(bak_path,"./",2)==0) bak_path += 2;
-
- if(bak_path[strlen(bak_path)-1]!='/') {
- snprintf(fullpath,sizeof(fullpath),"%s/",bak_path);
- } else {
- snprintf(fullpath,sizeof(fullpath),"%s",bak_path);
- }
- p=fullpath;
- q=&fullpath[strlen(fullpath)]; /* End of bak_path string */
- strcat(fullpath,fname);
-
- /* Make the directories */
- while ((p=strchr(p,'/'))) {
- *p = 0;
- if(do_lstat(fullpath,&st)!=0) {
- do_mkdir(fullpath,0777 & ~orig_umask);
- if(p>q) {
- if(do_lstat(q,&st)!=0) {
- rprintf(FERROR,"make_bak_dir stat %s : %s\n",fullpath,strerror(errno));
- } else {
- st2=&st;
- set_modtime(fullpath,st2->st_mtime);
- if(do_lchown(fullpath,st2->st_uid,st2->st_gid)!=0) {
- rprintf(FERROR,"make_bak_dir chown %s : %s\n",fullpath,strerror(errno));
- };
- if(do_chmod(fullpath,st2->st_mode)!=0) {
- rprintf(FERROR,"make_bak_dir failed to set permissions on %s : %s\n",fullpath,strerror(errno));
- };
- };
- }
- };
- *p = '/';
- p++;
- }
- return 0;
+ STRUCT_STAT st;
+ char *rel = fullpath + backup_dir_len;
+ char *end = rel + strlen(rel);
+ char *p = end;
+
+ while (strncmp(fullpath, "./", 2) == 0)
+ fullpath += 2;
+
+ /* Try to find an existing dir, starting from the deepest dir. */
+ while (1) {
+ if (--p == fullpath) {
+ p += strlen(p);
+ goto failure;
+ }
+ if (*p == '/') {
+ *p = '\0';
+ if (do_mkdir(fullpath, 0777 & ~orig_umask) == 0)
+ break;
+ if (errno != ENOENT) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir mkdir %s failed",
+ full_fname(fullpath));
+ goto failure;
+ }
+ }
+ }
+
+ /* Make all the dirs that we didn't find on the way here. */
+ while (1) {
+ if (p >= rel) {
+ /* Try to transfer the directory settings of the
+ * actual dir that the files are coming from. */
+ if (do_stat(rel, &st) < 0) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir stat %s failed",
+ full_fname(rel));
+ } else {
+ do_lchown(fullpath, st.st_uid, st.st_gid);
+ do_chmod(fullpath, st.st_mode);
+ }
+ }
+ *p = '/';
+ p += strlen(p);
+ if (p == end)
+ break;
+ if (do_mkdir(fullpath, 0777 & ~orig_umask) < 0) {
+ rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
+ full_fname(fullpath));
+ goto failure;
+ }
+ }
+ return 0;
+
+ failure:
+ while (p != end) {
+ *p = '/';
+ p += strlen(p);
+ }
+ return -1;