shithub: plumb-complete

Info  •  Files  •  Log  •  Branches

fixed doublefree and refactored. turns out duplicates werent a code issue but because i wasnt quote-escaping a variable name storing file data (ie using $c instead of $"c)

--- a/complete.c

+++ b/complete.c

@@ -1,7 +1,7 @@

 #include <u.h>

 #include <libc.h>

-#include <ctype.h>

 #include <plumb.h>

+#include <ctype.h>

 #include <complete.h>

 typedef struct EQueue EQueue;

@@ -155,8 +155,8 @@

 Completion*

 completefile(char *content, char *s)

 {

-	char *p, *token, *next, **tokens;

-	int ntokens, maxtokens, i, j, len, minlen, nmatches;

+	char *p, *token, *next, *newtok, **tokens;

+	int ntokens, maxtokens, i, j, len, minlen, tokenlen, duplicate;

 	Completion *c;

 	if(s == nil || content == nil)

@@ -185,8 +185,8 @@

 		next = p;

 		if(next > token) {

-			int tokenlen = next - token;

-			char *newtok;

+			tokenlen = next - token;

+			duplicate = 0;

 			if(tokenlen < len)

 				continue;

@@ -201,16 +201,18 @@

 			strncpy(newtok, token, tokenlen);

 			newtok[tokenlen] = '\0';

-			for(i = 0; i < ntokens; i++)

+			for(i = 0; i < ntokens; i++) {

 				if(strcmp(tokens[i], newtok) == 0) {

-					free(newtok);

+					duplicate = 1;

 					break;

 				}

-				

-			if(i == ntokens)

+			}

+			

+			if(!duplicate) {

 				tokens[ntokens++] = newtok;

-			else

+			} else {

 				free(newtok);

+			}

 		}

 	}

@@ -219,6 +221,8 @@

 		return nil;

 	}

+	qsort(tokens, ntokens, sizeof(char*), strpcmp);

+	

 	c = malloc(sizeof(Completion) + 256);

 	if(c == nil) {

 		for(i = 0; i < ntokens; i++)

@@ -357,6 +361,7 @@

 	plumbsend(plumbopen("send", OWRITE), &response);

 	free(databuf);

+	free(response.attr);

 }

 void