summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlemb <wlemb>2004-01-05 22:49:03 +0000
committerwlemb <wlemb>2004-01-05 22:49:03 +0000
commit1943ac7c60c141af6bdc1c5dbd18d8e42daeec37 (patch)
tree89701390c5dfedff5c938d78493a462a783ea793
parent263694103d242f91c4c9e1d5430aec14422d04b3 (diff)
downloadgroff-1943ac7c60c141af6bdc1c5dbd18d8e42daeec37.tar.gz
* src/roff/troff/nroff.cpp (space_node::get_breakpoints,
space_node::nbreaks): Protect against zero `next' field. Update copyright years.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.comm2
-rw-r--r--contrib/groffer/groffer.sh2
-rw-r--r--contrib/mm/m.tmac6
-rw-r--r--font/devps/generate/Makefile2
-rw-r--r--src/devices/grohtml/html.h2
-rw-r--r--src/include/driver.h2
-rw-r--r--src/include/posix.h2
-rw-r--r--src/preproc/pic/common.cpp2
-rw-r--r--src/preproc/pic/common.h3
-rw-r--r--src/preproc/pic/output.h2
-rw-r--r--src/preproc/refer/ref.cpp3
-rw-r--r--src/preproc/tbl/table.h2
-rw-r--r--src/roff/groff/groff.cpp2
-rw-r--r--src/roff/nroff/nroff.man2
-rw-r--r--src/roff/troff/node.cpp4
-rw-r--r--src/utils/hpftodit/hpftodit.cpp2
17 files changed, 26 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 27d72711..b12f0342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-05 Werner LEMBERG <wl@gnu.org>
+
+ * src/roff/troff/nroff.cpp (space_node::get_breakpoints,
+ space_node::nbreaks): Protect against zero `next' field.
+
2004-01-03 Jeff Conrad <jeff_conrad@msn.com>
In hpftodit, use the symbol sets offered in the TFM.
diff --git a/Makefile.comm b/Makefile.comm
index 2b8b7ffd..61f3befc 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2002, 2003 Free Software Foundation, Inc.
# Written by James Clark (jjc@jclark.com)
#
# This file is part of groff.
diff --git a/contrib/groffer/groffer.sh b/contrib/groffer/groffer.sh
index 4e7332c0..f019e206 100644
--- a/contrib/groffer/groffer.sh
+++ b/contrib/groffer/groffer.sh
@@ -3070,7 +3070,7 @@ usage()
echo2;
version;
cat >&2 <<EOF
-Copyright (C) 2001 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
This is free software licensed under the GNU General Public License.
EOF
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 197f78d3..fd92f6dc 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3,11 +3,11 @@
.ds RE \\$2
..
.\"
-.\" $Id: m.tmac,v 2.20 2003/11/04 04:53:31 jhaegg Exp $
-.@revision $Revision: 2.20 $
+.\" $Id: m.tmac,v 2.21 2004/01/05 22:49:05 wlemb Exp $
+.@revision $Revision: 2.21 $
.ig
-Copyright (C) 1991-2000 Free Software Foundation, Inc.
+Copyright (C) 1991-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
mgm is written by Jörgen Hägg <jh@axis.com>
mgm is free software; you can redistribute it and/or modify it under
diff --git a/font/devps/generate/Makefile b/font/devps/generate/Makefile
index 781dac06..dd0d65bf 100644
--- a/font/devps/generate/Makefile
+++ b/font/devps/generate/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2002, 2003 Free Software Foundation, Inc.
# Written by James Clark (jjc@jclark.com)
#
# This file is part of groff.
diff --git a/src/devices/grohtml/html.h b/src/devices/grohtml/html.h
index 431647c6..18c53d76 100644
--- a/src/devices/grohtml/html.h
+++ b/src/devices/grohtml/html.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
diff --git a/src/include/driver.h b/src/include/driver.h
index b15d6c99..8337e7c2 100644
--- a/src/include/driver.h
+++ b/src/include/driver.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2003
Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
diff --git a/src/include/posix.h b/src/include/posix.h
index e7f38cd1..e2ab4e1d 100644
--- a/src/include/posix.h
+++ b/src/include/posix.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1992, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 2000, 2001, 2002 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
diff --git a/src/preproc/pic/common.cpp b/src/preproc/pic/common.cpp
index e86f058c..b302ca79 100644
--- a/src/preproc/pic/common.cpp
+++ b/src/preproc/pic/common.cpp
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
diff --git a/src/preproc/pic/common.h b/src/preproc/pic/common.h
index d04da97a..849637f1 100644
--- a/src/preproc/pic/common.h
+++ b/src/preproc/pic/common.h
@@ -1,5 +1,6 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 1993, 2003
+ Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
diff --git a/src/preproc/pic/output.h b/src/preproc/pic/output.h
index a0a8331f..873ec3cf 100644
--- a/src/preproc/pic/output.h
+++ b/src/preproc/pic/output.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
diff --git a/src/preproc/refer/ref.cpp b/src/preproc/refer/ref.cpp
index 86ceed05..857341a1 100644
--- a/src/preproc/refer/ref.cpp
+++ b/src/preproc/refer/ref.cpp
@@ -1,5 +1,6 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2003
+ Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
diff --git a/src/preproc/tbl/table.h b/src/preproc/tbl/table.h
index 16540103..522d9b71 100644
--- a/src/preproc/tbl/table.h
+++ b/src/preproc/tbl/table.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index f92c8af6..80fab05d 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -185,7 +185,7 @@ int main(int argc, char **argv)
vflag = 1;
{
printf("GNU groff version %s\n", Version_string);
- printf("Copyright (C) 2002 Free Software Foundation, Inc.\n"
+ printf("Copyright (C) 2004 Free Software Foundation, Inc.\n"
"GNU groff comes with ABSOLUTELY NO WARRANTY.\n"
"You may redistribute copies of groff and its subprograms\n"
"under the terms of the GNU General Public License.\n"
diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.man
index 6a9c9425..4e715f94 100644
--- a/src/roff/nroff/nroff.man
+++ b/src/roff/nroff/nroff.man
@@ -1,5 +1,5 @@
.ig
-Copyright (C) 1989-2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-2001, 2002, 2003 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
diff --git a/src/roff/troff/node.cpp b/src/roff/troff/node.cpp
index 7561259e..35f2d60c 100644
--- a/src/roff/troff/node.cpp
+++ b/src/roff/troff/node.cpp
@@ -3397,7 +3397,7 @@ int node::nbreaks()
breakpoint *space_node::get_breakpoints(hunits width, int ns,
breakpoint *rest, int is_inner)
{
- if (next->discardable())
+ if (next && next->discardable())
return rest;
breakpoint *bp = new breakpoint;
bp->next = rest;
@@ -3418,7 +3418,7 @@ breakpoint *space_node::get_breakpoints(hunits width, int ns,
int space_node::nbreaks()
{
- if (next->discardable())
+ if (next && next->discardable())
return 0;
else
return 1;
diff --git a/src/utils/hpftodit/hpftodit.cpp b/src/utils/hpftodit/hpftodit.cpp
index 3a184cb2..b4ca8e0e 100644
--- a/src/utils/hpftodit/hpftodit.cpp
+++ b/src/utils/hpftodit/hpftodit.cpp
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1994, 2000, 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.