openmamba/distromatic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reports.c: indentation fixes

Browse Source
This commit is contained in:
Silvan Calarco 2021-03-19 01:14:42 +01:00
parent 1182d9ac32
commit b70cb5cf71
1 changed files with 676 additions and 710 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/reports.c
View File

@ -751,7 +751,6 @@ generateHTMLMainIndex(struct configTag *configtag)
int int
generateHTML_SRPMSFiles(struct configTag *configtag) generateHTML_SRPMSFiles(struct configTag *configtag)
{ {
humanDate strdate; humanDate strdate;
char indexfile[PATH_MAX]; char indexfile[PATH_MAX];
char htmlfile[PATH_MAX]; char htmlfile[PATH_MAX];
@ -825,10 +824,8 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
} }
for (arch = 0; arch < ARCHS_MAX + 1 && findexout[arch]; arch++) { for (arch = 0; arch < ARCHS_MAX + 1 && findexout[arch]; arch++) {
fprintf(findexout[arch], fprintf(findexout[arch], "<h1><b>%s</b> - %s</h1>\n",
"<h1><b>%s</b> - %s</h1>\n", configtag->tag, configtag->description);
configtag->tag,
configtag->description);
if (configtag->repository_level > 0) { if (configtag->repository_level > 0) {
fprintf(findexout[arch],"<h2>Depends on:</h2> "); fprintf(findexout[arch],"<h2>Depends on:</h2> ");
for (c=0; c < configtag->repository_level; c++) { for (c=0; c < configtag->repository_level; c++) {
@ -840,8 +837,7 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
} }
fprintf(findexout[arch],"\n"); fprintf(findexout[arch],"\n");
} }
fprintf(findexout[arch], fprintf(findexout[arch], "<br><h2>List of packages:</h2>\n[ ");
"<br><h2>List of packages:</h2>\n[ ");
// <th width=18></th><th nowrap align=left><b>Source</b></th><th nowrap align=left><b>Release</b></th><th width=100%% nowrap align=left><b>Builds</b></th></tr>\n"); // <th width=18></th><th nowrap align=left><b>Source</b></th><th nowrap align=left><b>Release</b></th><th width=100%% nowrap align=left><b>Builds</b></th></tr>\n");
for (c='a'; c <= 'z'; c++) { for (c='a'; c <= 'z'; c++) {
@ -851,25 +847,20 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
} }
currheadersourcelist = configtag->headersourcelist; currheadersourcelist = configtag->headersourcelist;
while (currheadersourcelist) { while (currheadersourcelist) {
if ((configtag->repository_level == 0) || if ((configtag->repository_level == 0) ||
(currheadersourcelist->altrepository == configtag->repository_level)) { (currheadersourcelist->altrepository == configtag->repository_level)) {
curr_letter=currheadersourcelist->name[0]; curr_letter=currheadersourcelist->name[0];
if (curr_letter >= 'A' && curr_letter <= 'Z') curr_letter=curr_letter+'a'-'A'; if (curr_letter >= 'A' && curr_letter <= 'Z') curr_letter=curr_letter+'a'-'A';
snprintf(htmlfile,PATH_MAX,"%spackages/%s.source.inc",
snprintf(htmlfile,PATH_MAX,"%spackages/%s.source.inc",configtag->html_dir,currheadersourcelist->name); configtag->html_dir,currheadersourcelist->name);
if ((fout = fopen(htmlfile, "w")) == NULL) { if ((fout = fopen(htmlfile, "w")) == NULL) {
perror(htmlfile); perror(htmlfile);
return 1; return 1;
} }
get_favicon_from_url(currheadersourcelist->url, buffer2, PATH_MAX); get_favicon_from_url(currheadersourcelist->url, buffer2, PATH_MAX);
fprintf(fout, "<h1><img src=\"%s\" width=\"16\" height=\"16\">"
fprintf(fout,
"<h1><img src=\"%s\" width=\"16\" height=\"16\">"
"&nbsp;%s: %s (source)</h1><table class=\"pkgpage\" width=\"100%%\">\n", "&nbsp;%s: %s (source)</h1><table class=\"pkgpage\" width=\"100%%\">\n",
buffer2, buffer2,
currheadersourcelist->name, currheadersourcelist->name,
@ -903,8 +894,7 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
groupdirname(currheadersourcelist->group, buffer2), groupdirname(currheadersourcelist->group, buffer2),
htmlclean(currheadersourcelist->group,buffer,PATH_MAX)); htmlclean(currheadersourcelist->group,buffer,PATH_MAX));
fprintf(fout, fprintf(fout, "<tr><td>Maintainer:</td><td>");
"<tr><td>Maintainer:</td><td>");
if (currheadersourcelist->packager && if (currheadersourcelist->packager &&
(currheadersourcelist->packager->role & PACKAGER_ROLE_MAINTAINER)) { (currheadersourcelist->packager->role & PACKAGER_ROLE_MAINTAINER)) {
@ -915,12 +905,12 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
currheadersourcelist->packager->name, currheadersourcelist->packager->name,
currheadersourcelist->packager->name); currheadersourcelist->packager->name);
// currheadersourcelist->packager->packages_count++; // currheadersourcelist->packager->packages_count++;
} else } else {
fprintf(fout, fprintf(fout,
"<a href=\"%stag=%s&amp;maintainer=unmaintained\"><b>unmaintained</b></a></td></tr>\n", "<a href=\"%stag=%s&amp;maintainer=unmaintained\"><b>unmaintained</b></a></td></tr>\n",
configtag->configdefaults->url_prefix, configtag->configdefaults->url_prefix,
configtag->tag); configtag->tag);
}
fprintf(fout, fprintf(fout,
"<tr><td>Description:</td><td><font size=\"-1\">%s</font></td></tr>\n", "<tr><td>Description:</td><td><font size=\"-1\">%s</font></td></tr>\n",
htmlclean(currheadersourcelist->description,buffer,PATH_MAX)); htmlclean(currheadersourcelist->description,buffer,PATH_MAX));
@ -932,9 +922,7 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
humanSize(currheadersourcelist->size, &strsize)); humanSize(currheadersourcelist->size, &strsize));
if (configtag->download_prefix) { if (configtag->download_prefix) {
fprintf(fout,"<tr><td>Download:</td><td><font size=\"-1\">"); fprintf(fout,"<tr><td>Download:</td><td><font size=\"-1\">");
fprintf(fout,"<a href=\"%s%s/SRPMS.base/%s-%s-%s.src.rpm\">%s-%s-%s.src.rpm</a>", fprintf(fout,"<a href=\"%s%s/SRPMS.base/%s-%s-%s.src.rpm\">%s-%s-%s.src.rpm</a>",
configtag->download_prefix, configtag->download_prefix,
configtag->download_dir, configtag->download_dir,
@ -947,11 +935,12 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
fprintf(fout,"</font></td></tr>\n"); fprintf(fout,"</font></td></tr>\n");
} }
if (currheadersourcelist->url) if (currheadersourcelist->url) {
fprintf(fout, fprintf(fout,
"<tr><td>URL:</td><td><font size=\"-1\"><a href=\"%s\" target=\"_new\">%s</a></font></td></tr>\n", "<tr><td>URL:</td><td><font size=\"-1\"><a href=\"%s\" target=\"_new\">%s</a></font></td></tr>\n",
currheadersourcelist->url, currheadersourcelist->url,
currheadersourcelist->url); currheadersourcelist->url);
}
fprintf(fout, fprintf(fout,
"<tr><td>Specfile:</td><td><font size=\"-1\"><a href=\"%s%s/specs/%s.spec\">%s.spec</a>", "<tr><td>Specfile:</td><td><font size=\"-1\"><a href=\"%s%s/specs/%s.spec\">%s.spec</a>",
@ -962,30 +951,24 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
if (currheadersourcelist->source) { if (currheadersourcelist->source) {
fprintf(fout,"<tr><td>Sources:</td><td><font size=\"-1\">"); fprintf(fout,"<tr><td>Sources:</td><td><font size=\"-1\">");
i=0; i=0;
while (currheadersourcelist->source[i+1]) i++; while (currheadersourcelist->source[i+1]) i++;
for (; i>=0; i--) fprintf(fout,"%s ",currheadersourcelist->source[i]);
for (; i>=0; i--)
fprintf(fout,"%s ",currheadersourcelist->source[i]);
fprintf(fout,"</font></td></tr>\n"); fprintf(fout,"</font></td></tr>\n");
} }
if (currheadersourcelist->patch) { if (currheadersourcelist->patch) {
fprintf(fout,"<tr><td>Patches:</td><td><font size=\"-1\">"); fprintf(fout,"<tr><td>Patches:</td><td><font size=\"-1\">");
i=0; i=0;
while (currheadersourcelist->patch[i+1]) i++; while (currheadersourcelist->patch[i+1]) i++;
for (; i>=0; i--) {
for (; i>=0; i--)
// fprintf(fout,"%s ",currheadersourcelist->patch[i]); // fprintf(fout,"%s ",currheadersourcelist->patch[i]);
fprintf(fout,"<a href=\"%s%s/patches/%s\">%s</a>&nbsp;", fprintf(fout,"<a href=\"%s%s/patches/%s\">%s</a>&nbsp;",
configtag->showfile_prefix, configtag->showfile_prefix,
configtag->download_dir, configtag->download_dir,
currheadersourcelist->patch[i], currheadersourcelist->patch[i],
currheadersourcelist->patch[i]); currheadersourcelist->patch[i]);
}
fprintf(fout,"</font></td></tr>\n"); fprintf(fout,"</font></td></tr>\n");
} }
@ -1025,22 +1008,19 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
currheadersourcelist->epoch, currheadersourcelist->epoch,
currheadersourcelist->version, currheadersourcelist->version,
currheadersourcelist->release); currheadersourcelist->release);
} else { } else {
fprintf(findexout[idx], fprintf(findexout[idx],
"%s-%s", "%s-%s",
currheadersourcelist->version, currheadersourcelist->version,
currheadersourcelist->release); currheadersourcelist->release);
} }
fprintf(findexout[idx]," - "); fprintf(findexout[idx]," - ");
} } // for
fprintf(fout,"<tr><td>Built RPMS:</td><td><font size=\"-1\">"); fprintf(fout,"<tr><td>Built RPMS:</td><td><font size=\"-1\">");
for (arch = 0; arch < ARCHS_MAX && configtag->arch[arch]; arch++) { for (arch = 0; arch < ARCHS_MAX && configtag->arch[arch]; arch++) {
/* write children to both fout and findexout */ /* write children to both fout and findexout */
currchild = currheadersourcelist->firstchild[arch]; currchild = currheadersourcelist->firstchild[arch];
c = 0; c = 0;
while (currchild) { while (currchild) {
for (idx = 0; idx < ARCHS_MAX + 1 && findexout[idx]; idx++) { for (idx = 0; idx < ARCHS_MAX + 1 && findexout[idx]; idx++) {
@ -1053,8 +1033,7 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
currchild->name, currchild->name,
configtag->configdefaults->url_dir); configtag->configdefaults->url_dir);
} }
fprintf(fout, fprintf(fout, "<a href=\"%stag=%s&amp;pkg=%s.%s\">%s(%s)</a> ",
"<a href=\"%stag=%s&amp;pkg=%s.%s\">%s(%s)</a> ",
configtag->configdefaults->url_prefix, configtag->configdefaults->url_prefix,
configtag->tag, currchild->name, configtag->arch[arch], configtag->tag, currchild->name, configtag->arch[arch],
currchild->name, configtag->arch[arch]); currchild->name, configtag->arch[arch]);
@ -1098,7 +1077,8 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
currheadersourcelist->require[i]->resolved->name); currheadersourcelist->require[i]->resolved->name);
if ((configtag->repository_level > 0) && if ((configtag->repository_level > 0) &&
currheadersourcelist->require[i]->resolved->buildprovider[0]->sourceheader && currheadersourcelist->require[i]->resolved->buildprovider[0]->sourceheader &&
(currheadersourcelist->require[i]->resolved->buildprovider[0]->altrepository == configtag->repository_level)) { (currheadersourcelist->require[i]->resolved->buildprovider[0]->altrepository == configtag->repository_level))
{
snprintf(buffer, PATH_MAX, "has build requirement %s which is only provided in this repository", snprintf(buffer, PATH_MAX, "has build requirement %s which is only provided in this repository",
currheadersourcelist->require[i]->resolved->name); currheadersourcelist->require[i]->resolved->name);
addWarning(currheadersourcelist, buffer); addWarning(currheadersourcelist, buffer);
@ -1138,14 +1118,10 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
/* print changelog to fout */ /* print changelog to fout */
fprintf(fout, fprintf(fout,
"<tr><td>Changelog:</td><td><font size=\"-1\" face=\"Courier,Courier New,monospace\">"); "<tr><td>Changelog:</td><td><font size=\"-1\" face=\"Courier,Courier New,monospace\">");
currchangelog = currheadersourcelist->changelog; currchangelog = currheadersourcelist->changelog;
while (currchangelog) { while (currchangelog) {
// changelog_total++; // changelog_total++;
simpleTimeToHuman(currchangelog->time, simpleTimeToHuman(currchangelog->time, (humanDate *) & strdate);
(humanDate *) & strdate);
if (currchangelog->pkg) { if (currchangelog->pkg) {
if ((currchangelog->pkg->role & PACKAGER_ROLE_MAINTAINER) && if ((currchangelog->pkg->role & PACKAGER_ROLE_MAINTAINER) &&
(currchangelog->pkg->packages_count)) { (currchangelog->pkg->packages_count)) {
@ -1166,12 +1142,12 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
htmlclean(currchangelog->text,buffer,PATH_MAX)); htmlclean(currchangelog->text,buffer,PATH_MAX));
// currchangelog->pkg->changes_count++; // currchangelog->pkg->changes_count++;
} }
} else } else {
fprintf(fout, "%s - (noname) (%s)<br>%s<br>", fprintf(fout, "%s - (noname) (%s)<br>%s<br>",
&strdate[0], &strdate[0],
currchangelog->release, currchangelog->release,
htmlclean(currchangelog->text,buffer,PATH_MAX)); htmlclean(currchangelog->text,buffer,PATH_MAX));
}
currchangelog = currchangelog->next; currchangelog = currchangelog->next;
} }
@ -1180,7 +1156,8 @@ generateHTML_SRPMSFiles(struct configTag *configtag)
fclose(fout); fclose(fout);
} }
currheadersourcelist = currheadersourcelist->next; currheadersourcelist = currheadersourcelist->next;
} } // while currheadersourcelist
for (idx = 0; idx < ARCHS_MAX + 1 && findexout[idx]; idx++) { for (idx = 0; idx < ARCHS_MAX + 1 && findexout[idx]; idx++) {
fprintf(findexout[idx], "</table>\n"); fprintf(findexout[idx], "</table>\n");
fclose(findexout[idx]); fclose(findexout[idx]);
@ -1300,7 +1277,6 @@ cleanHTMLFiles(struct configTag *ct)
int int
generateHTMLFiles(struct configTag *ct, int arch) generateHTMLFiles(struct configTag *ct, int arch)
{ {
char buffer[PATH_MAX]; char buffer[PATH_MAX];
char htmlfile[PATH_MAX]; char htmlfile[PATH_MAX];
int i,j; int i,j;
@ -1355,9 +1331,9 @@ generateHTMLFiles(struct configTag *ct, int arch)
fprintf(fout, fprintf(fout,
"<tr><td>Architecture:</td><td>%s</td></tr>\n", "<tr><td>Architecture:</td><td>%s</td></tr>\n",
currheaderlist->arch); currheaderlist->arch);
/* fprintf(fout, //fprintf(fout,
"<tr><td>Summary:</td><td><b>%s</b></td></tr>\n", // "<tr><td>Summary:</td><td><b>%s</b></td></tr>\n",
htmlclean(currheaderlist->summary,buffer,PATH_MAX));*/ // htmlclean(currheaderlist->summary,buffer,PATH_MAX));
fprintf(fout, fprintf(fout,
"<tr><td>Group:</td><td>%s</td></tr>\n", "<tr><td>Group:</td><td>%s</td></tr>\n",
htmlclean(currheaderlist->group,buffer,PATH_MAX)); htmlclean(currheaderlist->group,buffer,PATH_MAX));
@ -1366,15 +1342,12 @@ generateHTMLFiles(struct configTag *ct, int arch)
fprintf(fout, fprintf(fout,
"<tr><td>Size:</td><td><font size=\"-1\">%s</font></td></tr>\n", "<tr><td>Size:</td><td><font size=\"-1\">%s</font></td></tr>\n",
humanSize(currheaderlist->size, &strsize)); humanSize(currheaderlist->size, &strsize));
//fprintf(fout,
/* fprintf(fout, // "<tr><td>Arch:</td><td><font size=\"-1\">%s</font></td></tr>\n",
"<tr><td>Arch:</td><td><font size=\"-1\">%s</font></td></tr>\n", // currheaderlist->arch);
currheaderlist->arch);*/
if (ct->download_prefix) { if (ct->download_prefix) {
fprintf(fout,"<tr><td>Download:</td><td><font size=\"-1\">"); fprintf(fout,"<tr><td>Download:</td><td><font size=\"-1\">");
fprintf(fout,"<a href=\"%s%s/RPMS.%s/%s-%s-%s.%s.rpm\">%s-%s-%s.%s.rpm</a>", fprintf(fout,"<a href=\"%s%s/RPMS.%s/%s-%s-%s.%s.rpm\">%s-%s-%s.%s.rpm</a>",
ct->download_prefix, ct->download_prefix,
ct->download_dir, ct->download_dir,
@ -1391,8 +1364,7 @@ generateHTMLFiles(struct configTag *ct, int arch)
fprintf(fout,"</font></td></tr>\n"); fprintf(fout,"</font></td></tr>\n");
} }
if (currheaderlist->sourcename if (currheaderlist->sourcename && currheaderlist->sourceheader) {
&& currheaderlist->sourceheader) {
fprintf(fout, fprintf(fout,
"<tr><td>Source RPM:</td><td><font size=\"-1\"><a href=\"%stag=%s&amp;pkg=%s.source\">%s</a></font></td></tr>\n", "<tr><td>Source RPM:</td><td><font size=\"-1\"><a href=\"%stag=%s&amp;pkg=%s.source\">%s</a></font></td></tr>\n",
ct->configdefaults->url_prefix, ct->configdefaults->url_prefix,
@ -1436,8 +1408,7 @@ generateHTMLFiles(struct configTag *ct, int arch)
fprintf(fout, "</font></td></tr>\n"); fprintf(fout, "</font></td></tr>\n");
/* list requires */ /* list requires */
fprintf(fout, fprintf(fout, "<tr><td>Requires:</td><td><font size=\"-1\">");
"<tr><td>Requires:</td><td><font size=\"-1\">");
for (i = 0; i < currheaderlist->requirecount; i++) { for (i = 0; i < currheaderlist->requirecount; i++) {
if (currheaderlist->require[i]->resolved) { if (currheaderlist->require[i]->resolved) {
if (currheaderlist->require[i]->resolved->numproviders == 0) { if (currheaderlist->require[i]->resolved->numproviders == 0) {
@ -1547,8 +1518,7 @@ generateHTMLFiles(struct configTag *ct, int arch)
fprintf(fout, "</font></td></tr>\n"); fprintf(fout, "</font></td></tr>\n");
/* list required by */ /* list required by */
fprintf(fout, fprintf(fout, "<tr><td>Required by:</td><td><font size=\"-1\">");
"<tr><td>Required by:</td><td><font size=\"-1\">");
auxheaderlist = ct->headerlist[arch]; auxheaderlist = ct->headerlist[arch];
while (auxheaderlist) { while (auxheaderlist) {
found = 0; found = 0;
@ -1557,8 +1527,7 @@ generateHTMLFiles(struct configTag *ct, int arch)
if (auxheaderlist->require[i]->resolved) { if (auxheaderlist->require[i]->resolved) {
for (j = 0; j < auxheaderlist->require[i]->resolved->numproviders; j++) { for (j = 0; j < auxheaderlist->require[i]->resolved->numproviders; j++) {
if (!strcmp(auxheaderlist->require[i]->resolved->provider[j]->name, currheaderlist->name)) { if (!strcmp(auxheaderlist->require[i]->resolved->provider[j]->name, currheaderlist->name)) {
fprintf(fout, fprintf(fout, "<a href=\"%stag=%s&amp;pkg=%s.%s\">%s(%s)</a> ",
"<a href=\"%stag=%s&amp;pkg=%s.%s\">%s(%s)</a> ",
ct->configdefaults->url_prefix, ct->configdefaults->url_prefix,
ct->repository[auxheaderlist->altrepository]->tag, ct->repository[auxheaderlist->altrepository]->tag,
auxheaderlist->name, auxheaderlist->name,
@ -1574,7 +1543,7 @@ generateHTMLFiles(struct configTag *ct, int arch)
} }
} }
auxheaderlist = auxheaderlist->next; auxheaderlist = auxheaderlist->next;
} } // while auxheaderlist
fprintf(fout, "</font></td></tr>\n"); fprintf(fout, "</font></td></tr>\n");
/* list build required by */ /* list build required by */
@ -1607,19 +1576,16 @@ generateHTMLFiles(struct configTag *ct, int arch)
fprintf(fout, "</font></td></tr>\n"); fprintf(fout, "</font></td></tr>\n");
/* list filenames */ /* list filenames */
fprintf(fout, fprintf(fout, "<tr><td>Filenames:</td><td><font size=\"-1\">");
"<tr><td>Filenames:</td><td><font size=\"-1\">");
for (i = 0; i < currheaderlist->filenamecount; i++) { for (i = 0; i < currheaderlist->filenamecount; i++) {
ftname((currheaderlist->file)[i], buffer); ftname((currheaderlist->file)[i], buffer);
fprintf(fout, "/%s ",buffer); fprintf(fout, "/%s ",buffer);
} }
fprintf(fout, "</font></td></tr></table>\n"); fprintf(fout, "</font></td></tr></table>\n");
fclose(fout); fclose(fout);
} }
currheaderlist = currheaderlist->next; currheaderlist = currheaderlist->next;
} } // while currheaderlist
return 0; return 0;
} }