diff options
| author | brian <brian@FreeBSD.org> | 2000-08-25 01:01:07 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2000-08-25 01:01:07 +0000 |
| commit | 4dcf00026aaae753bf32fad240e4299b3ba402d2 (patch) | |
| tree | 143fea435ceadf8708a385282ea8d122e9aa2042 /usr.bin/finger/lprint.c | |
| parent | 841b54e275fef021259a25a34650c6cfd02a3faa (diff) | |
| download | FreeBSD-src-4dcf00026aaae753bf32fad240e4299b3ba402d2.zip FreeBSD-src-4dcf00026aaae753bf32fad240e4299b3ba402d2.tar.gz | |
Allow finger.conf to contain aliases for files that will be displayed
when fingered.
Submitted by: Mark Knight <markk@knigma.org>
Diffstat (limited to 'usr.bin/finger/lprint.c')
| -rw-r--r-- | usr.bin/finger/lprint.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c index 3d0a409..688f16e 100644 --- a/usr.bin/finger/lprint.c +++ b/usr.bin/finger/lprint.c @@ -59,16 +59,14 @@ static const char rcsid[] = #include <string.h> #include <paths.h> #include "finger.h" +#include "pathnames.h" +#include "extern.h" #define LINE_LEN 80 #define TAB_LEN 8 /* 8 spaces between tabs */ -#define _PATH_FORWARD ".forward" -#define _PATH_PLAN ".plan" -#define _PATH_PROJECT ".project" static int demi_print __P((char *, int)); static void lprint __P((PERSON *)); -static int show_text __P((char *, char *, char *)); static void vputc __P((unsigned char)); void @@ -290,7 +288,7 @@ demi_print(str, oddfield) return(oddfield); } -static int +int show_text(directory, file_name, header) char *directory, *file_name, *header; { @@ -316,7 +314,8 @@ show_text(directory, file_name, header) if (*p == '\n') break; if (cnt <= 1) { - (void)printf("%s: ", header); + if (*header != '\0') + (void)printf("%s: ", header); for (p = tbuf, cnt = nr; cnt--; ++p) if (*p != '\r') vputc(lastc = *p); @@ -330,7 +329,8 @@ show_text(directory, file_name, header) } if ((fp = fdopen(fd, "r")) == NULL) return(0); - (void)printf("%s:\n", header); + if (*header != '\0') + (void)printf("%s:\n", header); while ((ch = getc(fp)) != EOF) if (ch != '\r') vputc(lastc = ch); |
