X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgetdomainname.c;h=54e4ddd600cbb35a39d29213466e45801ec5e9d1;hb=6829a6c0c428c91768aa4314752ba92b1340e11b;hp=4c640326c0577255ee90197e1126fd553bf85cd9;hpb=da12e5f2c2e4b5a39a2a1d6ef551717061455d44;p=gnulib.git

diff --git a/lib/xgetdomainname.c b/lib/xgetdomainname.c
index 4c640326c..54e4ddd60 100644
--- a/lib/xgetdomainname.c
+++ b/lib/xgetdomainname.c
@@ -1,10 +1,11 @@
 /* xgetdomainname.c -- Return the NIS domain name, without size limitations.
-   Copyright (C) 1992, 1996, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000-2001, 2003-2004, 2006, 2008-2011 Free
+   Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 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
@@ -12,24 +13,24 @@
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Based on xgethostname.c, written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xgetdomainname.h"
 
 /* Get getdomainname.  */
-#include "getdomainname.h"
+#include <unistd.h>
 
 /* Get errno.  */
 #include <errno.h>
 
+/* Get free.  */
+#include <stdlib.h>
+
 #include "xalloc.h"
 
 #ifndef INITIAL_DOMAINNAME_LENGTH
@@ -60,14 +61,14 @@ xgetdomainname (void)
       domainname[k] = '\0';
       err = getdomainname (domainname, size);
       if (err >= 0 && domainname[k] == '\0')
-	break;
+        break;
       else if (err < 0 && errno != EINVAL)
-	{
-	  int saved_errno = errno;
-	  free (domainname);
-	  errno = saved_errno;
-	  return NULL;
-	}
+        {
+          int saved_errno = errno;
+          free (domainname);
+          errno = saved_errno;
+          return NULL;
+        }
       size *= 2;
       domainname = xrealloc (domainname, size);
     }