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

diff --git a/sbr/mts.c b/sbr/mts.c
index 6b8b3a2..a464493 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -11,7 +11,6 @@
 #include <h/utils.h>
 #include <ctype.h>
 #include <stdio.h>
-#include <h/mts.h>
 #include <pwd.h>
 #include <netdb.h>
 
@@ -72,34 +71,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 +103,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,7 +124,7 @@ 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 != ',';) {
+	for (cp = tmp; *np != '\0' && *np != ',';) {
 #ifndef BSD42
 		*cp++ = *np++;
 #else /* BSD42 */
@@ -185,15 +157,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;
 }