[Pkg-shadow-commits] r2784 - in upstream/trunk: . libmisc

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-24 22:22:57 +0000 (Fri, 24 Apr 2009)
New Revision: 2784

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/mail.c
Log:
	* libmisc/mail.c: Ignore the return value of puts().
	* libmisc/mail.c: Prefer snprintf to sprintf, even if a small
	context indicates no issues.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-23 21:19:02 UTC (rev 2783)
+++ upstream/trunk/ChangeLog	2009-04-24 22:22:57 UTC (rev 2784)
@@ -1,3 +1,9 @@
+2009-04-25  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* libmisc/mail.c: Ignore the return value of puts().
+	* libmisc/mail.c: Prefer snprintf to sprintf, even if a small
+	context indicates no issues.
+
 2009-04-22  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* lib/commonio.c, lib/commonio.h, lib/groupio.c, lib/groupio.h,

Modified: upstream/trunk/libmisc/mail.c
===================================================================
--- upstream/trunk/libmisc/mail.c	2009-04-23 21:19:02 UTC (rev 2783)
+++ upstream/trunk/libmisc/mail.c	2009-04-24 22:22:57 UTC (rev 2784)
@@ -57,13 +57,14 @@
 	mailbox = getenv ("MAILDIR");
 	if (NULL != mailbox) {
 		char *newmail;
+		size_t len = strlen (mailbox) + 5;
 
-		newmail = xmalloc (strlen (mailbox) + 5);
-		sprintf (newmail, "%s/new", mailbox);
+		newmail = xmalloc (len);
+		snprintf (newmail, len, "%s/new", mailbox);
 		if (stat (newmail, &statbuf) != -1 && statbuf.st_size != 0) {
 			if (statbuf.st_mtime > statbuf.st_atime) {
 				free (newmail);
-				puts (_("You have new mail."));
+				(void) puts (_("You have new mail."));
 				return;
 			}
 		}
@@ -77,11 +78,11 @@
 
 	if (   (stat (mailbox, &statbuf) == -1)
 	    || (statbuf.st_size == 0)) {
-		puts (_("No mail."));
+		(void) puts (_("No mail."));
 	} else if (statbuf.st_atime > statbuf.st_mtime) {
-		puts (_("You have mail."));
+		(void) puts (_("You have mail."));
 	} else {
-		puts (_("You have new mail."));
+		(void) puts (_("You have new mail."));
 	}
 }