remove gvhostname.c.

	hostname is no longer used by gvconfig.c now that config is created in GVLIBDIR

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 909f898426618656e91059bc46ba4403d5e0e47d..8fe45fa02bfcb356cbdae45147ba298e800d184d 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -17,6 +17,4 @@ pkglib_LTLIBRARIES = libgvc.la
 libgvc_la_SOURCES = gvrender.c gvlayout.c gvtextlayout.c gvcontext.c \
        gvjobs.c gvevent.c gvplugin.c gvconfig.c
 
-# gvhostname.c
-
 EXTRA_DIST = Makefile.old

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index eb3d56e20eae5e79428fded5463b6cf75e8cd6c7..585b9568e013341c91592a084f2f85837be33975 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -277,11 +277,6 @@ void gvconfig(GVC_t * gvc)
     char *config_path = NULL, *config_text = NULL;
 
     char *config_file_name = "config";
-#if 0
-    char *home;
-    char *config_dir_name = ".graphviz";
-    char *s;
-#endif
 
 #define MAX_SZ_CONFIG 100000
 #endif
@@ -303,42 +298,11 @@ void gvconfig(GVC_t * gvc)
        return;
     }
 
-#if 0
-    home = getenv ("HOME");
-    if (!home) {
-       rc = -1;
-    }
-    else {
-       s = gvhostname();
-        config_path = malloc(strlen(home) 
-                               + 1
-                               + strlen(config_dir_name)
-                               + 1
-                               + strlen(s)
-                               + 1
-                               + strlen(config_file_name)
-                               + 1);
-        strcpy(config_path, home);
-        strcat(config_path, "/");
-        strcat(config_path, config_dir_name);
-        rc = mkdir(config_path, 0700);
-
-        strcat(config_path, "/");
-       if (s[0]) {
-           strcat(config_path, s);
-           strcat(config_path, "_");
-       }
-        strcat(config_path, config_file_name);
-
-        rc = stat(config_path, &config_st);
-    }
-#else
     config_path = malloc(strlen(GVLIBDIR) + 1 + strlen(config_file_name) + 1);
     strcpy(config_path, GVLIBDIR);
     strcat(config_path, "/");
     strcat(config_path, config_file_name);
     rc = stat(config_path, &config_st);
-#endif
        
     if (rc == -1 || libdir_st.st_mtime > config_st.st_mtime) {
        config_rescan(gvc, config_path);

diff --git a/lib/gvc/gvhostname.c b/lib/gvc/gvhostname.c
deleted file mode 100644 (file)
index ab65c8e..0000000
--- a/lib/gvc/gvhostname.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-*      This software is part of the graphviz package      *
-*                http://www.graphviz.org/                 *
-*                                                         *
-*            Copyright (c) 1994-2004 AT&T Corp.           *
-*                and is licensed under the                *
-*            Common Public License, Version 1.0           *
-*                      by AT&T Corp.                      *
-*                                                         *
-*        Information and Software Systems Research        *
-*              AT&T Research, Florham Park NJ             *
-**********************************************************/
-
-
-/* This code is adapted from tclInixSock.c from Tcl sources. */
-
-#include "config.h"
-
-#include <string.h>
-#include <netdb.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNAME
-#include <sys/utsname.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-/*
- * There is no portable macro for the maximum length
- * of host names returned by gethostbyname().  We should only
- * trust SYS_NMLN if it is at least 255 + 1 bytes to comply with DNS
- * host name limits.
- *
- * Note:  SYS_NMLN is a restriction on "uname" not on gethostbyname!
- *
- * For example HP-UX 10.20 has SYS_NMLN == 9,  while gethostbyname()
- * can return a fully qualified name from DNS of up to 255 bytes.
- *
- * Fix suggested by Viktor Dukhovni (viktor@esm.com)
- */
-
-#if defined(SYS_NMLN) && SYS_NMLEN >= 256
-#define HOSTNAME_LEN SYS_NMLEN
-#else
-#define HOSTNAME_LEN 256
-#endif
-
-/*
- * The following variable holds the network name of this host.
- */
-
-static char hostname[HOSTNAME_LEN + 1];
-static int  hostnameInited = 0;
-#if 0
-TCL_DECLARE_MUTEX(hostMutex)
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * gvhostname --
- *
- *      Returns the name of the local host.
- *
- * Results:
- *      A string containing the network name for this machine, or
- *      an empty string if we can't figure out the name.  The caller
- *      must not modify or free this string.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-gvhostname(void)
-{
-#ifdef HAVE_UNAME
-    struct utsname u;
-    struct hostent *hp;
-#else
-    char buffer[sizeof(hostname)];
-#endif
-    char *native;
-
-#if 0
-    Tcl_MutexLock(&hostMutex);
-#endif
-    if (hostnameInited) {
-#if 0
-       Tcl_MutexUnlock(&hostMutex);
-#endif
-        return hostname;
-    }
-
-    native = NULL;
-#ifdef HAVE_UNAME
-    memset((void *) &u, (int) 0, sizeof(struct utsname));
-    if (uname(&u) > -1) {                               /* INTL: Native. */
-        hp = gethostbyname(u.nodename);                 /* INTL: Native. */
-        if (hp == NULL) {
-            /*
-             * Sometimes the nodename is fully qualified, but gets truncated
-             * as it exceeds SYS_NMLN.  See if we can just get the immediate
-             * nodename and get a proper answer that way.
-             */
-            char *dot = strchr(u.nodename, '.');
-            if (dot != NULL) {
-                char *node = malloc((unsigned) (dot - u.nodename + 1));
-                memcpy(node, u.nodename, (size_t) (dot - u.nodename));
-                node[dot - u.nodename] = '\0';
-                hp = gethostbyname(node);
-                free(node);
-            }
-        }
-        if (hp != NULL) {
-            native = hp->h_name;
-        } else {
-            native = u.nodename;
-        }
-    }
-#else
-    /*
-     * Uname doesn't exist; try gethostname instead.
-     */
-
-    if (gethostname(buffer, sizeof(buffer)) > -1) {     /* INTL: Native. */
-        native = buffer;
-    }
-#endif
-
-    if (native == NULL) {
-        hostname[0] = 0;
-    } else {
-       strncpy(hostname, native, sizeof(hostname)-1);
-        hostname[sizeof(hostname)-1] = 0;
-    }
-    hostnameInited = 1;
-#if 0
-    Tcl_MutexUnlock(&hostMutex);
-#endif
-    return hostname;
-}
-