/*
- silcfileutil.c
+ silcfileutil.c
Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2002 Pekka Riikonen
+ Copyright (C) 1997 - 2005 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
/* $Id$ */
-#include "silcincludes.h"
+#include "silc.h"
/* Opens a file indicated by the filename `filename' with flags indicated
by the `flags'. */
int silc_file_open(const char *filename, int flags)
{
- int fd = open(filename, flags, 0600);
- return fd;
+ return silc_file_open_mode(filename, flags, 0600);
}
/* Opens a file indicated by the filename `filename' with flags indicated
return read(fd, (void *)buf, buf_len);
}
-/* Writes `buffer' of length of `len' to file descriptor `fd. */
+/* Writes `buffer' of length of `len' to file descriptor `fd'. */
int silc_file_write(int fd, const char *buffer, SilcUInt32 len)
{
/* Writes a buffer to the file. */
-int silc_file_writefile(const char *filename, const char *buffer,
+int silc_file_writefile(const char *filename, const char *buffer,
SilcUInt32 len)
{
int fd;
-
- if ((fd = creat(filename, 0644)) == -1) {
+ int flags = O_CREAT | O_WRONLY | O_TRUNC;
+
+#if defined(O_BINARY)
+ flags |= O_BINARY;
+#endif /* O_BINARY */
+
+ if ((fd = open(filename, flags, 0644)) == -1) {
SILC_LOG_ERROR(("Cannot open file %s for writing: %s", filename,
strerror(errno)));
return -1;
}
-
- if ((silc_file_write(fd, buffer, len)) == -1) {
+
+ if (silc_file_write(fd, buffer, len) == -1) {
SILC_LOG_ERROR(("Cannot write to file %s: %s", filename, strerror(errno)));
silc_file_close(fd);
return -1;
}
silc_file_close(fd);
-
+
return 0;
}
/* Writes a buffer to the file. If the file is created specific mode is
set to the file. */
-int silc_file_writefile_mode(const char *filename, const char *buffer,
+int silc_file_writefile_mode(const char *filename, const char *buffer,
SilcUInt32 len, int mode)
{
int fd;
-
- if ((fd = creat(filename, mode)) == -1) {
+ int flags = O_CREAT | O_WRONLY | O_TRUNC;
+
+#if defined(O_BINARY)
+ flags |= O_BINARY;
+#endif /* O_BINARY */
+
+ if ((fd = open(filename, flags, mode)) == -1) {
SILC_LOG_ERROR(("Cannot open file %s for writing: %s", filename,
strerror(errno)));
return -1;
}
-
+
if ((silc_file_write(fd, buffer, len)) == -1) {
SILC_LOG_ERROR(("Cannot write to file %s: %s", filename, strerror(errno)));
silc_file_close(fd);
}
silc_file_close(fd);
-
+
return 0;
}
silc_file_close(fd);
return NULL;
}
-
+
buffer = silc_calloc(filelen + 1, sizeof(char));
-
+
if ((silc_file_read(fd, buffer, filelen)) == -1) {
memset(buffer, 0, sizeof(buffer));
silc_file_close(fd);
return buffer;
}
-/* Returns files size. Returns 0 on error. */
+/* Returns the size of `filename'. Returns 0 on error. */
SilcUInt64 silc_file_size(const char *filename)
{