X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=oss%2Fcatdoc.git;a=blobdiff_plain;f=src%2Ffileutil.c;h=5ae039f5cd603eb9f57b5338266af4c051b227d8;hp=d902a6a3d2f0f0d7ecd7ff84854d1374697377d9;hb=73b1dd7326585b7c18ce6e24320656d0d6f843cc;hpb=51f0f8ed69b065cd2577a27c2a2911cdda243b99

diff --git a/src/fileutil.c b/src/fileutil.c
index d902a6a..5ae039f 100644
--- a/src/fileutil.c
+++ b/src/fileutil.c
@@ -71,13 +71,11 @@ char *find_file(char *name, const char *path)
 	char *q;
 	char path_buf[PATH_BUF_SIZE];
 	char dir_sep[2]={DIR_SEP,0};
-	for (p=path;p;p=q+1) {
+	for (p=path;p;p=(q?(q+1):NULL)) {
 		q=strchr(p,LIST_SEP);
-
 		if (q) {
 			if (!prepare_path_buf(path_buf,p,q)) continue;
 		} else {
-			q--;
 			if (!prepare_path_buf(path_buf,p,p+strlen(p))) continue;
 		}
 		strcat(path_buf,dir_sep); /* always one char */
@@ -106,10 +104,16 @@ int check_charset(char **filename,const char *charset) {
 		return 1;
 	}   
 	tmppath=find_file(stradd(charset,CHARSET_EXT),charset_path);
-	if (tmppath&& *tmppath) {
-		*filename=strdup(charset);
-		free(tmppath);
-		return 1;
+	/* Some compilers evalate both arguments of && before
+	   applying, so let's not use && as in the shell */
+	if (tmppath) {
+	    if (*tmppath) {
+			*filename=strdup(charset);
+			free(tmppath);
+			return 1;
+		} else {
+			free(tmppath);
+		}
 	}
 	return 0;
 }
@@ -178,17 +182,18 @@ void list_charsets(void) {
 	char *q;
 	char path_buf[PATH_BUF_SIZE];
 	char dir_sep[2]={DIR_SEP,0};
+	char **ptr;
 #ifdef __MSDOS__
 	struct ffblk ffblock;
 	int res,col;
 #else
 	glob_t glob_buf;
 	int count,glob_flags=GLOB_ERR;
+
+	memset(&glob_buf,0,sizeof(glob_t));
 #endif
-	char **ptr;
-	for (p=charset_path;p;p=q+1) {
+	for (p=charset_path;p;p=(q?(q+1):NULL)) {
 		q=strchr(p,LIST_SEP);
-
 		if (q) {
 			if (q-p>=PATH_BUF_SIZE) {
 				/* Oops, dir name too long, perhabs broken config file */
@@ -197,7 +202,6 @@ void list_charsets(void) {
 			strncpy(path_buf,p,q-p);
 			path_buf[q-p]=0;
 		} else {
-			q--;
 			if (strlen(p)>=PATH_BUF_SIZE) continue;
 			strcpy(path_buf,p);
 		}