Attachment #248426 for bug #338414




				esc_myfile = g_shell_quote(myfile);
				highest = get_highest_update(protected, protected[i]);
				esc_highest = g_shell_quote(highest);
				cmd = (char *)calloc(strlen("diff -Nu % % | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][[:space:]]*$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));
				strcpy(cmd, "diff -Nu ");
				strcat(cmd, esc_myfile);
				strcat(cmd, " ");
				strcat(cmd, esc_highest);
				strcat(cmd, " | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][[:space:]]*$\"");
				
				free(myfile);
				free(esc_myfile);

Return to bug 338414

Lines 133-144 Link Here

(-)conf-update-1.0/conf-update.c.orig (-2 / +2 lines)
133	esc_myfile = g_shell_quote(myfile);	133	esc_myfile = g_shell_quote(myfile);
134	highest = get_highest_update(protected, protected[i]);	134	highest = get_highest_update(protected, protected[i]);
135	esc_highest = g_shell_quote(highest);	135	esc_highest = g_shell_quote(highest);
136	cmd = (char )calloc(strlen("diff -Nu % % \| grep \"^[+-][^+-]\" \| grep -v \"^[-+]#\" \| grep -v \"^[-+][:space:]$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));	136	cmd = (char )calloc(strlen("diff -Nu % % \| grep \"^[+-][^+-]\" \| grep -v \"^[-+]#\" \| grep -v \"^[-+][[:space:]]$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));
137	strcpy(cmd, "diff -Nu ");	137	strcpy(cmd, "diff -Nu ");
138	strcat(cmd, esc_myfile);	138	strcat(cmd, esc_myfile);
139	strcat(cmd, " ");	139	strcat(cmd, " ");
140	strcat(cmd, esc_highest);	140	strcat(cmd, esc_highest);
141	strcat(cmd, " \| grep \"^[+-][^+-]\" \| grep -v \"^[-+]#\" \| grep -v \"^[-+][:space:]*$\"");	141	strcat(cmd, " \| grep \"^[+-][^+-]\" \| grep -v \"^[-+]#\" \| grep -v \"^[-+][[:space:]]*$\"");
142		142
143	free(myfile);	143	free(myfile);
144	free(esc_myfile);	144	free(esc_myfile);