projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
help-menu.c: start the default html browser via wscript instead of cmd
[pspp]
/
src
/
data
/
encrypted-file.c
diff --git
a/src/data/encrypted-file.c
b/src/data/encrypted-file.c
index b90126ed260be18b2163fe9c3a3ff63d17e15a0c..f1074b4c1d159d4ad805ea9b887f40400114e20f 100644
(file)
--- a/
src/data/encrypted-file.c
+++ b/
src/data/encrypted-file.c
@@
-17,6
+17,7
@@
#include <config.h>
#include "data/encrypted-file.h"
#include <config.h>
#include "data/encrypted-file.h"
+#include "data/file-handle-def.h"
#include <errno.h>
#include <stdlib.h>
#include <errno.h>
#include <stdlib.h>
@@
-60,7
+61,7
@@
static bool fill_buffer (struct encrypted_file *);
If FILENAME cannot be open or read, returns a negative errno value. */
int
If FILENAME cannot be open or read, returns a negative errno value. */
int
-encrypted_file_open (struct encrypted_file **fp, const
char *filename
)
+encrypted_file_open (struct encrypted_file **fp, const
struct file_handle *fh
)
{
struct encrypted_file *f;
char header[36 + 16];
{
struct encrypted_file *f;
char header[36 + 16];
@@
-69,11
+70,11
@@
encrypted_file_open (struct encrypted_file **fp, const char *filename)
f = xmalloc (sizeof *f);
f->error = 0;
f = xmalloc (sizeof *f);
f->error = 0;
- f->file = fn_open (f
ilename
, "rb");
+ f->file = fn_open (f
h
, "rb");
if (f->file == NULL)
{
msg (ME, _("An error occurred while opening `%s': %s."),
if (f->file == NULL)
{
msg (ME, _("An error occurred while opening `%s': %s."),
- f
ilename
, strerror (errno));
+ f
h_get_file_name (fh)
, strerror (errno));
retval = -errno;
goto error;
}
retval = -errno;
goto error;
}
@@
-84,7
+85,7
@@
encrypted_file_open (struct encrypted_file **fp, const char *filename)
int error = feof (f->file) ? 0 : errno;
if (error)
msg (ME, _("An error occurred while reading `%s': %s."),
int error = feof (f->file) ? 0 : errno;
if (error)
msg (ME, _("An error occurred while reading `%s': %s."),
- f
ilename
, strerror (error));
+ f
h_get_file_name (fh)
, strerror (error));
retval = -error;
goto error;
}
retval = -error;
goto error;
}
@@
-107,7
+108,7
@@
encrypted_file_open (struct encrypted_file **fp, const char *filename)
error:
if (f->file)
error:
if (f->file)
- fn_close (f
ilename
, f->file);
+ fn_close (f
h
, f->file);
free (f);
*fp = NULL;
free (f);
*fp = NULL;