embedaddon/libxml2/xmlcatalog.c - diff

Return to xmlcatalog.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libxml2

Diff for /embedaddon/libxml2/xmlcatalog.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:37:58	version 1.1.1.2, 2014/06/15 19:53:30
Line 47 static char *filename = NULL;	Line 47 static char *filename = NULL;
#endif	#endif

/************************************************************************	/************************************************************************
* *	* *
* Shell Interface *	* Shell Interface *
* *	* *
************************************************************************/	************************************************************************/
/**	/**
* xmlShellReadline:	* xmlShellReadline:
* @prompt: the prompt value	* @prompt: the prompt value
*	*
* Read a string	* Read a string
*	*
* Returns a pointer to it or NULL on EOF the caller is expected to	* Returns a pointer to it or NULL on EOF the caller is expected to
* free the returned string.	* free the returned string.
*/	*/
Line 157 static void usershell(void) {	Line 157 static void usershell(void) {
i++;	i++;
cur++;	cur++;
}	}
} else if (*cur == '"') {	} else if (*cur == '"') {
cur++;	cur++;
argv[i] = cur;	argv[i] = cur;
while ((cur != 0) && (cur != '"')) cur++;	while ((cur != 0) && (cur != '"')) cur++;
Line 296 static void usershell(void) {	Line 296 static void usershell(void) {
printf("\tdebug: increase the verbosity level\n");	printf("\tdebug: increase the verbosity level\n");
printf("\tquiet: decrease the verbosity level\n");	printf("\tquiet: decrease the verbosity level\n");
printf("\texit: quit the shell\n");	printf("\texit: quit the shell\n");
}	}
free(cmdline); /* not xmlFree here ! */	free(cmdline); /* not xmlFree here ! */
}	}
}	}

/************************************************************************	/************************************************************************
* *	* *
* Main *	* Main *
* *	* *
************************************************************************/	************************************************************************/
static void usage(const char *name) {	static void usage(const char *name) {
/* split into 2 printf's to avoid overly long string (gcc warning) */	/* split into 2 printf's to avoid overly long string (gcc warning) */
Line 507 int main(int argc, char **argv) {	Line 507 int main(int argc, char **argv) {
exit_value = 2;	exit_value = 2;
noout = 0;	noout = 0;
} else {	} else {

xmlACatalogDump(super, out);	xmlACatalogDump(super, out);
fclose(out);	fclose(out);
}	}
Line 544 int main(int argc, char **argv) {	Line 544 int main(int argc, char **argv) {
}	}
}	}
}	}

} else if (shell) {	} else if (shell) {
usershell();	usershell();
} else {	} else {
for (i++; i < argc; i++) {	for (i++; i < argc; i++) {
xmlURIPtr uri;	xmlURIPtr uri;
xmlChar *ans;	xmlChar *ans;

uri = xmlParseURI(argv[i]);	uri = xmlParseURI(argv[i]);
if (uri == NULL) {	if (uri == NULL) {
ans = xmlCatalogResolvePublic((const xmlChar *) argv[i]);	ans = xmlCatalogResolvePublic((const xmlChar *) argv[i]);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2