projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pspp-convert: Add -a and -l options to search for a password.
[pspp]
/
src
/
data
/
make-file.c
diff --git
a/src/data/make-file.c
b/src/data/make-file.c
index af1dc5742b6849f8e2c1d73c014d5ac74b30f898..78875746f24ea2ff99860c5af75825da78e60fe4 100644
(file)
--- a/
src/data/make-file.c
+++ b/
src/data/make-file.c
@@
-45,7
+45,6
@@
#if defined _WIN32 || defined __WIN32__
#define WIN32_LEAN_AND_MEAN /* avoid including junk */
#if defined _WIN32 || defined __WIN32__
#define WIN32_LEAN_AND_MEAN /* avoid including junk */
-#define UNICODE 1
#include <windows.h>
#define TS_stat _stat
#define Tunlink _wunlink
#include <windows.h>
#define TS_stat _stat
#define Tunlink _wunlink
@@
-149,11
+148,11
@@
Trename (TCHAR const *src, TCHAR const *dst)
return -1;
}
return -1;
}
-static TCHAR *
+TCHAR *
convert_to_filename_encoding (const char *s, size_t len, const char *current_encoding)
{
const char *enc = current_encoding;
convert_to_filename_encoding (const char *s, size_t len, const char *current_encoding)
{
const char *enc = current_encoding;
- if (
0 == strcmp (current_encoding
, "Auto"))
+ if (
NULL == enc || 0 == strcmp (enc
, "Auto"))
enc = locale_charset ();
return (TCHAR *) recode_string ("UTF-16LE", enc, s, len);
enc = locale_charset ();
return (TCHAR *) recode_string ("UTF-16LE", enc, s, len);
@@
-161,17
+160,16
@@
convert_to_filename_encoding (const char *s, size_t len, const char *current_enc
#else
#else
-typedef char TCHAR;
#define TS_stat stat
#define Trename rename
#define Tunlink unlink
#define Topen open
#define Tstat stat
#define TS_stat stat
#define Trename rename
#define Tunlink unlink
#define Topen open
#define Tstat stat
-static TCHAR *
+TCHAR *
convert_to_filename_encoding (const char *s, size_t len UNUSED, const char *current_encoding UNUSED)
{
convert_to_filename_encoding (const char *s, size_t len UNUSED, const char *current_encoding UNUSED)
{
- /* Non-windows systems don't care about the encoding.
+ /* Non-windows systems don't care about the encoding.
The string is copied here, to be consistent with the w32 case. */
return xstrdup (s);
}
The string is copied here, to be consistent with the w32 case. */
return xstrdup (s);
}
@@
-188,7
+186,7
@@
struct replace_file
char *tmp_name_verbatim;
const char *file_name_verbatim;
};
char *tmp_name_verbatim;
const char *file_name_verbatim;
};
-
+
static struct ll_list all_files = LL_INITIALIZER (all_files);
static void free_replace_file (struct replace_file *);
static struct ll_list all_files = LL_INITIALIZER (all_files);
static void free_replace_file (struct replace_file *);
@@
-216,7
+214,7
@@
replace_file_start (const struct file_handle *fh, const char *mode,
fd = Topen (Tfile_name, O_WRONLY);
if (fd < 0)
{
fd = Topen (Tfile_name, O_WRONLY);
if (fd < 0)
{
- saved_errno = errno;
+ saved_errno = errno;
msg (ME, _("Opening %s for writing: %s."),
file_name, strerror (saved_errno));
free (Tfile_name);
msg (ME, _("Opening %s for writing: %s."),
file_name, strerror (saved_errno));
free (Tfile_name);
@@
-227,7
+225,7
@@
replace_file_start (const struct file_handle *fh, const char *mode,
*fp = fdopen (fd, mode);
if (*fp == NULL)
{
*fp = fdopen (fd, mode);
if (*fp == NULL)
{
- saved_errno = errno;
+ saved_errno = errno;
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);