RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-11 12:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2001/02/21 07:37:04

Browse Source 
[ssh-keyscan.c]
     inline -> __inline__, and some indent
This commit is contained in:
Ben Lindstrom 2001-03-05 04:54:49 +00:00
parent 53992c7cd5
commit b0a4cd8f91
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,10 +1,12 @@
20010305 20010305
- (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch] - (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch]
- OpenBSD CVS Sync - (bal) OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2001/02/17 23:48:48 - deraadt@cvs.openbsd.org 2001/02/17 23:48:48
[sshd.8] [sshd.8]
it's the OpenSSH one it's the OpenSSH one
- deraadt@cvs.openbsd.org 2001/02/21 07:37:04
[ssh-keyscan.c]
inline -> __inline__, and some indent
20010304 20010304
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@ -4197,4 +4199,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.852 2001/03/05 04:47:55 mouring Exp $ $Id: ChangeLog,v 1.853 2001/03/05 04:54:49 mouring Exp $

24
ssh-keyscan.c
View File

@ -8,7 +8,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keyscan.c,v 1.16 2001/02/12 22:56:10 deraadt Exp $"); RCSID("$OpenBSD: ssh-keyscan.c,v 1.17 2001/02/21 07:37:04 deraadt Exp $");
#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
#include <sys/queue.h> #include <sys/queue.h>
@ -89,7 +89,7 @@ typedef struct {
void (*errfun) (const char *,...); void (*errfun) (const char *,...);
} Linebuf; } Linebuf;
static inline Linebuf * static __inline__ Linebuf *
Linebuf_alloc(const char *filename, void (*errfun) (const char *,...)) Linebuf_alloc(const char *filename, void (*errfun) (const char *,...))
{ {
Linebuf *lb; Linebuf *lb;
@ -123,7 +123,7 @@ Linebuf_alloc(const char *filename, void (*errfun) (const char *,...))
return (lb); return (lb);
} }
static inline void static __inline__ void
Linebuf_free(Linebuf * lb) Linebuf_free(Linebuf * lb)
{ {
fclose(lb->stream); fclose(lb->stream);
@ -131,7 +131,7 @@ Linebuf_free(Linebuf * lb)
xfree(lb); xfree(lb);
} }
static inline void static __inline__ void
Linebuf_restart(Linebuf * lb) Linebuf_restart(Linebuf * lb)
{ {
clearerr(lb->stream); clearerr(lb->stream);
@ -139,13 +139,13 @@ Linebuf_restart(Linebuf * lb)
lb->lineno = 0; lb->lineno = 0;
} }
static inline int static __inline__ int
Linebuf_lineno(Linebuf * lb) Linebuf_lineno(Linebuf * lb)
{ {
return (lb->lineno); return (lb->lineno);
} }
static inline char * static __inline__ char *
Linebuf_getline(Linebuf * lb) Linebuf_getline(Linebuf * lb)
{ {
int n = 0; int n = 0;
@ -155,7 +155,8 @@ Linebuf_getline(Linebuf * lb)
/* Read a line */ /* Read a line */
if (!fgets(&lb->buf[n], lb->size - n, lb->stream)) { if (!fgets(&lb->buf[n], lb->size - n, lb->stream)) {
if (ferror(lb->stream) && lb->errfun) if (ferror(lb->stream) && lb->errfun)
(*lb->errfun) ("%s: %s\n", lb->filename, strerror(errno)); (*lb->errfun) ("%s: %s\n", lb->filename,
strerror(errno));
return (NULL); return (NULL);
} }
n = strlen(lb->buf); n = strlen(lb->buf);
@ -167,13 +168,15 @@ Linebuf_getline(Linebuf * lb)
} }
if (n != lb->size - 1) { if (n != lb->size - 1) {
if (lb->errfun) if (lb->errfun)
(*lb->errfun) ("%s: skipping incomplete last line\n", lb->filename); (*lb->errfun) ("%s: skipping incomplete last line\n",
lb->filename);
return (NULL); return (NULL);
} }
/* Double the buffer if we need more space */ /* Double the buffer if we need more space */
if (!(lb->buf = realloc(lb->buf, (lb->size *= 2)))) { if (!(lb->buf = realloc(lb->buf, (lb->size *= 2)))) {
if (lb->errfun) if (lb->errfun)
(*lb->errfun) ("linebuf (%s): realloc failed\n", lb->filename); (*lb->errfun) ("linebuf (%s): realloc failed\n",
lb->filename);
return (NULL); return (NULL);
} }
} }
@ -184,6 +187,7 @@ fdlim_get(int hard)
{ {
#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE) #if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
struct rlimit rlfd; struct rlimit rlfd;
if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0) if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0)
return (-1); return (-1);
if ((hard ? rlfd.rlim_max : rlfd.rlim_cur) == RLIM_INFINITY) if ((hard ? rlfd.rlim_max : rlfd.rlim_cur) == RLIM_INFINITY)
@ -222,7 +226,7 @@ fdlim_set(int lim)
* separators. This is the same as the 4.4BSD strsep, but different from the * separators. This is the same as the 4.4BSD strsep, but different from the
* one in the GNU libc. * one in the GNU libc.
*/ */
inline char * static __inline__ char *
xstrsep(char **str, const char *delim) xstrsep(char **str, const char *delim)
{ {
char *s, *e; char *s, *e;