Index: ossp-pkg/rc/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/rc/Makefile.in,v rcsdiff -q -kk '-r1.29' '-r1.30' -u '/v/ossp/cvs/ossp-pkg/rc/Makefile.in,v' 2>/dev/null --- Makefile.in 2002/06/26 14:11:16 1.29 +++ Makefile.in 2002/07/10 19:02:24 1.30 @@ -59,11 +59,11 @@ TARGET_PROGS = rc TARGET_MANS = rc.1 rc-sample.5 -SRCS = rc.c rc_anal.c rc_script.c rc_config.c rc_cliopt.c \ - rc_proc.c rc_version.c rc_pcre.c rc_util.c +SRCS = rc.c rc_error.c rc_anal.c rc_script.c rc_config.c \ + rc_cliopt.c rc_proc.c rc_version.c rc_pcre.c rc_util.c -OBJS = rc.o rc_anal.o rc_script.o rc_config.o rc_cliopt.o \ - rc_proc.o rc_version.o rc_pcre.o rc_util.o +OBJS = rc.o rc_error.o rc_anal.o rc_script.o rc_config.o \ + rc_cliopt.o rc_proc.o rc_version.o rc_pcre.o rc_util.o SUBDIRS = @SUBDIR_EX@ @SUBDIR_POPT@ #SUBDIRS = @SUBDIR_EX@ @SUBDIR_VAR@ @SUBDIR_VAL@ @SUBDIR_STR@ @SUBDIR_POPT@ Index: ossp-pkg/rc/rc.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc.c,v rcsdiff -q -kk '-r1.38' '-r1.39' -u '/v/ossp/cvs/ossp-pkg/rc/rc.c,v' 2>/dev/null --- rc.c 2002/07/05 14:10:24 1.38 +++ rc.c 2002/07/10 19:02:24 1.39 @@ -27,40 +27,11 @@ ** rc.c: Run-command processor ISO C source file */ -#include - +#include /* Just for calling 'exit(3)' once */ #include "rc.h" /* Public interfaces */ /************************************************ -* rcError(ex_t) * -* Main rc error handler * -************************************************/ -void rcError(ex_t Localerr) -{ - if (FAILED((rc_return_t)Localerr.ex_value)) { /* Error condition */ - if ((rc_return_t)Localerr.ex_value == RC_ERR_TRM) - exit(0); - else if ((rc_return_t)Localerr.ex_value == RC_ERR_FNC) - fprintf(stderr, " Error condition, function file could not be opened.\n"); - else if ((rc_return_t)Localerr.ex_value == RC_ERR_DIR) - fprintf(stderr, " Error condition, location dir could not be opened.\n"); - else if ((rc_return_t)Localerr.ex_value == RC_ERR_RCF) - fprintf(stderr, " Error condition, rc file could not be opened.\n"); - else - fprintf(stderr, " Error condition of class '%s',\n exception %d in %s:%s():%d.\n", (char *)Localerr.ex_class, (int)Localerr.ex_value, Localerr.ex_file, Localerr.ex_func, Localerr.ex_line); - exit(1); /* Return failure */ - } -#ifdef DEBUG - else /* Warning condition */ - fprintf(stderr, " Warning condition of class '%s',\n exception %d in %s:%s():%d.\n", (char *)Localerr.ex_class, (int)Localerr.ex_value, Localerr.ex_file, Localerr.ex_func, Localerr.ex_line); -#else - else /* Warning condition */ - RC_NOP; /* No operation on warnings */ -#endif -} - -/************************************************ * main(int, char **) * * Main rc control block * ************************************************/ Index: ossp-pkg/rc/rc_error.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_error.c,v co -q -kk -p'1.1' '/v/ossp/cvs/ossp-pkg/rc/rc_error.c,v' | diff -u /dev/null - -L'ossp-pkg/rc/rc_error.c' 2>/dev/null --- ossp-pkg/rc/rc_error.c +++ - 2024-05-02 16:25:44.808233922 +0200 @@ -0,0 +1,61 @@ +/* OSSP rc - Run-command processor +** Copyright (c) 2002 Ralf S. Engelschall +** Copyright (c) 2002 Cable & Wireless Deutschland GmbH +** Copyright (c) 2002 The OSSP Project +** +** This file is part of OSSP rc, a portable Run-command processor +** which can be found at http://www.ossp.org/pkg/lib/rc/ +** +** Permission to use, copy, modify, and distribute this software for +** any purpose with or without fee is hereby granted, provided that +** the above copyright notice and this permission notice appear in all +** copies. +** +** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +** WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +** IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +** USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +** OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +** SUCH DAMAGE. +** +** rc_error.c: Run-command processor ISO C source file +*/ + +#include /* Just for calling 'exit(3)' once */ +#include "rc.h" /* Public interfaces */ + + +/************************************************ +* rcError(ex_t) * +* Main rc error handler * +************************************************/ +void rcError(ex_t Localerr) +{ + if (FAILED((rc_return_t)Localerr.ex_value)) { /* Error condition */ + if ((rc_return_t)Localerr.ex_value == RC_ERR_TRM) + exit(0); + else if ((rc_return_t)Localerr.ex_value == RC_ERR_FNC) + fprintf(stderr, " Error condition, function file could not be opened.\n"); + else if ((rc_return_t)Localerr.ex_value == RC_ERR_DIR) + fprintf(stderr, " Error condition, location dir could not be opened.\n"); + else if ((rc_return_t)Localerr.ex_value == RC_ERR_RCF) + fprintf(stderr, " Error condition, rc file could not be opened.\n"); + else + fprintf(stderr, " Error condition of class '%s',\n exception %d in %s:%s():%d.\n", (char *)Localerr.ex_class, (int)Localerr.ex_value, Localerr.ex_file, Localerr.ex_func, Localerr.ex_line); + exit(1); /* Return failure */ + } +#ifdef DEBUG + else /* Warning condition */ + fprintf(stderr, " Warning condition of class '%s',\n exception %d in %s:%s():%d.\n", (char *)Localerr.ex_class, (int)Localerr.ex_value, Localerr.ex_file, Localerr.ex_func, Localerr.ex_line); +#else + else /* Warning condition */ + RC_NOP; /* No operation on warnings */ +#endif +} +