add e-host-utils.[ch]
2001-04-22 Chris Toshok <toshok@ximian.com> * Makefile.am (libeutil_la_SOURCES): add e-host-utils.[ch] * e-host-utils.c: new file, with e_gethostbyname_r. * e-host-utils.h: new file. svn path=/trunk/; revision=9502
This commit is contained in:

committed by
Chris Toshok

parent
2439e91a5c
commit
f726a8e69e
@ -1,3 +1,11 @@
|
|||||||
|
2001-04-22 Chris Toshok <toshok@ximian.com>
|
||||||
|
|
||||||
|
* Makefile.am (libeutil_la_SOURCES): add e-host-utils.[ch]
|
||||||
|
|
||||||
|
* e-host-utils.c: new file, with e_gethostbyname_r.
|
||||||
|
|
||||||
|
* e-host-utils.h: new file.
|
||||||
|
|
||||||
2001-04-19 Dan Winship <danw@ximian.com>
|
2001-04-19 Dan Winship <danw@ximian.com>
|
||||||
|
|
||||||
* e-html-utils.c (is_citation): ">From" is not a citation unless
|
* e-html-utils.c (is_citation): ">From" is not a citation unless
|
||||||
|
@ -23,6 +23,8 @@ libeutil_la_SOURCES = \
|
|||||||
e-gtk-utils.h \
|
e-gtk-utils.h \
|
||||||
e-gui-utils.c \
|
e-gui-utils.c \
|
||||||
e-gui-utils.h \
|
e-gui-utils.h \
|
||||||
|
e-host-utils.c \
|
||||||
|
e-host-utils.h \
|
||||||
e-html-utils.c \
|
e-html-utils.c \
|
||||||
e-html-utils.h \
|
e-html-utils.h \
|
||||||
e-iterator.c \
|
e-iterator.c \
|
||||||
|
139
e-util/e-host-utils.c
Normal file
139
e-util/e-host-utils.c
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
|
||||||
|
/* e-host-utils.c
|
||||||
|
*
|
||||||
|
* Copyright (C) 2001 Helix Code, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public
|
||||||
|
* License along with this program; if not, write to the
|
||||||
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*
|
||||||
|
* Author: Chris Toshok
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
|
#include "e-msgport.h"
|
||||||
|
#include "e-host-utils.h"
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#ifndef HAVE_GETHOSTBYNAME_R
|
||||||
|
static EMutex *gethost_mutex = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void
|
||||||
|
e_gethostbyname_init ()
|
||||||
|
{
|
||||||
|
#ifndef HAVE_GETHOSTBYNAME_R
|
||||||
|
if (gethost_mutex)
|
||||||
|
return;
|
||||||
|
|
||||||
|
gethost_mutex = e_mutex_new (E_MUTEX_SIMPLE);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
e_gethostbyname_r (const char *name, struct hostent *host,
|
||||||
|
char *buf, int buflen, int *herr)
|
||||||
|
{
|
||||||
|
#ifdef HAVE_GETHOSTBYNAME_R
|
||||||
|
#ifdef GETHOSTBYNAME_R_FIVE_ARGS
|
||||||
|
return gethostbyname_r(name, host, buf, buflen, herr);
|
||||||
|
#else
|
||||||
|
struct hostent *hp;
|
||||||
|
return gethostbyname_r(name, host, buf, buflen, &hp, herr);
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
int i;
|
||||||
|
char *p;
|
||||||
|
struct hostent *h;
|
||||||
|
int req_length;
|
||||||
|
int num_aliases = 0, num_addrs = 0;
|
||||||
|
|
||||||
|
if (!gethost_mutex) {
|
||||||
|
g_warning ("mutex wasn't initialized - you must call e_gethostbyname_init before e_gethostbyname_r\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
e_mutex_lock (gethost_mutex);
|
||||||
|
|
||||||
|
h = gethostbyname (name);
|
||||||
|
|
||||||
|
if (!h) {
|
||||||
|
e_mutex_unlock (gethost_mutex);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check to make sure we have enough room in our buffer */
|
||||||
|
req_length = 0;
|
||||||
|
if (h->h_aliases) {
|
||||||
|
for (i = 0; h->h_aliases[i]; i ++)
|
||||||
|
req_length += strlen (h->h_aliases[i]) + 1;
|
||||||
|
num_aliases = i + 1;
|
||||||
|
}
|
||||||
|
if (h->h_addr_list) {
|
||||||
|
for (i = 0; h->h_addr_list[i]; i ++)
|
||||||
|
req_length += h->h_length;
|
||||||
|
num_addrs = i + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (buflen < req_length) {
|
||||||
|
*herr = ERANGE;
|
||||||
|
e_mutex_unlock (gethost_mutex);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (num_aliases)
|
||||||
|
host->h_aliases = malloc (sizeof (char*) * num_aliases);
|
||||||
|
else
|
||||||
|
host->h_aliases = NULL;
|
||||||
|
if (num_addrs)
|
||||||
|
host->h_addr_list = malloc (sizeof (char*) * num_addrs);
|
||||||
|
else
|
||||||
|
host->h_addr_list = NULL;
|
||||||
|
|
||||||
|
host->h_name = strdup (h->h_name);
|
||||||
|
host->h_addrtype = h->h_addrtype;
|
||||||
|
host->h_length = h->h_length;
|
||||||
|
|
||||||
|
/* copy the aliases/addresses into the buffer, and assign the
|
||||||
|
pointers into the hostent */
|
||||||
|
*buf = 0;
|
||||||
|
p = buf;
|
||||||
|
if (num_aliases) {
|
||||||
|
for (i = 0; h->h_aliases[i]; i ++) {
|
||||||
|
strcpy (buf, h->h_aliases[i]);
|
||||||
|
host->h_aliases[i] = p;
|
||||||
|
p += strlen (h->h_aliases[i]);
|
||||||
|
}
|
||||||
|
host->h_aliases[num_aliases - 1] = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (num_addrs) {
|
||||||
|
for (i = 0; h->h_addr_list[i]; i ++) {
|
||||||
|
memcpy (buf, h->h_addr_list[i], h->h_length);
|
||||||
|
host->h_addr_list[i] = p;
|
||||||
|
p += h->h_length;
|
||||||
|
}
|
||||||
|
host->h_addr_list[num_addrs - 1] = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
*herr = h_errno;
|
||||||
|
|
||||||
|
e_mutex_unlock (gethost_mutex);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
#endif
|
||||||
|
}
|
39
e-util/e-host-utils.h
Normal file
39
e-util/e-host-utils.h
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
|
||||||
|
/* e-host-utils.h
|
||||||
|
*
|
||||||
|
* Copyright (C) 2001 Helix Code, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public
|
||||||
|
* License along with this program; if not, write to the
|
||||||
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*
|
||||||
|
* Author: Chris Toshok
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef E_HOST_UTILS_H
|
||||||
|
#define E_HOST_UTILS_H
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
|
||||||
|
void e_gethostbyname_init (void);
|
||||||
|
|
||||||
|
/* gethostbyname_r implementation that works for systems without a
|
||||||
|
native gethostbyname_r. if you use this, you must make sure to
|
||||||
|
*only* use this - it can't even coexist with naked calls to
|
||||||
|
gethostbyname (even if they exist in libraries.) yes, this loses
|
||||||
|
in many ways. blame your local OS developer. */
|
||||||
|
int e_gethostbyname_r (const char *name, struct hostent *host, char *buf, int buflen, int *herr);
|
||||||
|
|
||||||
|
#endif /* E_HOST_UTILS_H */
|
Reference in New Issue
Block a user