X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-iconvme.c;h=38165f7dfc2293a7e0324e3f86cb1dab4e886e37;hb=260e67ceada4f5a198c34a018e8eff4bf15b8a4a;hp=c2041ec9c7b089858453c6a15c9e361a599a5d43;hpb=0e8e27fe137bf4b3235cd16fe246cc5de9066088;p=gnulib.git

diff --git a/tests/test-iconvme.c b/tests/test-iconvme.c
index c2041ec9c..38165f7df 100644
--- a/tests/test-iconvme.c
+++ b/tests/test-iconvme.c
@@ -1,20 +1,21 @@
 /* Recode strings between character sets, using iconv.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004-2005, 2009-2011 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
-   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
    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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -40,9 +41,9 @@ int main (int ac, char *av[])
       size_t len = 0;
       printf ("Enter string to convert:\n\t> ");
       if (getline (&in, &len, stdin) < 0)
-	perror ("getline");
+        perror ("getline");
       if (in[strlen (in) - 1] == '\n')
-	in[strlen (in) - 1] = '\0';
+        in[strlen (in) - 1] = '\0';
     }
 
   if (!to)
@@ -50,9 +51,9 @@ int main (int ac, char *av[])
       size_t len = 0;
       printf ("Enter destination code set:\n\t> ");
       if (getline (&to, &len, stdin) < 0)
-	perror ("getline");
+        perror ("getline");
       if (to[strlen (to) - 1] == '\n')
-	to[strlen (to) - 1] = '\0';
+        to[strlen (to) - 1] = '\0';
     }
 
   if (!from)
@@ -60,15 +61,15 @@ int main (int ac, char *av[])
       size_t len = 0;
       printf ("Enter source code set:\n\t> ");
       if (getline (&from, &len, stdin) < 0)
-	perror ("getline");
+        perror ("getline");
       if (from[strlen (from) - 1] == '\n')
-	from[strlen (from) - 1] = '\0';
+        from[strlen (from) - 1] = '\0';
     }
 
   printf (" Input string: `%s'\n"
-	  "From code set: `%s'\n"
-	  "  To code set: `%s'\n",
-	  in, from, to);
+          "From code set: `%s'\n"
+          "  To code set: `%s'\n",
+          in, from, to);
 
   out = iconv_string (in, from, to);