mtr v0.76

 - display load sharing hosts in --raw output.  added about button in
   gui.

source: ftp://ftp.bitwizard.nl/mtr/mtr-0.76.tar.gz

diff --git a/NEWS b/NEWS
index f4e92dd155c6aacb034d3ee40968e06534e52662..c52d86693cd9af8c2fd0af681c4b943765241509 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 WHAT'S NEW?
+  V0.76 display load sharing hosts in --raw output. 
+        added about button in gui. 
   v0.75 Feelgood patch to move sprintf to snprintf. People might think
         that sprintf might cause a buffer overflow. Now it's clean. 
         cut-paste patches: you can now copy an intermediate host to the

diff --git a/README b/README
index 1eca21c2c2845a2a21cbb551aa8ccd814bb66bff..625f9eb94d187253959fef6bc0d16a8c096a18d7 100644 (file)
--- a/README
+++ b/README
@@ -60,6 +60,11 @@ INSTALLING
   knows how to make this automatic using autoconf / the configure script, 
   please tell me.... 
 
+  This should now also work: 
+  ./configure CFLAGS="-arch i386 -arch x86_64" LIBS="-lresolv" \
+       --without-gtk --disable-endian-check --disable-dependency-tracking
+
+
 
 WHERE CAN I GET THE LATEST VERSION OR MORE INFORMATION?
 

diff --git a/configure.in b/configure.in
index d73e9940f0cc4fec98d15535a84d5d9c33c15a4a..ff6d51ffe1352961af2c3c8b4ac360cb1c3a9c92 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(mtr.c)
-AM_INIT_AUTOMAKE(mtr, 0.75)
+AM_INIT_AUTOMAKE(mtr, 0.76)
 
 
 AC_SUBST(GTK_OBJ)
@@ -49,7 +49,7 @@ AC_ARG_ENABLE(ipv6,
 WANTS_IPV6=$enableval, WANTS_IPV6=yes)
    
 if test "x$WANTS_GTK" = "xyes"; then
