projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge tab->whitespace change
[gnulib.git]
/
lib
/
getdomainname.c
diff --git
a/lib/getdomainname.c
b/lib/getdomainname.c
index
ce1e200
..
c0041cc
100644
(file)
--- a/
lib/getdomainname.c
+++ b/
lib/getdomainname.c
@@
-1,10
+1,11
@@
/* getdomainname emulation for systems that doesn't have it.
/* getdomainname emulation for systems that doesn't have it.
- Copyright (C) 2003 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2003, 2006, 2008 Free Software Foundation, 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,17
+13,14
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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/>. */
/* Written by Simon Josefsson. */
/* Written by Simon Josefsson. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
/* Specification. */
-#include
"getdomainname.h"
+#include
<unistd.h>
#include <string.h>
#include <errno.h>
#include <string.h>
#include <errno.h>
@@
-30,7
+28,8
@@
/* Return the NIS domain name of the machine.
WARNING! The NIS domain name is unrelated to the fully qualified host name
of the machine. It is also unrelated to email addresses.
/* Return the NIS domain name of the machine.
WARNING! The NIS domain name is unrelated to the fully qualified host name
of the machine. It is also unrelated to email addresses.
- WARNING! The NIS domain name is usually the empty string when not using NIS.
+ WARNING! The NIS domain name is usually the empty string or "(none)" when
+ not using NIS.
Put up to LEN bytes of the NIS domain name into NAME.
Null terminate it if the name is shorter than LEN.
Put up to LEN bytes of the NIS domain name into NAME.
Null terminate it if the name is shorter than LEN.
@@
-39,7
+38,7
@@
int
getdomainname (char *name, size_t len)
{
int
getdomainname (char *name, size_t len)
{
- const char *result = ""; /* Hardcode your domain name if you want. */
+ const char *result = "";
/* Hardcode your domain name if you want. */
size_t result_len = strlen (result);
if (result_len > len)
size_t result_len = strlen (result);
if (result_len > len)