Module Name: src
Committed By: joerg
Date: Tue Feb 28 22:30:44 UTC 2012
Modified Files:
src/usr.bin/mail: extern.h mime_detach.c
Log Message:
Mark sasprintf as using a printf-like format. Fix format string to use
all arguments by telling the user what file would be overwritten.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/mail/extern.h
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/mail/mime_detach.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mail/extern.h
diff -u src/usr.bin/mail/extern.h:1.31 src/usr.bin/mail/extern.h:1.32
--- src/usr.bin/mail/extern.h:1.31 Fri Apr 10 13:08:24 2009
+++ src/usr.bin/mail/extern.h Tue Feb 28 22:30:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.31 2009/04/10 13:08:24 christos Exp $ */
+/* $NetBSD: extern.h,v 1.32 2012/02/28 22:30:44 joerg Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.2 (Berkeley) 4/20/95
- * $NetBSD: extern.h,v 1.31 2009/04/10 13:08:24 christos Exp $
+ * $NetBSD: extern.h,v 1.32 2012/02/28 22:30:44 joerg Exp $
*/
#ifndef __EXTERN_H__
@@ -294,7 +294,7 @@ int isign(const char *, struct ignoretab
void istrcpy(char *, const char *);
int member(char *, struct ignoretab *);
char * nameof(struct message *, int);
-int sasprintf(char **ret, const char *format, ...);
+int sasprintf(char **ret, const char *format, ...) __printflike(2, 3);
char * savestr(const char *);
struct message *set_m_flag(int, int, int);
char * skin(char *);
Index: src/usr.bin/mail/mime_detach.c
diff -u src/usr.bin/mail/mime_detach.c:1.6 src/usr.bin/mail/mime_detach.c:1.7
--- src/usr.bin/mail/mime_detach.c:1.6 Tue May 24 12:33:22 2011
+++ src/usr.bin/mail/mime_detach.c Tue Feb 28 22:30:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mime_detach.c,v 1.6 2011/05/24 12:33:22 joerg Exp $ */
+/* $NetBSD: mime_detach.c,v 1.7 2012/02/28 22:30:44 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef __lint__
-__RCSID("$NetBSD: mime_detach.c,v 1.6 2011/05/24 12:33:22 joerg Exp $");
+__RCSID("$NetBSD: mime_detach.c,v 1.7 2012/02/28 22:30:44 joerg Exp $");
#endif /* not __lint__ */
#include <assert.h>
@@ -132,7 +132,7 @@ detach_open_core(char *fname, const char
if (detach_ctl.ask && fd == -1 && errno == EEXIST) {
char *p;
start:
- (void)sasprintf(&p, "%-7s overwrite: Always/Never/once/next/rename (ANonr)[n]? ",
+ (void)sasprintf(&p, "%-7s overwrite %s: Always/Never/once/next/rename (ANonr)[n]? ",
partstr, fname);
p = my_gets(&elm.string, p, NULL);
if (p == NULL)
