Mercurial > dovecot > core-2.2

changeset 15169:48ee8bad7d51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid using PATH_MAX.
author Timo Sirainen <tss@iki.fi>
date Fri, 28 Sep 2012 15:07:11 +0300
parents 1dafaabeb134
children b6663a4f60fe
files src/lib-master/master-instance.c src/lib-storage/index/dbox-common/dbox-storage.c
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-master/master-instance.c	Fri Sep 28 02:19:07 2012 +0300
+++ b/src/lib-master/master-instance.c	Fri Sep 28 15:07:11 2012 +0300
@@ -110,7 +110,7 @@
 		i_error("open(%s) failed: %m", list->path);
 		return -1;
 	}
-	input = i_stream_create_fd(fd, PATH_MAX, TRUE);
+	input = i_stream_create_fd(fd, (size_t)-1, TRUE);
 	while ((line = i_stream_read_next_line(input)) != NULL) T_BEGIN {
 		if (master_instance_list_add_line(list, line) < 0)
 			i_error("Invalid line in %s: %s", list->path, line);
--- a/src/lib-storage/index/dbox-common/dbox-storage.c	Fri Sep 28 02:19:07 2012 +0300
+++ b/src/lib-storage/index/dbox-common/dbox-storage.c	Fri Sep 28 15:07:11 2012 +0300
@@ -31,25 +31,23 @@
 dbox_alt_path_has_changed(const char *root_dir,
 			  const char *alt_path, const char *alt_symlink_path)
 {
-	char buf[PATH_MAX];
+	const char *linkpath;
 	ssize_t ret;
 
-	ret = readlink(alt_symlink_path, buf, sizeof(buf)-1);
-	if (ret < 0) {
+	if (t_readlink(alt_symlink_path, &linkpath) < 0) {
 		if (errno == ENOENT)
 			return alt_path != NULL;
 		i_error("readlink(%s) failed: %m", alt_symlink_path);
 		return FALSE;
 	}
-	buf[ret] = '\0';
 
 	if (alt_path == NULL) {
 		i_warning("dbox %s: Original ALT=%s, "
-			  "but currently no ALT path set", root_dir, buf);
+			  "but currently no ALT path set", root_dir, linkpath);
 		return TRUE;
-	} else if (strcmp(buf, alt_path) != 0) {
+	} else if (strcmp(linkpath, alt_path) != 0) {
 		i_warning("dbox %s: Original ALT=%s, "
-			  "but currently ALT=%s", root_dir, buf, alt_path);
+			  "but currently ALT=%s", root_dir, linkpath, alt_path);
 		return TRUE;
 	}
 	return FALSE;