d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use err(3). exit(-1) -> exit(1).

Browse Source
This commit is contained in:
charnier 1997-11-20 07:23:44 +00:00
parent cde2fbd6b0
commit 53b5ed0174
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libexec/comsat/comsat.c
View File

@ -29,18 +29,20 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*
* $Id: comsat.c,v 1.9 1997/09/15 00:27:49 ache Exp $
*/ */
#ifndef lint #ifndef lint
static char copyright[] = static const char copyright[] =
"@(#) Copyright (c) 1980, 1993\n\ "@(#) Copyright (c) 1980, 1993\n\
The Regents of the University of California. All rights reserved.\n"; The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#ifndef lint #ifndef lint
#if 0
static char sccsid[] = "@(#)comsat.c 8.1 (Berkeley) 6/4/93"; static char sccsid[] = "@(#)comsat.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
"$Id$";
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -52,6 +54,7 @@ static char sccsid[] = "@(#)comsat.c 8.1 (Berkeley) 6/4/93";
#include <netinet/in.h> #include <netinet/in.h>
#include <ctype.h> #include <ctype.h>
#include <err.h>
#include <errno.h> #include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <paths.h> #include <paths.h>
@ -93,11 +96,8 @@ main(argc, argv)
/* verify proper invocation */ /* verify proper invocation */
fromlen = sizeof(from); fromlen = sizeof(from);
if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0)
(void)fprintf(stderr, err(1, "getsockname");
"comsat: getsockname: %s.\n", strerror(errno));
exit(1);
}
openlog("comsat", LOG_PID, LOG_DAEMON); openlog("comsat", LOG_PID, LOG_DAEMON);
if (chdir(_PATH_MAILDIR)) { if (chdir(_PATH_MAILDIR)) {
syslog(LOG_ERR, "chdir: %s: %m", _PATH_MAILDIR); syslog(LOG_ERR, "chdir: %s: %m", _PATH_MAILDIR);
@ -229,7 +229,7 @@ notify(utp, file, offset, folder)
(void)alarm((u_int)30); (void)alarm((u_int)30);
if ((tp = fopen(tty, "w")) == NULL) { if ((tp = fopen(tty, "w")) == NULL) {
dsyslog(LOG_ERR, "%s: %s", tty, strerror(errno)); dsyslog(LOG_ERR, "%s: %s", tty, strerror(errno));
_exit(-1); _exit(1);
} }
(void)tcgetattr(fileno(tp), &tio); (void)tcgetattr(fileno(tp), &tio);
cr = ((tio.c_oflag & (OPOST|ONLCR)) == (OPOST|ONLCR)) ? "\n" : "\n\r"; cr = ((tio.c_oflag & (OPOST|ONLCR)) == (OPOST|ONLCR)) ? "\n" : "\n\r";
@ -280,8 +280,8 @@ jkfprintf(tp, user, file, offset)
continue; continue;
} }
if (line[0] == ' ' || line[0] == '\t' || if (line[0] == ' ' || line[0] == '\t' ||
strncmp(line, "From:", 5) && (strncmp(line, "From:", 5) &&
strncmp(line, "Subject:", 8)) strncmp(line, "Subject:", 8)))
continue; continue;
} }
if (linecnt <= 0 || charcnt <= 0) { if (linecnt <= 0 || charcnt <= 0) {