Edit

IABSD.fr/src/lib/libevent/evutil.c

Branch :

  • Show log

    Commit

  • Author : deraadt
    Date : 2019-06-28 13:32:41
    Hash : df69c215
    Message : When system calls indicate an error they return -1, not some arbitrary value < 0. errno is only updated in this case. Change all (most?) callers of syscalls to follow this better, and let's see if this strictness helps us in the future.

  • lib/libevent/evutil.c
  • /*	$OpenBSD: evutil.c,v 1.11 2019/06/28 13:32:42 deraadt Exp $	*/
    
    /*
     * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu>
     * All rights reserved.
     *
     * Redistribution and use in source and binary forms, with or without
     * modification, are permitted provided that the following conditions
     * are met:
     * 1. Redistributions of source code must retain the above copyright
     *    notice, this list of conditions and the following disclaimer.
     * 2. Redistributions in binary form must reproduce the above copyright
     *    notice, this list of conditions and the following disclaimer in the
     *    documentation and/or other materials provided with the distribution.
     * 3. The name of the author may not be used to endorse or promote products
     *    derived from this software without specific prior written permission.
     *
     * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 AUTHOR 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.
     */
    
    #include <sys/types.h>
    #include <sys/socket.h>
    #include <sys/queue.h>
    
    #include <unistd.h>
    #include <fcntl.h>
    #include <stdlib.h>
    #include <errno.h>
    #include <stdio.h>
    #include <signal.h>
    
    #include "event.h"
    #include "event-internal.h"
    #include "evutil.h"
    #include "log.h"
    
    int
    evutil_socketpair(int family, int type, int protocol, int fd[2])
    {
    	return socketpair(family, type, protocol, fd);
    }
    
    int
    evutil_make_socket_nonblocking(int fd)
    {
    	int flags;
    
    	if ((flags = fcntl(fd, F_GETFL)) == -1) {
    		event_warn("fcntl(%d, F_GETFL)", fd);
    		return -1;
    	}
    	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) {
    		event_warn("fcntl(%d, F_SETFL)", fd);
    		return -1;
    	}
    	return 0;
    }
    
    ev_int64_t
    evutil_strtoll(const char *s, char **endptr, int base)
    {
    	return (ev_int64_t)strtoll(s, endptr, base);
    }
    
    int
    evutil_snprintf(char *buf, size_t buflen, const char *format, ...)
    {
    	int r;
    	va_list ap;
    	va_start(ap, format);
    	r = evutil_vsnprintf(buf, buflen, format, ap);
    	va_end(ap);
    	return r;
    }
    
    int
    evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
    {
    	int r = vsnprintf(buf, buflen, format, ap);
    	buf[buflen-1] = '\0';
    	return r;
    }
    
    static int
    evutil_issetugid(void)
    {
    	return issetugid();
    }
    
    const char *
    evutil_getenv(const char *varname)
    {
    	if (evutil_issetugid())
    		return NULL;
    
    	return getenv(varname);
    }