Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6425:382828caeb61 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use dynamically growing string for paths.
author Timo Sirainen <tss@iki.fi>
date Sun, 16 Sep 2007 13:41:32 +0300
parents 687efa138e77
children f32ee254913d
files src/lib/unlink-lockfiles.c
diffstat 1 files changed, 17 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/unlink-lockfiles.c	Sun Sep 16 13:38:34 2007 +0300
+++ b/src/lib/unlink-lockfiles.c	Sun Sep 16 13:41:32 2007 +0300
@@ -1,6 +1,7 @@
 /* Copyright (c) 2002-2003 Timo Sirainen */
 
 #include "lib.h"
+#include "str.h"
 #include "unlink-lockfiles.h"
 
 #include <stdlib.h>
@@ -15,7 +16,7 @@
 	DIR *dirp;
 	struct dirent *d;
 	struct stat st;
-	char path[PATH_MAX];
+	string_t *path;
 	unsigned int pidlen, otherlen;
 	int ret = 1;
 
@@ -24,6 +25,8 @@
 	if (dirp == NULL)
 		return -1;
 
+	t_push();
+	path = t_str_new(512);
 	pidlen = pidprefix == NULL ? 0 : strlen(pidprefix);
 	otherlen = otherprefix == NULL ? 0 : strlen(otherprefix);
 
@@ -39,20 +42,23 @@
 			if (kill(atol(fname+pidlen), 0) == 0 || errno != ESRCH)
 				continue; /* valid */
 
-			if (str_path(path, sizeof(path), dir, fname) == 0) {
-				if (unlink(path) < 0 && errno != ENOENT) {
-					i_error("unlink(%s) failed: %m", path);
-					ret = 0;
-				}
+			str_truncate(path, 0);
+			str_printfa(path, "%s/%s", dir, fname);
+			if (unlink(str_c(path)) < 0 && errno != ENOENT) {
+				i_error("unlink(%s) failed: %m", str_c(path));
+				ret = 0;
 			}
 		} else if (otherprefix != NULL &&
 			   strncmp(fname, otherprefix, otherlen) == 0) {
-			if (str_path(path, sizeof(path), dir, fname) == 0 &&
-			    stat(path, &st) == 0 &&
+			str_truncate(path, 0);
+			str_printfa(path, "%s/%s", dir, fname);
+			if (stat(str_c(path), &st) == 0 &&
 			    st.st_mtime < other_min_time &&
 			    st.st_ctime < other_min_time)
-				if (unlink(path) < 0 && errno != ENOENT) {
-					i_error("unlink(%s) failed: %m", path);
+				if (unlink(str_c(path)) < 0 &&
+				    errno != ENOENT) {
+					i_error("unlink(%s) failed: %m",
+						str_c(path));
 					ret = 0;
 				}
 		}
@@ -61,5 +67,6 @@
 	if (closedir(dirp) < 0)
 		i_error("closedir(%s) failed: %m", dir);
 
+	t_pop();
 	return ret;
 }