X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fvherror_msg.c;h=04446a090d407543ac2cfa2301aa39796a817437;hb=1340ca8c87d81bf00e604905f25bc04da22e980f;hp=44f6ebd284c223b71d6ef0e6840ac428533aa5ac;hpb=74400ccfd08e8ff72b9147951dd437dd3bb7abb1;p=oweals%2Fbusybox.git diff --git a/libbb/vherror_msg.c b/libbb/vherror_msg.c index 44f6ebd28..04446a090 100644 --- a/libbb/vherror_msg.c +++ b/libbb/vherror_msg.c @@ -2,42 +2,14 @@ /* * 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 * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include -#include - #include "libbb.h" - -extern void vherror_msg(const char *s, va_list p) +void bb_vherror_msg(const char *s, va_list p) { - if(s == 0) - s = ""; - verror_msg(s, p); - if (*s) - fputs(": ", stderr); - herror(""); + bb_verror_msg(s, p, hstrerror(h_errno)); }