-        AM_PATH_GTK_2_0(2.4.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
+        AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
                            LIBS="$LIBS $GTK_LIBS -lm",
                            AC_MSG_WARN(Building without GTK2 display support)
                    AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
@@ -108,7 +108,13 @@ AC_MSG_CHECKING(for C flags to get more warnings)
 ac_save_CFLAGS="$CFLAGS"
 if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then
   dnl gcc is the easiest C compiler
-  warning_CFLAGS="-Wall -Wno-pointer-sign"
+  warning_CFLAGS="-Wall"
+  # Check if compiler supports -Wno-pointer-sign and add it if supports
+  CFLAGS_saved="$CFLAGS"
+  CFLAGS="$CFLAGS -Wno-pointer-sign"
+  AC_COMPILE_IFELSE([ AC_LANG_SOURCE([[ int foo; ]])],
+                  [ warning_CFLAGS="${warning_CFLAGS} -Wno-pointer-sign" ],)
+  CFLAGS="$CFLAGS_saved"
 else
   dnl Vendor supplied C compilers are a bit tricky
   case "$host_os" in

diff --git a/curses.c b/curses.c
index db4209d2e553b27abfc3b65256ba57c772f10963..880d85f31eea3fe9e457f3e66613a6af2bf2c510 100644 (file)
--- a/curses.c
+++ b/curses.c
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/display.c b/display.c
index e18374f363d207fb77fee6baaf2a1037b6fc3e8c..f27cd7cbeef623f9669148e69e3113f372302e44 100644 (file)
--- a/display.c
+++ b/display.c
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/display.h b/display.h
index 2c9617141f3fe84d645cb4e54c8c4ab973cbfb5c..87be8a1e038e4fbe6e19e1f87f4a0c974e06a166 100644 (file)
--- a/display.h
+++ b/display.h
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/dns.c b/dns.c
index d33df819ccf7d2d840a897c8919be5ed51023643..be13e8b5af041359030be8f1b3f4f4fa7e292701 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -484,6 +483,7 @@ void dns_open(void)
 {
   int option,i;
 
+  if (!dns) return;
   res_init();
   if (!_res.nscount) {
     fprintf(stderr,"No nameservers defined.\n");

diff --git a/dns.h b/dns.h
index 47ed4be248930630dcaa66f76245d87f21c641d7..b25c267c7ed88d98862ae6e766ada7ef90fb4990 100644 (file)
--- a/dns.h
+++ b/dns.h
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/getopt.h b/getopt.h
index 8dd3498d2668c4a2d88f2f91e57038167587d139..aaa627ebd086945e66981ce3e8d03d5f652dab11 100644 (file)
--- a/getopt.h
+++ b/getopt.h
@@ -5,8 +5,7 @@
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   License as published by the Free Software Foundation version 2.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/getopt1.c b/getopt1.c
index 4580211cfac348402aace9ee8098ea133339d432..bccf8b2153361c8243730bec4909463d35826eff 100644 (file)
--- a/getopt1.c
+++ b/getopt1.c
@@ -2,10 +2,9 @@
    Copyright (C) 1987, 88, 89, 90, 91, 92, 1993, 1994
        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 the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/gtk.c b/gtk.c
index f79aefd065f8c379fcf63d8d770279d86f0ebb32..3aa2132bae465e9180d5b45d6cfe53db113e1dbd 100644 (file)
--- a/gtk.c
+++ b/gtk.c
@@ -4,9 +4,8 @@
     Changes/additions Copyright (C) 1998 R.E.Wolff@BitWizard.nl
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -55,6 +54,7 @@ extern int af;
 static int tag;
 static GtkWidget *Pause_Button;
 static GtkWidget *Entry;
+static GtkWidget *main_window;
 
 void gtk_add_ping_timeout (void)
 {
@@ -122,6 +122,68 @@ gint Pause_clicked(UNUSED GtkWidget *Button, UNUSED gpointer data)
   return FALSE;
 }
 
+gint About_clicked(UNUSED GtkWidget *Button, UNUSED gpointer data) 
+{
+  gchar *authors[] = {
+        "Roger Wolff <R.E.Wolff@BitWizard.nl>",
+        "Bohdan Vlasyuk <bohdan@cec.vstu.vinnica.ua>",
+        "Evgeniy Tretyak <evtr@ukr.net>",
+        "John Thacker <thacker@math.cornell.edu>",
+        "Juha Takala",
+        "David Sward <sward@clark.net>",
+        "David Stone <stone@AsIf.com>",
+        "Andrew Stesin",
+        "Greg Stark <gsstark@mit.edu>",
+        "Robert Sparks <rjsparks@nostrum.com>",
+        "Mike Simons <msimons@moria.simons-clan.com>",
+        "Aaron Scarisbrick,",
+        "Craig Milo Rogers <Rogers@ISI.EDU>",
+        "Antonio Querubin <tony@aloha.net>",
+        "Russell Nelson <rn-mtr@crynwr.com>",
+        "Davin Milun <milun@acm.org>",
+        "Josh Martin <jmartin@columbiaservices.net>",
+        "Alexander V. Lukyanov <lav@yars.free.net>",
+        "Charles Levert <charles@comm.polymtl.ca> ",
+        "Bertrand Leconte <B.Leconte@mail.dotcom.fr>",
+        "Anand Kumria",
+        "Olav Kvittem <Olav.Kvittem@uninett.no>",
+        "Adam Kramer <l3zqc@qcunix1.acc.qc.edu> ",
+        "Philip Kizer <pckizer@nostrum.com>",
+        "Simon Kirby",
+        "Christophe Kalt",
+        "Steve Kann <stevek@spheara.horizonlive.com>",
+        "Brett Johnson <brett@jdacareers.com>",
+        "Roland Illig <roland.illig@gmx.de>",
+        "Damian Gryski <dgryski@uwaterloo.ca>",
+        "Rob Foehl <rwf@loonybin.net>",
+        "Mircea Damian",
+        "Cougar <cougar@random.ee>",
+        "Brian Casey",
+        "Andrew Brown <atatat@atatdot.net>",
+        "Bill Bogstad <bogstad@pobox.com> ",
+        "Marc Bejarano <marc.bejarano@openwave.com>",
+        "Moritz Barsnick <barsnick@gmx.net>",
+        NULL
+    };
+  
+  gtk_show_about_dialog(GTK_WINDOW(main_window)
+    , "version", VERSION
+    , "copyright", "Copyright \xc2\xa9 1997,1998  Matt Kimball"
+    , "website", "http://www.bitwizard.nl/mtr/"
+    , "authors", authors
+    , "comments", "The 'traceroute' and 'ping' programs in a single network diagnostic tool."
+    , "license",
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License version 2 as\n"
+"published by the Free Software Foundation.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details."
+  , NULL);
+  return TRUE;
+}
 
 /*
  * There is a small problem with the following code:
@@ -182,6 +244,11 @@ void Toolbar_fill(GtkWidget *Toolbar)
   g_signal_connect(GTK_OBJECT(Button), "clicked",
                     GTK_SIGNAL_FUNC(Window_destroy), NULL);
 
+  Button = gtk_button_new_from_stock(GTK_STOCK_ABOUT);
+  gtk_box_pack_end(GTK_BOX(Toolbar), Button, FALSE, FALSE, 0);
+  g_signal_connect(GTK_OBJECT(Button), "clicked",
+                    GTK_SIGNAL_FUNC(About_clicked), NULL);
+
   Button = gtk_button_new_with_mnemonic("_Restart");
   gtk_box_pack_end(GTK_BOX(Toolbar), Button, FALSE, FALSE, 0);
   g_signal_connect(GTK_OBJECT(Button), "clicked",
@@ -443,7 +510,7 @@ void Window_fill(GtkWidget *Window)
   GtkWidget *Toolbar;
   GtkWidget *scroll;
 
-  gtk_window_set_title(GTK_WINDOW(Window), "My traceroute  [v" VERSION "]");
+  gtk_window_set_title(GTK_WINDOW(Window), "My traceroute");
   gtk_window_set_default_size(GTK_WINDOW(Window), 650, 400); 
   gtk_container_set_border_width(GTK_CONTAINER(Window), 10);
   VBox = gtk_vbox_new(FALSE, 10);
@@ -465,8 +532,7 @@ void Window_fill(GtkWidget *Window)
 
 void gtk_open(void)
 {
-  GtkWidget *Window;
-  GdkPixmap *icon;
+  GdkPixbuf *icon;
 
   int argc;
   char *args[2];
@@ -477,19 +543,21 @@ void gtk_open(void)
   argv[1] = NULL;
   gtk_do_init(&argc, &argv);
 
-  Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  icon = gdk_pixbuf_new_from_xpm_data((const char**)mtr_icon);
+  gtk_window_set_default_icon(icon);
+
+  main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  
+  g_set_application_name("My traceroute");
 
-  Window_fill(Window);
+  Window_fill(main_window);
 
-  g_signal_connect(GTK_OBJECT(Window), "delete_event",
+  g_signal_connect(GTK_OBJECT(main_window), "delete_event",
                      GTK_SIGNAL_FUNC(Window_destroy), NULL);
-  g_signal_connect(GTK_OBJECT(Window), "destroy",
+  g_signal_connect(GTK_OBJECT(main_window), "destroy",
                     GTK_SIGNAL_FUNC(Window_destroy), NULL);
 
-  icon = gtk_load_pixmap(mtr_icon);
-  gtk_widget_show_all(Window);
-  gdk_window_set_icon(Window->window, NULL, icon, NULL);
-  gdk_window_set_icon_name(Window->window, "mtr");
+  gtk_widget_show_all(main_window);
 }
 
 

diff --git a/mtr-curses.h b/mtr-curses.h
index 732a71a6faffa5b127c9b2000837b8111aa93de2..e5099fb403558bff0e10976e5fb42849c709f760 100644 (file)
--- a/mtr-curses.h
+++ b/mtr-curses.h
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/mtr-gtk.h b/mtr-gtk.h
index 01bc03d91312896f973e03a311e7e4b0ab194dc5..cb271860539cd7efb4ec12d73247557a87d10e1e 100644 (file)
--- a/mtr-gtk.h
+++ b/mtr-gtk.h
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/mtr.c b/mtr.c
index 5ce68baca95f1c7df574c80076469f48c9ddd7e9..bc988b0a228ad5c9aba7cda68930735605df8653 100644 (file)
--- a/mtr.c
+++ b/mtr.c
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -380,6 +379,7 @@ int main(int argc, char **argv)
           "\t\t[--report-wide] [--report-cycles=COUNT] [--curses] [--gtk]\n"
            "\t\t[--raw] [--split] [--no-dns] [--address interface]\n" /* BL */
            "\t\t[--psize=bytes/-s bytes]\n"            /* ok */
+           "\t\t[--report-wide|-w] [-u]\n"            /* rew */
           "\t\t[--interval=SECONDS] HOSTNAME [PACKETSIZE]\n", argv[0]);
     exit(0);
   }
@@ -402,7 +402,10 @@ int main(int argc, char **argv)
   hints.ai_socktype = SOCK_DGRAM;
   error = getaddrinfo( Hostname, NULL, &hints, &res );
   if ( error ) {
-    perror( gai_strerror(error) );
+    if (error == EAI_SYSTEM)
+       perror ("Failed to resolve host");
+    else
+       fprintf (stderr, "Failed to resolve host: %s\n", gai_strerror(error));
     exit( EXIT_FAILURE );
   }
   /* Convert the first addrinfo into a hostent. */

diff --git a/mtr.h b/mtr.h
index 3239b0bf72b9cc1bc0192c5be17919e395c8f3c6..2f5e72b05d8a685f8b9cdb9ce972f1a50c800a8d 100644 (file)
--- a/mtr.h
+++ b/mtr.h
@@ -4,9 +4,8 @@
     Copyright (C) 2005 R.E.Wolff@BitWizard.nl
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/net.c b/net.c
index ea583d9ee29b3d597bec06bc1bfd606a564e6520..97c6bcf8c3914c4c8a02bbddd9b4038d3f041779 100644 (file)
--- a/net.c
+++ b/net.c
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -481,6 +480,9 @@ void net_process_ping(int seq, void * addr, struct timeval now)
     if( addrcmp( (void *) &(host[index].addrs[i]), addrcopy, af ) != 0 && 
         i<MAXPATH ) {
       addrcpy( (void *) &(host[index].addrs[i]), addrcopy, af );
+      
+      /* rafaelmartins: multi path support to '--raw' */
+      display_rawhost(index, (void *) &(host[index].addrs[i]));
     }
   /* end multi paths */
   }
