aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-file-utils.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-07-08 04:58:24 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-07-08 04:58:24 +0800
commit300101f4707c7c0a0e29d24527a93afe0f77a2c7 (patch)
treeaac6a6bde47fb918f72abdac77d6e33f3759a6c4 /camel/camel-file-utils.c
parent393aafe6b21dfc482b41a08297292ff0e8b05037 (diff)
downloadgsoc2013-evolution-300101f4707c7c0a0e29d24527a93afe0f77a2c7.tar.gz
gsoc2013-evolution-300101f4707c7c0a0e29d24527a93afe0f77a2c7.tar.zst
gsoc2013-evolution-300101f4707c7c0a0e29d24527a93afe0f77a2c7.zip
Use camel_mkdir().
2003-07-07 Jeffrey Stedfast <fejj@ximian.com> * providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): Use camel_mkdir(). * providers/imap/camel-imap-folder.c (camel_imap_folder_new): Use camel_mkdir(). * camel-session.c (get_storage_path): Use camel_mkdir(). * camel-store.c (camel_mkdir_hier): Removed. * camel-data-cache.c (camel_data_cache_new): Updated to use camel_mkdir(). (data_cache_path): Same. * camel-file-utils.c (camel_mkdir): Renamed and documented. (camel_file_util_safe_filename): Documented. (camel_read): Moved here from camel-io.c (camel_write): Same. * camel-io.[c,h]: Removed. * camel-uid-cache.c (camel_uid_cache_new): Use the camel-file-utils.c version of mkdir. svn path=/trunk/; revision=21753
Diffstat (limited to 'camel/camel-file-utils.c')
-rw-r--r--camel/camel-file-utils.c220
1 files changed, 202 insertions, 18 deletions
diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c
index f0e400ebac..c6e2a0fea2 100644
--- a/camel/camel-file-utils.c
+++ b/camel/camel-file-utils.c
@@ -2,9 +2,10 @@
*
* Authors:
* Michael Zucchi <notzed@ximian.com>
+ * Jeffrey Stedfast <fejj@ximian.com>
* Dan Winship <danw@ximian.com>
*
- * Copyright (C) 2000, 2001 Ximian, Inc.
+ * Copyright (C) 2000, 2003 Ximian, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
@@ -26,22 +27,23 @@
#include <config.h>
#endif
-#include "camel-file-utils.h"
-#include "camel-url.h"
-
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <fcntl.h>
+#include <netinet/in.h>
#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
-#include <string.h>
-
-#include <netinet/in.h>
+#include "camel-file-utils.h"
+#include "camel-operation.h"
+#include "camel-url.h"
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
+#ifndef MAX
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
+
/**
* camel_file_util_encode_uint32:
* @out: file to output to
@@ -66,6 +68,7 @@ camel_file_util_encode_uint32 (FILE *out, guint32 value)
return fputc (value | 0x80, out);
}
+
/**
* camel_file_util_decode_uint32:
* @in: file to read from
@@ -96,6 +99,7 @@ camel_file_util_decode_uint32 (FILE *in, guint32 *dest)
return 0;
}
+
/**
* camel_file_util_encode_fixed_int32:
* @out: file to output to
@@ -117,6 +121,7 @@ camel_file_util_encode_fixed_int32 (FILE *out, gint32 value)
return 0;
}
+
/**
* camel_file_util_decode_fixed_int32:
* @in: file to read from
@@ -139,6 +144,7 @@ camel_file_util_decode_fixed_int32 (FILE *in, gint32 *dest)
}
}
+
/**
* camel_file_util_encode_time_t:
* @out: file to output to
@@ -160,6 +166,7 @@ camel_file_util_encode_time_t(FILE *out, time_t value)
return 0;
}
+
/**
* camel_file_util_decode_time_t:
* @in: file to read from
@@ -186,6 +193,7 @@ camel_file_util_decode_time_t (FILE *in, time_t *dest)
return 0;
}
+
/**
* camel_file_util_encode_off_t:
* @out: file to output to
@@ -207,6 +215,7 @@ camel_file_util_encode_off_t (FILE *out, off_t value)
return 0;
}
+
/**
* camel_file_util_decode_off_t:
* @in: file to read from
@@ -233,6 +242,7 @@ camel_file_util_decode_off_t (FILE *in, off_t *dest)
return 0;
}
+
/**
* camel_file_util_encode_string:
* @out: file to output to
@@ -258,6 +268,7 @@ camel_file_util_encode_string (FILE *out, const char *str)
return -1;
}
+
/**
* camel_file_util_decode_string:
* @in: file to read from
@@ -296,16 +307,26 @@ camel_file_util_decode_string (FILE *in, char **str)
return 0;
}
-/* Make a directory heirarchy.
- Always use full paths */
+
+/**
+ * camel_mkdir:
+ * @path: directory path to create
+ * @mode: permissions
+ *
+ * Creates the directory path described in @path, creating any parent
+ * directories as necessary.
+ *
+ * Returns 0 on success or -1 on fail. In the case of failure, errno
+ * will be set appropriately.
+ **/
int
-camel_file_util_mkdir(const char *path, mode_t mode)
+camel_mkdir (const char *path, mode_t mode)
{
char *copy, *p;
-
+
g_assert(path && path[0] == '/');
-
- p = copy = alloca(strlen(path)+1);
+
+ p = copy = g_alloca (strlen (path) + 1);
strcpy(copy, path);
do {
p = strchr(p + 1, '/');
@@ -318,15 +339,178 @@ camel_file_util_mkdir(const char *path, mode_t mode)
if (p)
*p = '/';
} while (p);
-
+
return 0;
}
+
+/**
+ * camel_file_util_safe_filename:
+ * @name: string to 'flattened' into a safe filename
+ *
+ * 'Flattens' @name into a safe filename string by hex encoding any
+ * chars that may cause problems on the filesystem.
+ *
+ * Returns a safe filename string.
+ **/
char *
-camel_file_util_safe_filename(const char *name)
+camel_file_util_safe_filename (const char *name)
{
if (name == NULL)
return NULL;
return camel_url_encode(name, "/?()'*");
}
+
+
+/* FIXME: poll() might be more efficient and more portable? */
+
+/**
+ * camel_read:
+ * @fd: file descriptor
+ * @buf: buffer to fill
+ * @n: number of bytes to read into @buf
+ *
+ * Cancellable libc read() replacement.
+ *
+ * Returns number of bytes read or -1 on fail. On failure, errno will
+ * be set appropriately.
+ **/
+ssize_t
+camel_read (int fd, char *buf, size_t n)
+{
+ ssize_t nread;
+ int cancel_fd;
+
+ if (camel_operation_cancel_check (NULL)) {
+ errno = EINTR;
+ return -1;
+ }
+
+ cancel_fd = camel_operation_cancel_fd (NULL);
+ if (cancel_fd == -1) {
+ do {
+ nread = read (fd, buf, n);
+ } while (nread == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+ } else {
+ int errnosav, flags, fdmax;
+ fd_set rdset;
+
+ flags = fcntl (fd, F_GETFL);
+ fcntl (fd, F_SETFL, flags | O_NONBLOCK);
+
+ do {
+ FD_ZERO (&rdset);
+ FD_SET (fd, &rdset);
+ FD_SET (cancel_fd, &rdset);
+ fdmax = MAX (fd, cancel_fd) + 1;
+
+ nread = -1;
+ if (select (fdmax, &rdset, 0, 0, NULL) != -1) {
+ if (FD_ISSET (cancel_fd, &rdset)) {
+ fcntl (fd, F_SETFL, flags);
+ errno = EINTR;
+ return -1;
+ }
+
+ do {
+ nread = read (fd, buf, n);
+ } while (nread == -1 && errno == EINTR);
+ } else if (errno == EINTR) {
+ errno = EAGAIN;
+ }
+ } while (nread == -1 && (errno == EAGAIN || errno == EWOULDBLOCK));
+
+ errnosav = errno;
+ fcntl (fd, F_SETFL, flags);
+ errno = errnosav;
+ }
+
+ return nread;
+}
+
+
+/**
+ * camel_write:
+ * @fd: file descriptor
+ * @buf: buffer to write
+ * @n: number of bytes of @buf to write
+ *
+ * Cancellable libc write() replacement.
+ *
+ * Returns number of bytes written or -1 on fail. On failure, errno will
+ * be set appropriately.
+ **/
+ssize_t
+camel_write (int fd, const char *buf, size_t n)
+{
+ ssize_t w, written = 0;
+ int cancel_fd;
+
+ if (camel_operation_cancel_check (NULL)) {
+ errno = EINTR;
+ return -1;
+ }
+
+ cancel_fd = camel_operation_cancel_fd (NULL);
+ if (cancel_fd == -1) {
+ do {
+ do {
+ w = write (fd, buf + written, n - written);
+ } while (w == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+
+ if (w > 0)
+ written += w;
+ } while (w != -1 && written < n);
+ } else {
+ int errnosav, flags, fdmax;
+ fd_set rdset, wrset;
+
+ flags = fcntl (fd, F_GETFL);
+ fcntl (fd, F_SETFL, flags | O_NONBLOCK);
+
+ fdmax = MAX (fd, cancel_fd) + 1;
+ do {
+ FD_ZERO (&rdset);
+ FD_ZERO (&wrset);
+ FD_SET (fd, &wrset);
+ FD_SET (cancel_fd, &rdset);
+
+ w = -1;
+ if (select (fdmax, &rdset, &wrset, 0, NULL) != -1) {
+ if (FD_ISSET (cancel_fd, &rdset)) {
+ fcntl (fd, F_SETFL, flags);
+ errno = EINTR;
+ return -1;
+ }
+
+ do {
+ w = write (fd, buf + written, n - written);
+ } while (w == -1 && errno == EINTR);
+
+ if (w == -1) {
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ w = 0;
+ } else {
+ errnosav = errno;
+ fcntl (fd, F_SETFL, flags);
+ errno = errnosav;
+ return -1;
+ }
+ } else
+ written += w;
+ } else if (errno == EINTR) {
+ w = 0;
+ }
+ } while (w != -1 && written < n);
+
+ errnosav = errno;
+ fcntl (fd, F_SETFL, flags);
+ errno = errnosav;
+ }
+
+ if (w == -1)
+ return -1;
+
+ return written;
+}