Annotation of /trunk/indent/patches/2.2.9-deb-gentoo.patch
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2701 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2701 byte(s)
-import
1 | niro | 144 | 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 |