projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b04057
)
Fix logic error in previous commit
author
John Darrington
<john@darrington.wattle.id.au>
Sat, 17 Jan 2015 12:04:52 +0000
(13:04 +0100)
committer
John Darrington
<john@darrington.wattle.id.au>
Sat, 17 Jan 2015 12:04:52 +0000
(13:04 +0100)
src/data/make-file.c
patch
|
blob
|
history
diff --git
a/src/data/make-file.c
b/src/data/make-file.c
index e4520f411eba6c3c897317117a5801f2b5014065..9e84306cfb04a36d6482a3f740a03290ac9cd960 100644
(file)
--- a/
src/data/make-file.c
+++ b/
src/data/make-file.c
@@
-72,7
+72,6
@@
replace_file_start (const char *file_name, const char *mode,
saved_errno = errno;
msg (ME, _("Opening %s for writing: %s."),
file_name, strerror (saved_errno));
saved_errno = errno;
msg (ME, _("Opening %s for writing: %s."),
file_name, strerror (saved_errno));
- errno = saved_errno;
return NULL;
}
return NULL;
}
@@
-84,7
+83,6
@@
replace_file_start (const char *file_name, const char *mode,
msg (ME, _("Opening stream for %s: %s."),
file_name, strerror (saved_errno));
close (fd);
msg (ME, _("Opening stream for %s: %s."),
file_name, strerror (saved_errno));
close (fd);
- errno = saved_errno;
return NULL;
}
return NULL;
}
@@
-111,9
+109,9
@@
replace_file_start (const char *file_name, const char *mode,
rf->tmp_name = xasprintf ("%s.tmpXXXXXX", file_name);
if (gen_tempname (rf->tmp_name, 0, 0600, GT_NOCREATE) < 0)
{
rf->tmp_name = xasprintf ("%s.tmpXXXXXX", file_name);
if (gen_tempname (rf->tmp_name, 0, 0600, GT_NOCREATE) < 0)
{
- msg (ME, _("Creating temporary file to replace %s: %s."),
- rf->file_name, strerror (errno));
saved_errno = errno;
saved_errno = errno;
+ msg (ME, _("Creating temporary file to replace %s: %s."),
+ rf->file_name, strerror (saved_errno));
goto error;
}
goto error;
}
@@
-123,9
+121,9
@@
replace_file_start (const char *file_name, const char *mode,
break;
if (errno != EEXIST)
{
break;
if (errno != EEXIST)
{
- msg (ME, _("Creating temporary file %s: %s."),
- rf->tmp_name, strerror (errno));
saved_errno = errno;
saved_errno = errno;
+ msg (ME, _("Creating temporary file %s: %s."),
+ rf->tmp_name, strerror (saved_errno));
goto error;
}
free (rf->tmp_name);
goto error;
}
free (rf->tmp_name);
@@
-136,11
+134,11
@@
replace_file_start (const char *file_name, const char *mode,
*fp = fdopen (fd, mode);
if (*fp == NULL)
{
*fp = fdopen (fd, mode);
if (*fp == NULL)
{
+ saved_errno = errno;
msg (ME, _("Opening stream for temporary file %s: %s."),
msg (ME, _("Opening stream for temporary file %s: %s."),
- rf->tmp_name, strerror (errno));
+ rf->tmp_name, strerror (
saved_
errno));
close (fd);
unlink (rf->tmp_name);
close (fd);
unlink (rf->tmp_name);
- saved_errno = errno;
goto error;
}
goto error;
}