X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fmts.c;h=b52740df5608ca25aa02e9a32551f9806a192fc3;hp=6b8b3a2cd9fe85b2294bc8465a2b5e3b89fa32bf;hb=88b2142594d5ea1e8385dae5eca81eed1018c555;hpb=d3540eaa4251b3a282115a72ed5d1bb39ce74b3f

diff --git a/sbr/mts.c b/sbr/mts.c
index 6b8b3a2..b52740d 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -7,20 +7,13 @@
 */
 
 #include <h/mh.h>   /* for snprintf() */
-#include <h/nmh.h>
 #include <h/utils.h>
 #include <ctype.h>
 #include <stdio.h>
-#include <h/mts.h>
 #include <pwd.h>
+#include <sys/socket.h>
 #include <netdb.h>
-
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
-
-#define NOTOK  (-1)
-#define OK     0
+#include <unistd.h>
 
 /*
 ** static prototypes
@@ -40,25 +33,16 @@ LocalName(void)
 {
 	static char buffer[BUFSIZ] = "";
 	struct addrinfo hints, *res;
-#ifdef HAVE_UNAME
-	struct utsname name;
-#endif
 
 	/* check if we have cached the local name */
 	if (buffer[0])
 		return buffer;
 
 	memset(buffer, 0, sizeof(buffer));
-#ifdef HAVE_UNAME
-	/* first get our local name */
-	uname(&name);
-	strncpy(buffer, name.nodename, sizeof(buffer) - 1);
-#else
 	/* first get our local name */
 	gethostname(buffer, sizeof(buffer) - 1);
-#endif
-	/* now fully qualify our name */
 
+	/* now fully qualify our name */
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_flags = AI_CANONNAME;
 	hints.ai_family = PF_UNSPEC;
@@ -72,34 +56,6 @@ LocalName(void)
 
 
 /*
-** This is only for UUCP mail.  It gets the hostname
-** as part of the UUCP "domain".
-*/
-char *
-SystemName(void)
-{
-	static char buffer[BUFSIZ] = "";
-
-#ifdef HAVE_UNAME
-	struct utsname name;
-#endif
-
-	/* check if we have cached the system name */
-	if (buffer[0])
-		return buffer;
-
-#ifdef HAVE_UNAME
-	uname(&name);
-	strncpy(buffer, name.nodename, sizeof(buffer));
-#else
-	gethostname(buffer, sizeof(buffer));
-#endif
-
-	return buffer;
-}
-
-
-/*
 ** Get the username of current user
 */
 char *
@@ -132,16 +88,17 @@ getfullname(void)
 static void
 getuserinfo(void)
 {
-	register unsigned char *cp;
-	register char *np;
-	register struct passwd *pw;
-
-	if ((pw = getpwuid(getuid())) == NULL
-		|| pw->pw_name == NULL
-		|| *pw->pw_name == '\0') {
+	unsigned char *cp;
+	char *np;
+	struct passwd *pw;
+	int needquotes = 0;
+	char tmp[BUFSIZ];
+	char *tp;
+
+	if (!(pw = getpwuid(getuid())) || !pw->pw_name || !*pw->pw_name) {
 		strncpy(username, "unknown", sizeof(username));
-		snprintf(fullname, sizeof(fullname), "The Unknown User-ID (%d)",
-			(int) getuid());
+		snprintf(fullname, sizeof(fullname),
+				"The Unknown User-ID (%d)", (int)getuid());
 		return;
 	}
 
@@ -152,30 +109,8 @@ getuserinfo(void)
 	** we hit a ',', which some OSes use to separate other 'finger'
 	** information in the GECOS field, like phone number.
 	*/
-	for (cp = fullname; *np != '\0' && *np != ',';) {
-#ifndef BSD42
+	for (cp = tmp; *np != '\0' && *np != ',';) {
 		*cp++ = *np++;
-#else /* BSD42 */
-		/*
-		** On BSD(-derived) systems, the system utilities that
-		** deal with the GECOS field (finger, mail, sendmail,
-		** etc.) translate any '&' character in it to the login name,
-		** with the first letter capitalized.  So, for instance,
-		** fingering a user "bob" with the GECOS field "& Jones"
-		** would reveal him to be "In real life: Bob Jones".
-		** Surprisingly, though, the OS doesn't do the translation
-		** for you, so we have to do it manually here.
-		*/
-		if (*np == '&') {  /* blech! */
-			strcpy(cp, pw->pw_name);
-			*cp = toupper(*cp);
-			while (*cp)
-				cp++;
-			np++;
-		} else {
-			*cp++ = *np++;
-		}
-#endif /* BSD42 */
 	}
 	*cp = '\0';
 	strncpy(username, pw->pw_name, sizeof(username));
@@ -185,15 +120,36 @@ getuserinfo(void)
 	** idea of your real name.
 	*/
 	if ((cp = getenv("SIGNATURE")) && *cp)
-		strncpy(fullname, cp, sizeof(fullname));
-
-	if (strchr(fullname, '.')) {  /*  quote any .'s */
-		char tmp[BUFSIZ];
-
-		/* should quote "'s too */
-		snprintf(tmp, sizeof(tmp), "\"%s\"", fullname);
-		strncpy(fullname, tmp, sizeof(fullname));
+		strncpy(tmp, cp, sizeof(tmp));
+
+	/* quote the fullname as needed */
+	needquotes = 0;
+	for (tp=tmp; *tp; tp++) {
+		switch (*tp) {
+		case '(': case ')': case '<': case '>': case '[': case ']':
+		case ':': case ';': case '@': case '\\': case ',': case '.':
+		case '"':  /* cf. RFC 5322 */
+			break;  /* ... the switch */
+		default:
+			continue;  /* ... the loop */
+		}
+		/* we've found a special char */
+		needquotes = 1;
+		break;
 	}
+	cp=fullname;
+	if (needquotes) {
+		*cp++ = '"';
+	}
+	for (tp=tmp; *tp; *cp++=*tp++) {
+		if (*tp == '"') {
+			*cp++ = '\\';  /* prepend backslash */
+		}
+	}
+	if (needquotes) {
+		*cp++ = '"';
+	}
+	*cp = '\0';
 
 	return;
 }