d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a trailing '\n' character if none is found in the information

Browse Source 
obtained from a package. Patch show_file() [1] and show_index() [2]
functions.

PR:		52097
Reviewed by:	bento, kris,
		portmgr, re,
		Michael Nottebrock <michaelnottebrock@gmx.net>,
		Martin Horcicka <horcicka@FreeBSD.cz>
Approved by:	re (scottl)
Obtained from:	NetBSD [1],
		OpenBSD [2]
MFC after:	1 week
This commit is contained in:
lioux 2003-05-26 17:06:05 +00:00
parent 8130b0dd57
commit f342a11132
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
usr.sbin/pkg_install/info/show.c
View File

@ -39,12 +39,16 @@ show_file(const char *title, const char *fname)
if (!Quiet)
printf("%s%s", InfoPrefix, title);
fp = fopen(fname, "r");
if (!fp)
if (fp == (FILE *) NULL)
printf("ERROR: show_file: Can't open '%s' for reading!\n", fname);
else {
int append_nl = 0;
while ((n = fread(line, 1, 1024, fp)) != 0)
fwrite(line, 1, n, stdout);
fclose(fp);
append_nl = (line[n - 1] != '\n'); /* Do we have a trailing \n ? */
if (append_nl)
printf("\n");
}
printf("\n"); /* just in case */
}
@ -55,20 +59,25 @@ show_index(const char *title, const char *fname)
FILE *fp;
char line[MAXINDEXSIZE+2];
strlcpy(line, "???\n", sizeof(line));
if (!Quiet)
printf("%s%s", InfoPrefix, title);
fp = fopen(fname, "r");
if (!fp) {
if (fp == (FILE *) NULL) {
warnx("show_file: can't open '%s' for reading", fname);
return;
} else {
if(fgets(line, MAXINDEXSIZE + 1, fp)) {
size_t line_length = strlen(line);
if (line[line_length - 1] != '\n') { /* Do we have a trailing \n ? */
line[line_length] = '\n'; /* Add a trailing \n */
line[line_length + 1] = '\0'; /* Terminate string */
}
}
fclose(fp);
}
if(fgets(line, MAXINDEXSIZE+1, fp)) {
if(line[MAXINDEXSIZE-1] != '\n')
line[MAXINDEXSIZE] = '\n';
line[MAXINDEXSIZE+1] = 0;
fputs(line, stdout);
}
fclose(fp);
fputs(line, stdout);
}
/* Show a packing list item type. If showall is TRUE, show all */