@@ -898,11 +900,14 @@ int net_send_batch(void)
   return 0;
 }
 
+
 static void set_fd_flags(int fd)
 {
 #if defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
   int oldflags;
 
+  if (fd < 0) return; 
+
   oldflags = fcntl(fd, F_GETFD);
   if (oldflags == -1) {
     perror("Couldn't get fd's flags");
@@ -945,8 +950,9 @@ int net_preopen(void)
   set_fd_flags(recvsock4);
 #ifdef ENABLE_IPV6
   recvsock6 = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+  if (recvsock6 >= 0)
+     set_fd_flags(recvsock6);
 #endif
-  set_fd_flags(recvsock6);
 
   return 0;
 }

diff --git a/net.h b/net.h
index 5807042f5753f22d9b9a84c6d1aba48810427338..6f05c6bc2a50e7d2227d98f6fa7247f273a380a2 100644 (file)
--- a/net.h
+++ b/net.h
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/raw.c b/raw.c
index 16741674dcb0d8417931f45da385e87093510870..8b0df4737586d037423f78a6035f157f41433239 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -5,9 +5,8 @@
     raw.c -- raw output (for logging for later analysis)
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/raw.h b/raw.h
index 06f6b882a2e034019f20c9c7791a83f435fd6e77..357c8f3cbc087ebc723bb395ce24e4431d61679b 100644 (file)
--- a/raw.h
+++ b/raw.h
@@ -5,9 +5,8 @@
     raw.h -- raw output (for logging for later analysis)
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/report.c b/report.c
index 510ef4776902bea7913270e6acae7602ba8345db..e87fa07698fe75e127ed6eb48040a68d8e748c32 100644 (file)
--- a/report.c
+++ b/report.c
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/report.h b/report.h
index 4e8fd1c29a99fe79e5bd92220d441cb7bfa5c060..755c5968fa8e6572bc27032ae2f4c133d7281720 100644 (file)
--- a/report.h
+++ b/report.h
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/select.c b/select.c
index 3577c9c152d7bd4f460ed93caf98215a881cfec0..a53017fb7d2a6d4d7c6ee9c79937ac62f0aeb678 100644 (file)
--- a/select.c
+++ b/select.c
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/select.h b/select.h
index 03876e5616057479a77e8bcce3f917d32047de2a..68903e3f5b6baee3f61aa9c437f4210025476c50 100644 (file)
--- a/select.h
+++ b/select.h
@@ -3,9 +3,8 @@
     Copyright (C) 1997,1998  Matt Kimball
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/split.c b/split.c
index 01ceaa9311c43fa64d5893ef44c7483ebe6ca073..4453dac2b8c73f8483e671547f41867f8153526a 100644 (file)
--- a/split.c
+++ b/split.c
@@ -7,9 +7,8 @@
     Copyright (C) 1998  Bertrand Leconte <B.Leconte@mail.dotcom.fr>
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/split.h b/split.h
index 2a19eb99fddc2bc1c768fa7add07023e07875064..a9b9405a40566cbcb89bfa558a1a7af87ffb5d74 100644 (file)
--- a/split.h
+++ b/split.h
@@ -5,9 +5,8 @@
     Copyright (C) 1998  Bertrand Leconte <B.Leconte@mail.dotcom.fr>
 
     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.
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of