indent/patches/2.2.9-deb-gentoo.patch

This patch is mostly from the debian indent_2.2.9-6.diff.

Also added a patch to check usage of `texinfo2man`.
http://bugs.gentoo.org/show_bug.cgi?id=71690

--- indent-2.2.9.orig/man/texinfo2man.c
+++ indent-2.2.9/man/texinfo2man.c
@@ -2,6 +2,7 @@
 #include <malloc.h>
 #include <string.h>
 #include <ctype.h>
+#include <stdlib.h>
 
 /* texinfo2man.
  * Convert a texinfo document to man format.
@@ -162,7 +163,7 @@
 
 static char value_updated[64], value_edition[64], value_version[64];
 
-process_texi (FILE * in)
+void process_texi (FILE * in)
 {
   char buf[1024];
   int in_block = 0;
@@ -252,6 +254,12 @@
     char buf[1024];
     int line_no = 0;
 
+	if (argc != 3) {
+		fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
+		fprintf(stderr, "  The man page will be written to stdout.\n");
+		return -1;
+	}
+
     texinfoname = argv[2];
 
     in = fopen (argv[2], "r");
--- indent-2.2.9.orig/src/output.c
+++ indent-2.2.9/src/output.c
@@ -13,8 +13,10 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+#include <time.h>
 #include <utime.h>
 #include <sys/stat.h>
+#include <stdlib.h>
 
 #include "indent.h"
 #include "sys.h"
@@ -1206,7 +1208,7 @@
     }
 }
 
-extern inhibit_indenting(
+extern void inhibit_indenting(
     BOOLEAN flag)
 {
     inhibited = flag;
--- indent-2.2.9.orig/src/indent.h
+++ indent-2.2.9/src/indent.h
@@ -96,8 +96,6 @@
 /* Size of the input program, not including the ' \n\0' we add at the end */
 extern unsigned long in_prog_size;
 
-/* The output file. */
-extern FILE *output;
 
 
 
--- indent-2.2.9.orig/src/indent.c
+++ indent-2.2.9/src/indent.c
@@ -875,6 +875,7 @@
                                                  * imply we are in a stmt */
         for (t_ptr = s_code; *t_ptr; ++t_ptr)
         {
+            check_lab_size();
             *e_lab++ = *t_ptr;  /* turn everything so far into a label */
         }
                 
@@ -3062,8 +3063,8 @@
     BOOLEAN using_stdin = false;
     exit_values_ty exit_status;
 
-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
-    setlocale (LC_MESSAGES, "");
+#if defined (HAVE_SETLOCALE)
+    setlocale (LC_ALL, "");
 #endif
     bindtextdomain (PACKAGE, LOCALEDIR);
     textdomain (PACKAGE);
--- indent-2.2.9.orig/src/comments.c
+++ indent-2.2.9/src/comments.c
@@ -20,6 +20,7 @@
 #include "comments.h"
 #include "globs.h"
 #include "parse.h"
+#include "output.h"
 
 RCSTAG_CC ("$Id: 2.2.9-deb-gentoo.patch,v 1.1 2007-05-08 19:48:32 niro Exp $");
 
--- indent-2.2.9.orig/src/output.h
+++ indent-2.2.9/src/output.h
@@ -47,7 +47,7 @@
     struct stat * file_stats,
      const char  * filename);
 
-extern inhibit_indenting(
+extern void inhibit_indenting(
     BOOLEAN flag);
 
 
1	This patch is mostly from the debian indent_2.2.9-6.diff.
2
3	Also added a patch to check usage of `texinfo2man`.
4	http://bugs.gentoo.org/show_bug.cgi?id=71690
5
6	--- indent-2.2.9.orig/man/texinfo2man.c
7	+++ indent-2.2.9/man/texinfo2man.c
8	@@ -2,6 +2,7 @@
9	#include <malloc.h>
10	#include <string.h>
11	#include <ctype.h>
12	+#include <stdlib.h>
13
14	/* texinfo2man.
15	* Convert a texinfo document to man format.
16	@@ -162,7 +163,7 @@
17
18	static char value_updated[64], value_edition[64], value_version[64];
19
20	-process_texi (FILE * in)
21	+void process_texi (FILE * in)
22	{
23	char buf[1024];
24	int in_block = 0;
25	@@ -252,6 +254,12 @@
26	char buf[1024];
27	int line_no = 0;
28
29	+ if (argc != 3) {
30	+ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
31	+ fprintf(stderr, " The man page will be written to stdout.\n");
32	+ return -1;
33	+ }
34	+
35	texinfoname = argv[2];
36
37	in = fopen (argv[2], "r");
38	--- indent-2.2.9.orig/src/output.c
39	+++ indent-2.2.9/src/output.c
40	@@ -13,8 +13,10 @@
41
42	#include <stdio.h>
43	#include <sys/types.h>
44	+#include <time.h>
45	#include <utime.h>
46	#include <sys/stat.h>
47	+#include <stdlib.h>
48
49	#include "indent.h"
50	#include "sys.h"
51	@@ -1206,7 +1208,7 @@
52	}
53	}
54
55	-extern inhibit_indenting(
56	+extern void inhibit_indenting(
57	BOOLEAN flag)
58	{
59	inhibited = flag;
60	--- indent-2.2.9.orig/src/indent.h
61	+++ indent-2.2.9/src/indent.h
62	@@ -96,8 +96,6 @@
63	/* Size of the input program, not including the ' \n\0' we add at the end */
64	extern unsigned long in_prog_size;
65
66	-/* The output file. */
67	-extern FILE *output;
68
69
70
71	--- indent-2.2.9.orig/src/indent.c
72	+++ indent-2.2.9/src/indent.c
73	@@ -875,6 +875,7 @@
74	* imply we are in a stmt */
75	for (t_ptr = s_code; *t_ptr; ++t_ptr)
76	{
77	+ check_lab_size();
78	e_lab++ = t_ptr; /* turn everything so far into a label */
79	}
80
81	@@ -3062,8 +3063,8 @@
82	BOOLEAN using_stdin = false;
83	exit_values_ty exit_status;
84
85	-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
86	- setlocale (LC_MESSAGES, "");
87	+#if defined (HAVE_SETLOCALE)
88	+ setlocale (LC_ALL, "");
89	#endif
90	bindtextdomain (PACKAGE, LOCALEDIR);
91	textdomain (PACKAGE);
92	--- indent-2.2.9.orig/src/comments.c
93	+++ indent-2.2.9/src/comments.c
94	@@ -20,6 +20,7 @@
95	#include "comments.h"
96	#include "globs.h"
97	#include "parse.h"
98	+#include "output.h"
99
100	RCSTAG_CC ("$Id: 2.2.9-deb-gentoo.patch,v 1.1 2007-05-08 19:48:32 niro Exp $");
101
102	--- indent-2.2.9.orig/src/output.h
103	+++ indent-2.2.9/src/output.h
104	@@ -47,7 +47,7 @@
105	struct stat * file_stats,
106	const char * filename);
107
108	-extern inhibit_indenting(
109	+extern void inhibit_indenting(
110	BOOLEAN flag);
111
112