From a16e134b77ef12fcc0b934cdbbb974da21130607 Mon Sep 17 00:00:00 2001 From: zacheiss Date: Fri, 16 Mar 2001 20:18:18 +0000 Subject: [PATCH] Convert full name to a reasonable format. --- regtape/staff.pc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/regtape/staff.pc b/regtape/staff.pc index a636b2f1..8edf98ac 100644 --- a/regtape/staff.pc +++ b/regtape/staff.pc @@ -137,7 +137,7 @@ struct entry *get_next_entry(FILE *in) { static struct entry e; static char buf[BUFSIZ]; - static char name[LEN_NAME + 1], sname[LEN_NAME + 1], id[LEN_ID + 1]; + static char name[LEN_NAME + 1], id[LEN_ID + 1]; static char office[LEN_OFFICE + 1], phone[LEN_PHONE + 1]; static char phone2[LEN_PHONE2 + 1], dept[LEN_DEPT + 1], title[LEN_TITLE + 1]; int ends_sr, ends_jr, ends_iii, ends_iv, ends_ii, ends_v; @@ -154,8 +154,6 @@ struct entry *get_next_entry(FILE *in) strlcpy(dept, &buf[LOC_DEPT], LEN_DEPT + 1); strlcpy(title, &buf[LOC_TITLE], LEN_TITLE + 1); - strcpy(sname, name); - e.name = strtrim(sname); p = strchr(name, ','); if (p) *p = '\0'; @@ -195,6 +193,12 @@ struct entry *get_next_entry(FILE *in) FixCase(e.first); FixCase(e.middle); + e.name = buf; + if (*e.middle) + sprintf(e.name, "%s %s %s", e.first, e.middle, e.last); + else + sprintf(e.name, "%s %s", e.first, e.last); + e.id = id; e.haddr = e.hphone = ""; -- 2.45.2