mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-22 22:08:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that the error message for mkstemp() includes the full

Browse Source 
path of where we're trying to create the temp file.
This commit is contained in:
Wayne Davison
2003-08-04 21:00:57 +00:00
parent ca20c7fd62
commit 0c2ef5f42d
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
receiver.c
View File

@@ -206,14 +206,15 @@ static int get_tmpname(char *fnametmp, char *fname)
length = strlen(fnametmp);
fnametmp[length++] = '/';
fnametmp[length] = '\0'; /* always NULL terminated */
}
}
if ((f = strrchr(fname, '/'))) { /* extra () for gcc */
if ((f = strrchr(fname, '/')) != NULL) {
++f;
if (!tmpdir) {
length = f - fname;
/* copy up to and including the slash */
strlcpy(fnametmp, fname, length + 1);
} /* copy up to and including the slash */
}
} else {
f = fname;
}
@@ -222,8 +223,7 @@ static int get_tmpname(char *fnametmp, char *fname)
maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
if (maxname < 1)
{
if (maxname < 1) {
rprintf(FERROR, "temporary filename too long: %s\n", fname);
fnametmp[0] = '\0';
return 0;
@@ -466,7 +466,15 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
}
if (fd2 == -1) {
rprintf(FERROR,"mkstemp %s failed: %s\n",fnametmp,strerror(errno));
extern char curr_dir[];
char *p1, *p2;
if (*fnametmp == '.') {
p1 = curr_dir;
p2 = "/";
} else
p1 = p2 = "";
rprintf(FERROR, "mkstemp %s%s%s failed: %s\n",
p1, p2, fnametmp, strerror(errno));
receive_data(f_in,buf,-1,NULL,file->length);
if (buf) unmap_file(buf);
if (fd1 != -1) close(fd1);