diff options
Diffstat (limited to 'release/src/router/busybox/libbb/perror_msg.c')
-rw-r--r-- | release/src/router/busybox/libbb/perror_msg.c | 44 |
1 files changed, 9 insertions, 35 deletions
diff --git a/release/src/router/busybox/libbb/perror_msg.c b/release/src/router/busybox/libbb/perror_msg.c index 18c71ab1..6c8e1b51 100644 --- a/release/src/router/busybox/libbb/perror_msg.c +++ b/release/src/router/busybox/libbb/perror_msg.c @@ -2,50 +2,24 @@ /* * Utility routines. * - * Copyright (C) tons of folks. Tracking down who wrote what - * isn't something I'm going to worry about... If you wrote something - * here, please feel free to acknowledge your work. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Based in part on code from sash, Copyright (c) 1999 by David I. Bell - * Permission has been granted to redistribute this code under the GPL. + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdio.h> -#include <errno.h> -#include <string.h> -#include <stdlib.h> #include "libbb.h" -extern void perror_msg(const char *s, ...) +void FAST_FUNC bb_perror_msg(const char *s, ...) { va_list p; va_start(p, s); - vperror_msg(s, p); + /* Guard against "<error message>: Success" */ + bb_verror_msg(s, p, errno ? strerror(errno) : NULL); va_end(p); } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ +void FAST_FUNC bb_simple_perror_msg(const char *s) +{ + bb_perror_msg("%s", s); +} |