- 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]!='/') {
- slprintf(fullpath,sizeof(fullpath),"%s/",bak_path);
- } else {
- slprintf(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;
+ char fbuf[MAXPATHLEN], *rel, *end, *p;
+ struct file_struct *file;
+ int len = backup_dir_len;
+ stat_x sx;
+
+ while (*fullpath == '.' && fullpath[1] == '/') {
+ fullpath += 2;
+ len -= 2;
+ }
+
+ if (strlcpy(fbuf, fullpath, sizeof fbuf) >= sizeof fbuf)
+ return -1;
+
+ rel = fbuf + len;
+ end = p = rel + strlen(rel);
+
+ /* Try to find an existing dir, starting from the deepest dir. */
+ while (1) {
+ if (--p == fbuf)
+ return -1;
+ if (*p == '/') {
+ *p = '\0';
+ if (mkdir_defmode(fbuf) == 0)
+ break;
+ if (errno != ENOENT) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir mkdir %s failed",
+ full_fname(fbuf));
+ return -1;
+ }
+ }
+ }
+
+ /* 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 (x_stat(rel, &sx.st, NULL) < 0) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir stat %s failed",
+ full_fname(rel));
+ } else {
+#ifdef SUPPORT_ACLS
+ sx.acc_acl = sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+ sx.xattr = NULL;
+#endif
+ if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
+ continue;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !S_ISLNK(file->mode)) {
+ get_acl(rel, &sx);
+ cache_acl(file, &sx);
+ free_acl(&sx);
+ }
+#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs) {
+ get_xattr(rel, &sx);
+ cache_xattr(file, &sx);
+ free_xattr(&sx);
+ }
+#endif
+ set_file_attrs(fbuf, file, NULL, NULL, 0);
+ unmake_file(file);
+ }
+ }
+ *p = '/';
+ p += strlen(p);
+ if (p == end)
+ break;
+ if (mkdir_defmode(fbuf) < 0) {
+ rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
+ full_fname(fbuf));
+ return -1;
+ }
+ }
+
+ return 0;