X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lib-src%2Fetags.c;h=e7f3c20cb33c59569dbdbd7b85f0b301fcf28082;hb=65785a5de3108e1837ea0ad27bf294c837978c49;hp=5271c6ec0d8b350199b8f252e9bdbae75d629f8a;hpb=b334efbeebb3434fffd6bbcf70ae9979b4fb384e;p=sxemacs

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 5271c6e..e7f3c20 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1606,13 +1606,14 @@ bool case_sensitive;
 		return NULL;
 	suffix += 1;
 	for (lang = lang_names; lang->name != NULL; lang++)
-		if (lang->suffixes != NULL)
+		if (lang->suffixes != NULL) {
 			for (ext = lang->suffixes; *ext != NULL; ext++)
 				if (case_sensitive) {
 					if (streq (*ext, suffix))
 						return lang;
 				} else if (strcaseeq (*ext, suffix))
 					return lang;
+	        }
 	return NULL;
 }
 
@@ -4368,6 +4369,7 @@ FILE *inf;
 
 	LOOP_ON_INPUT_LINES (inf, lb, dummy)
 		continue;
+	(void)dummy; // Silence set-not-read warning.
 }
 
 
@@ -6882,7 +6884,7 @@ char *file, *dir;
 	res_left = 3 * i + strlen(fp);
 	res = xnew( res_left + 1, char);
 	res[0] = '\0';
-	for ( ; i-- > 0 ; res_left -= 4 )
+	for ( ; i-- > 0 ; res_left -= 3 )
 		strncat(res, "../", res_left );
 
 	/* Add the file name relative to the common root of file and dir. */
@@ -6920,7 +6922,8 @@ char *file, *dir;
 				while (cp >= res && !filename_is_absolute (cp));
 				if (cp < res)
 					cp = slashp;	/* the absolute name begins with "/.." */
-				strcpy (cp, slashp + 3);
+				slashp += 3;
+				memmove(cp, slashp,strlen(slashp)+1);
 				slashp = cp;
 				continue;
 			}