X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftoe.c;fp=progs%2Ftoe.c;h=855fb2955cd648e57f6793b90b80382dc8692ba9;hp=38b85cb362ed0918fd1975b29fabdce782a21c11;hb=8f527f87c0b979d9c2598ef5c3394463af288468;hpb=4c309ad3b124eff80aa6b54018b5cc9f1e3d116d

diff --git a/progs/toe.c b/progs/toe.c
index 38b85cb3..855fb295 100644
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: toe.c,v 1.48 2008/01/05 20:41:26 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.50 2008/08/03 17:12:05 tom Exp $")
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
@@ -163,6 +163,7 @@ typelist(int eargc, char *eargv[],
     for (i = 0; i < eargc; i++) {
 #if USE_DATABASE
 	if (_nc_is_dir_path(eargv[i])) {
+	    char *cwd_buf = 0;
 	    DIR *termdir;
 	    DIRENT *subdir;
 
@@ -177,20 +178,30 @@ typelist(int eargc, char *eargv[],
 
 	    while ((subdir = readdir(termdir)) != 0) {
 		size_t len = NAMLEN(subdir);
-		char buf[PATH_MAX];
+		size_t cwd_len = len + strlen(eargv[i]) + 3;
 		char name_1[PATH_MAX];
 		DIR *entrydir;
 		DIRENT *entry;
 
+		cwd_buf = typeRealloc(char, cwd_len, cwd_buf);
+		if (cwd_buf == 0) {
+		    perror("realloc cwd_buf");
+		    continue;
+		}
+
 		strncpy(name_1, subdir->d_name, len)[len] = '\0';
 		if (isDotname(name_1))
 		    continue;
 
-		(void) sprintf(buf, "%s/%s/", eargv[i], name_1);
-		if (chdir(buf) != 0)
+		(void) sprintf(cwd_buf, "%s/%.*s/", eargv[i], (int) len, name_1);
+		if (chdir(cwd_buf) != 0)
 		    continue;
 
 		entrydir = opendir(".");
+		if (entrydir == 0) {
+		    perror(cwd_buf);
+		    continue;
+		}
 		while ((entry = readdir(entrydir)) != 0) {
 		    char name_2[PATH_MAX];
 		    TERMTYPE lterm;
@@ -222,6 +233,8 @@ typelist(int eargc, char *eargv[],
 		closedir(entrydir);
 	    }
 	    closedir(termdir);
+	    if (cwd_buf != 0)
+		free(cwd_buf);
 	}
 #if USE_HASHED_DB
 	else {