2001-03-05 07:22:01 +01:00
|
|
|
/* $OpenBSD: misc.c,v 1.4 2001/02/28 17:52:54 deraadt Exp $ */
|
2000-09-16 04:29:08 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 2000 Markus Friedl. 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.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2000-08-18 06:01:04 +02:00
|
|
|
#include "includes.h"
|
2001-03-05 07:22:01 +01:00
|
|
|
RCSID("$OpenBSD: misc.c,v 1.4 2001/02/28 17:52:54 deraadt Exp $");
|
2000-08-18 06:01:04 +02:00
|
|
|
|
2001-02-04 14:20:36 +01:00
|
|
|
#include "misc.h"
|
2001-01-22 06:34:40 +01:00
|
|
|
#include "log.h"
|
2001-03-05 07:09:31 +01:00
|
|
|
#include "xmalloc.h"
|
2000-08-18 06:01:04 +02:00
|
|
|
|
|
|
|
char *
|
|
|
|
chop(char *s)
|
|
|
|
{
|
|
|
|
char *t = s;
|
|
|
|
while (*t) {
|
|
|
|
if(*t == '\n' || *t == '\r') {
|
|
|
|
*t = '\0';
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
t++;
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
set_nonblock(int fd)
|
|
|
|
{
|
|
|
|
int val;
|
|
|
|
val = fcntl(fd, F_GETFL, 0);
|
|
|
|
if (val < 0) {
|
|
|
|
error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno));
|
|
|
|
return;
|
|
|
|
}
|
2000-10-28 05:19:58 +02:00
|
|
|
if (val & O_NONBLOCK) {
|
|
|
|
debug("fd %d IS O_NONBLOCK", fd);
|
2000-08-18 06:01:04 +02:00
|
|
|
return;
|
2000-10-28 05:19:58 +02:00
|
|
|
}
|
2000-08-18 06:01:04 +02:00
|
|
|
debug("fd %d setting O_NONBLOCK", fd);
|
|
|
|
val |= O_NONBLOCK;
|
|
|
|
if (fcntl(fd, F_SETFL, val) == -1)
|
2000-08-29 02:33:50 +02:00
|
|
|
if (errno != ENODEV)
|
|
|
|
error("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
|
|
|
|
fd, strerror(errno));
|
2000-08-18 06:01:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Characters considered whitespace in strsep calls. */
|
|
|
|
#define WHITESPACE " \t\r\n"
|
|
|
|
|
|
|
|
char *
|
|
|
|
strdelim(char **s)
|
|
|
|
{
|
|
|
|
char *old;
|
|
|
|
int wspace = 0;
|
|
|
|
|
|
|
|
if (*s == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
old = *s;
|
|
|
|
|
|
|
|
*s = strpbrk(*s, WHITESPACE "=");
|
|
|
|
if (*s == NULL)
|
|
|
|
return (old);
|
|
|
|
|
|
|
|
/* Allow only one '=' to be skipped */
|
|
|
|
if (*s[0] == '=')
|
|
|
|
wspace = 1;
|
|
|
|
*s[0] = '\0';
|
|
|
|
|
|
|
|
*s += strspn(*s + 1, WHITESPACE) + 1;
|
|
|
|
if (*s[0] == '=' && !wspace)
|
|
|
|
*s += strspn(*s + 1, WHITESPACE) + 1;
|
|
|
|
|
|
|
|
return (old);
|
|
|
|
}
|
2001-02-04 14:20:36 +01:00
|
|
|
|
2001-03-05 06:56:40 +01:00
|
|
|
struct passwd *
|
|
|
|
pwcopy(struct passwd *pw)
|
|
|
|
{
|
|
|
|
struct passwd *copy = xmalloc(sizeof(*copy));
|
2001-03-05 07:22:01 +01:00
|
|
|
|
2001-03-05 06:56:40 +01:00
|
|
|
memset(copy, 0, sizeof(*copy));
|
|
|
|
copy->pw_name = xstrdup(pw->pw_name);
|
|
|
|
copy->pw_passwd = xstrdup(pw->pw_passwd);
|
2001-03-05 07:22:01 +01:00
|
|
|
copy->pw_gecos = xstrdup(pw->pw_gecos);
|
2001-03-05 06:56:40 +01:00
|
|
|
copy->pw_uid = pw->pw_uid;
|
|
|
|
copy->pw_gid = pw->pw_gid;
|
2001-03-05 08:57:09 +01:00
|
|
|
#ifdef HAVE_PW_CLASS_IN_PASSWD
|
2001-03-05 06:56:40 +01:00
|
|
|
copy->pw_class = xstrdup(pw->pw_class);
|
2001-03-05 08:57:09 +01:00
|
|
|
#endif
|
2001-03-05 06:56:40 +01:00
|
|
|
copy->pw_dir = xstrdup(pw->pw_dir);
|
|
|
|
copy->pw_shell = xstrdup(pw->pw_shell);
|
|
|
|
return copy;
|
|
|
|
}
|
|
|
|
|
2001-02-04 14:20:36 +01:00
|
|
|
mysig_t
|
|
|
|
mysignal(int sig, mysig_t act)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_SIGACTION
|
|
|
|
struct sigaction sa, osa;
|
|
|
|
|
2001-02-17 18:10:16 +01:00
|
|
|
if (sigaction(sig, NULL, &osa) == -1)
|
2001-02-04 14:20:36 +01:00
|
|
|
return (mysig_t) -1;
|
|
|
|
if (osa.sa_handler != act) {
|
2001-02-17 18:10:16 +01:00
|
|
|
memset(&sa, 0, sizeof(sa));
|
2001-02-04 14:20:36 +01:00
|
|
|
sigemptyset(&sa.sa_mask);
|
|
|
|
sa.sa_flags = 0;
|
2001-02-18 04:42:02 +01:00
|
|
|
#if defined(SA_RESTART)
|
2001-02-18 05:18:43 +01:00
|
|
|
if (sig == SIGCHLD)
|
2001-02-16 15:58:12 +01:00
|
|
|
sa.sa_flags |= SA_RESTART;
|
2001-02-18 05:18:43 +01:00
|
|
|
#endif
|
|
|
|
#if defined(SA_INTERRUPT)
|
|
|
|
if (sig == SIGALRM)
|
2001-02-18 03:04:23 +01:00
|
|
|
sa.sa_flags |= SA_INTERRUPT;
|
2001-02-17 17:51:07 +01:00
|
|
|
#endif
|
2001-02-04 14:20:36 +01:00
|
|
|
sa.sa_handler = act;
|
2001-02-17 18:10:16 +01:00
|
|
|
if (sigaction(sig, &sa, NULL) == -1)
|
2001-02-04 14:20:36 +01:00
|
|
|
return (mysig_t) -1;
|
|
|
|
}
|
|
|
|
return (osa.sa_handler);
|
|
|
|
#else
|
|
|
|
return (signal(sig, act));
|
|
|
|
#endif
|
|
|
|
}
|