summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2007-06-26 23:04:09 +0000
committerKen Raeburn <raeburn@mit.edu>2007-06-26 23:04:09 +0000
commit98ae6e07fe8d5c32b98e06c1a852a32c839d80e2 (patch)
tree449092388417bfb914dda90d20dde3632f10ff0e
parent8325d6530500cf44fd75d7ddac0a02edd1a26cb2 (diff)
downloadkrb5-98ae6e07fe8d5c32b98e06c1a852a32c839d80e2.tar.gz
krb5-98ae6e07fe8d5c32b98e06c1a852a32c839d80e2.tar.xz
krb5-98ae6e07fe8d5c32b98e06c1a852a32c839d80e2.zip
* v4rcp.c (error): Use stdarg version always. Call vsnprintf instead of vsprintf.
(strsave): Call strdup. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19642 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/appl/bsd/v4rcp.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/src/appl/bsd/v4rcp.c b/src/appl/bsd/v4rcp.c
index 788c1f586..71b1b8da4 100644
--- a/src/appl/bsd/v4rcp.c
+++ b/src/appl/bsd/v4rcp.c
@@ -948,27 +948,16 @@ allocbuf(bp, fd, blksize)
}
void
-#ifdef HAVE_STDARG_H
error(char *fmt, ...)
-#else
-/*VARARGS1*/
-error(fmt, va_alist)
- char *fmt;
- va_dcl
-#endif
{
va_list ap;
char buf[BUFSIZ], *cp = buf;
-#ifdef HAVE_STDARG_H
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
errs++;
*cp++ = 1;
- (void) vsprintf(cp, fmt, ap);
+ (void) vsnprintf(cp, sizeof(buf) - (cp-buf), fmt, ap);
va_end(ap);
if (krem)
@@ -1008,13 +997,13 @@ strsave(sp)
char *sp;
{
register char *ret;
-
- if((ret = (char *)malloc((unsigned) strlen(sp)+1)) == NULL) {
+
+ ret = strdup(sp);
+ if (ret == NULL) {
fprintf(stderr, "rcp: no memory for saving args\n");
exit(1);
}
- (void) strcpy(ret,sp);
- return(ret);
+ return ret;
}
#endif