rpm2html/config.c - diff

Return to config.c CVS log

Up to [Public] / rpm2html

Diff for /rpm2html/config.c between versions 1.6 and 1.7

version 1.6, 1997/11/15 21:48:32	version 1.7, 1997/11/18 05:45:50
Line 27	Line 27
* configuration variables for rpm2html	* configuration variables for rpm2html
*/	*/

char *rpm2html_name = RPM2HTML_NAME;	char *rpm2html_rpm2html_name = RPM2HTML_NAME;
char *rpm2html_ver = RPM2HTML_VER;	char *rpm2html_rpm2html_ver = RPM2HTML_VER;
char *rpm2html_url = RPM2HTML_URL;	char *rpm2html_rpm2html_url = RPM2HTML_URL;
char *rpm2html_maint = RPM2HTML_MAINT;	char *rpm2html_rpm2html_thishost= NULL;
char *rpm2html_mail = RPM2HTML_MAIL;	char *rpm2html_maint = RPM2HTML_MAINT;
char *rpm2html_dir = RPM2HTML_DIR;	char *rpm2html_mail = RPM2HTML_MAIL;
char *rpm2html_ftp = RPM2HTML_FTP;	char *rpm2html_dir = NULL;
	char *rpm2html_name = NULL;
	char *rpm2html_url = NULL;
	char *rpm2html_ftp = NULL;
	char *rpm2html_ftpsrc = NULL;
	char *rpm2html_host = NULL;

