mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-25 19:32:09 +00:00
be484b5d98
- provos@cvs.openbsd.org 2000/07/13 16:53:22 [aux.c readconf.c servconf.c ssh.h] allow multiple whitespace but only one '=' between tokens, bug report from Ralf S. Engelschall <rse@engelschall.com> but different fix. okay deraadt@ - provos@cvs.openbsd.org 2000/07/13 17:14:09 [clientloop.c] typo; todd@fries.net - provos@cvs.openbsd.org 2000/07/13 17:19:31 [scp.c] close can fail on AFS, report error; from Greg Hudson <ghudson@mit.edu> - markus@cvs.openbsd.org 2000/07/14 16:59:46 [readconf.c servconf.c] allow leading whitespace. ok niels - djm@cvs.openbsd.org 2000/07/14 22:01:38 [ssh-keygen.c ssh.c] Always create ~/.ssh with mode 700; ok Markus
72 lines
1.2 KiB
C
72 lines
1.2 KiB
C
#include "includes.h"
|
|
RCSID("$OpenBSD: aux.c,v 1.4 2000/07/13 22:53:21 provos Exp $");
|
|
|
|
#include "ssh.h"
|
|
|
|
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;
|
|
if (isatty(fd)) {
|
|
/* do not mess with tty's */
|
|
debug("no set_nonblock for tty fd %d", fd);
|
|
return;
|
|
}
|
|
val = fcntl(fd, F_GETFL, 0);
|
|
if (val < 0) {
|
|
error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno));
|
|
return;
|
|
}
|
|
if (val & O_NONBLOCK)
|
|
return;
|
|
debug("fd %d setting O_NONBLOCK", fd);
|
|
val |= O_NONBLOCK;
|
|
if (fcntl(fd, F_SETFL, val) == -1)
|
|
error("fcntl(%d, F_SETFL, O_NONBLOCK): %s", fd, strerror(errno));
|
|
}
|
|
|
|
/* 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);
|
|
}
|