#endif
static int separate_path_and_file(JCR *jcr, char *fname, char *ofile);
-static int path_already_seen(char *path, int pnl);
+static int path_already_seen(JCR *jcr, char *path, int pnl);
/*
* files.
*
*/
-int create_file(JCR *jcr, ATTR *attr, BFILE *ofd, int replace)
+int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
{
int new_mode, parent_mode, mode;
uid_t uid;
gid_t gid;
int pnl;
+ bool exists = false;
+ struct stat mstatp;
+
+ if (is_win32_stream(attr->data_stream)) {
+ set_win32_backup(bfd);
+ } else {
+ set_portable_backup(bfd);
+ }
- binit(ofd);
new_mode = attr->statp.st_mode;
Dmsg2(300, "newmode=%x file=%s\n", new_mode, attr->ofname);
parent_mode = S_IWUSR | S_IXUSR | new_mode;
uid = attr->statp.st_uid;
Dmsg2(400, "Replace=%c %d\n", (char)replace, replace);
- /* If not always replacing, do a stat and decide */
- if (replace != REPLACE_ALWAYS) {
- struct stat mstatp;
- if (lstat(attr->ofname, &mstatp) == 0) {
- switch (replace) {
- case REPLACE_IFNEWER:
- if (attr->statp.st_mtime <= mstatp.st_mtime) {
- Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Not newer: %s\n"), attr->ofname);
- return CF_SKIP;
- }
- break;
- case REPLACE_IFOLDER:
- if (attr->statp.st_mtime >= mstatp.st_mtime) {
- Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Not older: %s\n"), attr->ofname);
- return CF_SKIP;
- }
- break;
- case REPLACE_NEVER:
- Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Already exists: %s\n"), attr->ofname);
+ if (lstat(attr->ofname, &mstatp) == 0) {
+ exists = true;
+ switch (replace) {
+ case REPLACE_IFNEWER:
+ if (attr->statp.st_mtime <= mstatp.st_mtime) {
+ Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Not newer: %s\n"), attr->ofname);
return CF_SKIP;
}
+ break;
+
+ case REPLACE_IFOLDER:
+ if (attr->statp.st_mtime >= mstatp.st_mtime) {
+ Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Not older: %s\n"), attr->ofname);
+ return CF_SKIP;
+ }
+ break;
+
+ case REPLACE_NEVER:
+ Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Already exists: %s\n"), attr->ofname);
+ return CF_SKIP;
+
+ case REPLACE_ALWAYS:
+ break;
}
}
switch (attr->type) {
case FT_SPEC:
case FT_REGE: /* empty file */
case FT_REG: /* regular file */
+ if (exists) {
+ /* Get rid of old copy */
+ if (unlink(attr->ofname) == -1) {
+ Jmsg(jcr, M_ERROR, 0, _("File %s already exists and could not be replaced. ERR=%s.\n"),
+ attr->ofname, strerror(errno));
+ /* Continue despite error */
+ }
+ }
/*
* Here we do some preliminary work for all the above
* types to create the path to the file if it does
savechr = attr->ofname[pnl];
attr->ofname[pnl] = 0; /* terminate path */
- if (!path_already_seen(attr->ofname, pnl)) {
+ if (!path_already_seen(jcr, attr->ofname, pnl)) {
Dmsg1(50, "Make path %s\n", attr->ofname);
/*
* If we need to make the directory, ensure that it is with
* exists. Normally, this should do nothing.
*/
if (make_path(jcr, attr->ofname, parent_mode, parent_mode, uid, gid, 1, NULL) != 0) {
- Dmsg1(0, "Could not make path. %s\n", attr->ofname);
+ Dmsg1(10, "Could not make path. %s\n", attr->ofname);
+ attr->ofname[pnl] = savechr; /* restore full name */
return CF_ERROR;
}
}
mode |= O_CTG; /* set contiguous bit if needed */
}
Dmsg1(50, "Create file: %s\n", attr->ofname);
- if ((bopen(ofd, attr->ofname, mode, S_IRUSR | S_IWUSR)) < 0) {
+ if (is_bopen(bfd)) {
+ Jmsg1(jcr, M_ERROR, 0, "bpkt already open fid=%d\n", bfd->fid);
+ }
+ if ((bopen(bfd, attr->ofname, mode, S_IRUSR | S_IWUSR)) < 0) {
Jmsg2(jcr, M_ERROR, 0, _("Could not create %s: ERR=%s\n"),
- attr->ofname, berror(ofd));
+ attr->ofname, berror(bfd));
return CF_ERROR;
}
return CF_EXTRACT;
} else {
tid = NULL;
}
- if ((bopen(ofd, attr->ofname, mode, 0)) < 0) {
+ if (is_bopen(bfd)) {
+ Jmsg1(jcr, M_ERROR, 0, "bpkt already open fid=%d\n", bfd->fid);
+ }
+ if ((bopen(bfd, attr->ofname, mode, 0)) < 0) {
Jmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"),
- attr->ofname, berror(ofd));
+ attr->ofname, berror(bfd));
stop_thread_timer(tid);
return CF_ERROR;
}
} /* End inner switch */
case FT_DIR:
- Dmsg2(300, "Make dir mode=%o dir=%s\n", new_mode, attr->ofname);
+ Dmsg2(200, "Make dir mode=%o dir=%s\n", new_mode, attr->ofname);
if (make_path(jcr, attr->ofname, new_mode, parent_mode, uid, gid, 0, NULL) != 0) {
return CF_ERROR;
}
* directory so that the security info will be read
* and saved.
*/
- if (is_win32_backup()) {
- if ((bopen(ofd, attr->ofname, O_WRONLY|O_BINARY, 0)) < 0) {
+ if (!is_portable_backup(bfd)) {
+ if (is_bopen(bfd)) {
+ Jmsg1(jcr, M_ERROR, 0, "bpkt already open fid=%d\n", bfd->fid);
+ }
+ if ((bopen(bfd, attr->ofname, O_WRONLY|O_BINARY, 0)) < 0) {
Jmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"),
- attr->ofname, berror(ofd));
+ attr->ofname, berror(bfd));
return CF_ERROR;
}
return CF_EXTRACT;
return pnl;
}
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-
/*
* Primitive caching of path to prevent recreating a pathname
* each time as long as we remain in the same directory.
*/
-static int path_already_seen(char *path, int pnl)
+static int path_already_seen(JCR *jcr, char *path, int pnl)
{
- static int cached_pnl = 0;
- static char cached_path[1000];
-
- P(mutex);
- if (cached_pnl == pnl && strcmp(path, cached_path) == 0) {
- V(mutex);
- return 1;
+ if (!jcr->cached_path) {
+ jcr->cached_path = get_pool_memory(PM_FNAME);
}
- if (pnl < (int)(sizeof(cached_path)-1)) {
- strcpy(cached_path, path);
- cached_pnl = pnl;
+ if (jcr->cached_pnl == pnl && strcmp(path, jcr->cached_path) == 0) {
+ return 1;
}
- V(mutex);
+ pm_strcpy(&jcr->cached_path, path);
+ jcr->cached_pnl = pnl;
return 0;
}
projects / bacula / bacula / blobdiff