int rpm2html_files = 0;	int rpm2html_files = 0;
int rpm2html_size = 0;	int rpm2html_size = 0;
Line 49 rpmDirPtr rpmDirSearch(char *dirname) {	Line 54 rpmDirPtr rpmDirSearch(char *dirname) {
rpmDirPtr cur = dirList;	rpmDirPtr cur = dirList;

while (cur != NULL) {	while (cur != NULL) {
if (!strcmp(dirname, cur->dir)) return(cur);	if (!strcmp(dirname, cur->rpmdir)) return(cur);
cur = cur->next;	cur = cur->next;
}	}
cur = (rpmDirPtr) malloc(sizeof(rpmDir));	cur = (rpmDirPtr) malloc(sizeof(rpmDir));
cur->dir = strdup(dirname);	cur->color = "#ffffff";
cur->name = "";	cur->dir = NULL;
	cur->files = 0;
cur->ftp = NULL;	cur->ftp = NULL;
cur->ftpsrc = NULL;	cur->ftpsrc = NULL;
cur->color = "#ffffff";	cur->host = NULL;
	cur->mail = NULL;
	cur->maint = NULL;
	cur->name = NULL;
	cur->nb_mirrors = 0;
	cur->mirrors[0] = NULL;
	cur->rpmdir = strdup(dirname);
	cur->size = 0;
cur->trust = "1.0";	cur->trust = "1.0";
cur->nb_urls = 0;	cur->trust = NULL;
	cur->url = NULL;

if (strcmp(dirname, "localbase"))	if (strcmp(dirname, "localbase"))
cur->installbase = 0;	cur->installbase = 0;
else	else
cur->installbase = 1;	cur->installbase = 1;

cur->next = dirList;	cur->next = dirList;
dirList = cur;	dirList = cur;
return(cur);	return(cur);
Line 92 void addConfigEntry(char rpmdir, char	Line 108 void addConfigEntry(char rpmdir, char
rpm2html_dir = strdup(value);	rpm2html_dir = strdup(value);
} else if (!strcasecmp(name, "ftp")) {	} else if (!strcasecmp(name, "ftp")) {
rpm2html_ftp = strdup(value);	rpm2html_ftp = strdup(value);
	} else if (!strcasecmp(name, "ftpsrc")) {
	rpm2html_ftpsrc = strdup(value);
	} else if (!strcasecmp(name, "name")) {
	rpm2html_name = strdup(value);
	} else if (!strcasecmp(name, "host")) {
	rpm2html_host = strdup(value);
} else {	} else {
printf("Config file : %s global entry ignored\n", name);	printf("Config file : %s global entry ignored\n", name);
}	}
Line 104 void addConfigEntry(char rpmdir, char	Line 126 void addConfigEntry(char rpmdir, char
cur = rpmDirSearch(rpmdir);	cur = rpmDirSearch(rpmdir);
if (!strcasecmp(name, "name")) {	if (!strcasecmp(name, "name")) {
cur->name = strdup(value);	cur->name = strdup(value);
	} else if (!strcasecmp(name, "dir")) {
	cur->dir = strdup(value);
	} else if (!strcasecmp(name, "url")) {
	cur->url = strdup(value);
} else if (!strcasecmp(name, "ftp")) {	} else if (!strcasecmp(name, "ftp")) {
cur->ftp = strdup(value);	cur->ftp = strdup(value);
} else if (!strcasecmp(name, "ftpsrc")) {	} else if (!strcasecmp(name, "ftpsrc")) {
Line 112 void addConfigEntry(char rpmdir, char	Line 138 void addConfigEntry(char rpmdir, char
cur->color = strdup(value);	cur->color = strdup(value);
} else if (!strcasecmp(name, "trust")) {	} else if (!strcasecmp(name, "trust")) {
cur->trust = strdup(value);	cur->trust = strdup(value);
} else if (!strcasecmp(name, "url")) {	} else if (!strcasecmp(name, "host")) {
	rpm2html_host = strdup(value);
	} else if (!strcasecmp(name, "mirror")) {
/*	/*
* all "url" values are collected in the urls array.	* all "mirrors" values are collected in the mirrors array.
*/	*/
if (cur->nb_urls >= MAX_URLS) {	if (cur->nb_mirrors >= MAX_URLS) {
fprintf(stderr, "increase MAX_URLS %d overflow\n", MAX_URLS);	fprintf(stderr, "increase MAX_URLS %d overflow\n", MAX_URLS);
} else {	} else {
cur->urls[cur->nb_urls] = strdup(value);	cur->mirrors[cur->nb_mirrors] = strdup(value);
cur->nb_urls++;	cur->nb_mirrors++;
}	}
} else {	} else {
printf("Config file : %s entry for %s ignored\n", name, rpmdir);	printf("Config file : %s entry for %s ignored\n", name, rpmdir);
Line 164 int readConfigFile(char *filename)	Line 192 int readConfigFile(char *filename)
char *value;	char *value;
int errors = 0;	int errors = 0;

	rpm2html_host = rpm2html_rpm2html_thishost;
input = fopen (filename, "r");	input = fopen (filename, "r");
if (input == NULL)	if (input == NULL)
{	{
Line 210 int readConfigFile(char *filename)	Line 239 int readConfigFile(char *filename)
}	}
*str = '\0';	*str = '\0';
strcpy (&rpmdir[0], base);	strcpy (&rpmdir[0], base);
	rpmDirSearch(rpmdir);

#ifdef DEBUG	#ifdef DEBUG
fprintf (stderr, "readConfigFile section [%s]\n", rpmdir);	fprintf (stderr, "readConfigFile section [%s]\n", rpmdir);
#endif	#endif
Line 242 int readConfigFile(char *filename)	Line 273 int readConfigFile(char *filename)
return(0);	return(0);
}	}

	/*
	* reinitialize the base setup.
	*/
	void reinitialize(void) {
	if (rpm2html_dir) free(rpm2html_dir);
	if (rpm2html_name) free(rpm2html_name);
	if (rpm2html_url) free(rpm2html_url);
	if (rpm2html_ftp) free(rpm2html_ftp);
	if (rpm2html_ftpsrc) free(rpm2html_ftpsrc);
	rpm2html_rpm2html_name = RPM2HTML_NAME;
	rpm2html_rpm2html_ver = RPM2HTML_VER;
	rpm2html_rpm2html_url = RPM2HTML_URL;
	rpm2html_maint = RPM2HTML_MAINT;
	rpm2html_mail = RPM2HTML_MAIL;
	rpm2html_dir = NULL;
	rpm2html_name = NULL;
	rpm2html_url = NULL;
	rpm2html_ftp = NULL;
	rpm2html_ftpsrc = NULL;
	rpm2html_host = rpm2html_rpm2html_thishost;
	}

Webmaster

Removed from v.1.6
changed lines
	Added in v.1.7